diff --git a/mod/basket/order-form.html b/mod/basket/order-form.html
index 3fa0b9e..66e7943 100644
--- a/mod/basket/order-form.html
+++ b/mod/basket/order-form.html
@@ -3,7 +3,6 @@
 	<fieldset>
 		<div class="row-fluid">
 		{if $orderfields}
-			{assign var='fieldscount' value=sizeof($orderfields)}
 			<div class="span6">
 			{foreach from=$orderfields item=item name=fieldscounter}
 				{if $item.editable eq 'true'}
@@ -46,7 +45,7 @@
 						{if $order_fields[$item.name]['error']} <span class="help-inline">Обязательно для заполнения</span>{/if}
 					</div>
 				</div>
-				<link href="https://dadata.ru/static/css/suggestions-4.3.css" type="text/css" rel="stylesheet" />
+				<link href="/media0/css/suggestions.css" type="text/css" rel="stylesheet" />
 				<!--[if lt IE 10]>
 				<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/jquery-ajaxtransport-xdomainrequest/1.0.1/jquery.xdomainrequest.min.js"></script>
 				<![endif]-->
@@ -56,20 +55,20 @@
 				        serviceUrl: "https://dadata.ru/api/v2/suggest/address",
 				        type: "ADDRESS",
 				        token: "b94c274fc11fbd3fa9f26c57047e57d0287ab91f",
-				        /* Вызывается, когда пользователь выбирает одну из подсказок */
-				        onSelect: function(suggestion) {
-				            if($('#inputPostindex').length)
-				            	$('#inputPostindex').val(suggestion.data.postal_code);
-				            else
-				            {
-				            	$("#input{$item.name|capitalize}").closest('form').append(
-					            	$('<input />').attr('id', 'inputPostindex').attr('name', 'postindex').attr('type', 'hidden').val(suggestion.data.postal_code)
-				            	)
-				            }
+				        onSelect: function(suggestion)
+				        {
+				            $('#hiddenPostindex').val(suggestion.data.postal_code).change();
+				            $('#hiddenCity').val(suggestion.data.city).change();
+				            $('#hiddenRegion').val(suggestion.data.region).change();
 				        }
 				    });
 				</script>
 				{/if}
+				
+				{if $item.htmltype eq 'hidden'}
+				<input type="hidden" id="hidden{$item.name|capitalize}" name="{$item.name}" value="{$order_fields[$item.name]['value']}" />
+				{/if}
+				
 				{if $item.htmltype eq 'combostore'}
 				<div class="control-group {if $order_fields[$item.name]['error']} error{/if}">
 					<label class="control-label" for="select{$item.name|capitalize}">{$item.runame}{if $item.necessary eq 'true'} <sup style="color:red;">!</sup> {/if}</label>
@@ -129,7 +128,7 @@
 				</div>
 				{/if}
 				{/if}
-				{if $smarty.foreach.fieldscounter.iteration%(($fieldscount+$fieldscount%2)/2) == 0 && $smarty.foreach.fieldscounter.iteration!=$smarty.foreach.fieldscounter.last}</div><div class="span6">{/if}
+				{if $smarty.foreach.fieldscounter.iteration%(($orderfieldcount+$orderfieldcount%2)/2) == 0 && $smarty.foreach.fieldscounter.iteration!=$smarty.foreach.fieldscounter.last}</div><div class="span6">{/if}
 			{/foreach}
 			</div>
 		{else}
@@ -176,11 +175,12 @@
 			{/if}
 		</div>
 	  	<input type="hidden" name="antispam" value="{$smarty.now}" />
+	  	<input type="hidden" name="index1" value="{$postindex}" />
+
 	</fieldset>
 		<div class="form-actions">
-
 			{if $orderwelcome}<span class="help-inline">{$orderwelcome}</span>{/if}
-			<button type="submit" class="btn btn-primary">Подтвердить заказ</button>
+			<button type="submit" class="btn btn-success">Подтвердить заказ</button>
 		</div>
 	<script>$(document).ready(function(){ $("input[name*=antispam]").val('{$antispam}'); });</script>
 </form>