From 2c71da38ce3016acf199f204b7ce3e76d10c95d6 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Mon, 28 Mar 2016 11:46:30 +0300
Subject: [PATCH] 25.03.16  finish 1

---
 common/translation/ru/app.php            |  5 +++++
 common/widgets/views/busket_modal.php    | 10 +++++-----
 frontend/views/orders/basket-step-01.php | 90 +++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
 frontend/web/css/concat_all.css          |  1 -
 frontend/web/js/my_scripts.js            |  2 +-
 5 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/common/translation/ru/app.php b/common/translation/ru/app.php
index efcee4a..37c20fe 100644
--- a/common/translation/ru/app.php
+++ b/common/translation/ru/app.php
@@ -22,4 +22,9 @@ return [
     'your_personal_area' => 'Вход в личный кабинет',
     'forgot_password' => 'Забыли пароль?',
     'rememberMe' => 'Запомнить меня',
+    'articles' => 'Всего товаров',
+    'code' => 'Код: {0}',
+    'checkout' => 'оформить заказ',
+    'sum' => 'Сумма',
+    'continue_shopping' => 'продолжить покупки',
 ];
\ No newline at end of file
diff --git a/common/widgets/views/busket_modal.php b/common/widgets/views/busket_modal.php
index fa5dc90..2ed0e5f 100644
--- a/common/widgets/views/busket_modal.php
+++ b/common/widgets/views/busket_modal.php
@@ -24,7 +24,7 @@ use yii\helpers\Html;
                 </div>
                 <div class="name_and_code">
                     <span class="name"><?=$item['item']->product->name.' '.$item['item']->name?></span>
-                    <span class="code"> Код: 45885-01016049</span>
+                    <span class="code"><?= Yii::t('app', 'code', '45885-01016049')?></span>
                 </div>
                 <div class="count_block_wrap">
                     <div class="count_block">
@@ -43,11 +43,11 @@ use yii\helpers\Html;
     </ul>
     <hr>
     <div class="all_price">
-        <p>Всего товаров: <span class="all_count"><?= $count ?></span></p>
-        <p>Сумма: <span class="all_price all_price_span"><?= $price ?></span> грн.</p>
+        <p><?= Yii::t('app','articles')?>: <span class="all_count"><?= $count ?></span></p>
+        <p><?= Yii::t('app','sum')?>: <span class="all_price all_price_span"><?= $price ?></span> грн.</p>
     </div>
     <div class="busket_bottom_btn">
-        <a class = "close" href="#">продолжить покупки</a>
-        <?= Html::a('оформить заказ', ['orders/first'], ['class'=> 'button']);?>
+        <?= Html::a(Yii::t('app','continue_shopping'),'#', ['class'=> 'close']) ?>
+        <?= Html::a(Yii::t('app','checkout'), ['orders/first'], ['class'=> 'button']);?>
     </div>
 </div>
diff --git a/frontend/views/orders/basket-step-01.php b/frontend/views/orders/basket-step-01.php
index 2e3c9f3..3a57a2d 100644
--- a/frontend/views/orders/basket-step-01.php
+++ b/frontend/views/orders/basket-step-01.php
@@ -3,7 +3,6 @@
 use yii\helpers\Html;
 use yii\helpers\Url;
 use yii\bootstrap\ActiveForm;
-
 $this->title = 'Оформление заказа';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -46,58 +45,55 @@ $this->params['breadcrumbs'][] = $this->title;
 	<div class="delivery_radio">
 		<h3>Доставка</h3>
 
-	 	<div class="padding_cust">
-			<?= $form->field($model, 'delivery',[
-				'radioTemplate' => '<label>{input}<p>Курьерска доставка по Киеву и области</p>{error}{hint}</label>',
-			])->radio(['value'=>1, 'label'=>false]) ?>
-	 	</div>
-
-	 	<div class="padding_cust">
-			<?= $form->field($model, 'delivery',[
-				'radioTemplate' => '<label>{input}<p>В любой регион Украины</p>{error}{hint}</label>',
-			])->radio(['value'=>2, 'label'=>false]) ?>
-	 	</div>
-
-	 	<div class="padding_cust">
-			<?= $form->field($model, 'delivery',[
-				'radioTemplate' => '<label>{input}<p>Самовывоз (бесплатно)</p></label><span class="placehold">уточните подробности по телефону 044 ХХХ-ХХ-ХХ</span>{error}{hint}',
-			])->radio(['value'=>3, 'label'=>false]) ?>
-	 	</div>
-	</div>
+
+		<?php
+
+
+		echo $form->field($model, 'delivery', [
+		])->radioList([
+			'1' => '<p>Курьерска доставка по Киеву и области</p>',
+			'2' => '<p>В любой регион Украины</p>',
+			'3' => '<p>Самовывоз (бесплатно)</p></label><span class="placehold">уточните подробности по телефону 044 ХХХ-ХХ-ХХ</span>',
+		], [
+			'item' => function ($index, $label, $name, $checked, $value) {
+				return '<div class="padding_cust"><label>' .
+				Html::radio($name, $checked, ['value' => $value]) . $label . '</label></div>';
+			},
+		])->label(false);
+
+
+		?>
+
 
 	<div class="separator_02"></div>
 
 	<div class="basket_pay_block">
 		<h3>Оплата</h3>
 
-		<div class="padding_cust">
-			<?= $form->field($model, 'payment',[
-				'radioTemplate' => '<label>{input}<p>Оплата наличными</p>{error}{hint}</label>',
-			])->radio(['value'=>1, 'label'=>false]) ?>
-	 	</div>
-
-	 	<div class="padding_cust">
-			<?= $form->field($model, 'payment',[
-				'radioTemplate' => '<label>{input}<p>Оплата по безналичному расчету. Код ЕГРПОУ</p>{error}{hint}</label>',
-			])->radio(['value'=>2, 'label'=>false]) ?>
-			<?=
-				$form->field($model, 'code',[
-				'template' => '{input}',
-			])->textInput()->label(false);
-			?>
-	 	</div>
-
-	 	<div class="padding_cust">
-			<?= $form->field($model, 'payment',[
-				'radioTemplate' => '<label>{input}<p>Приват 24</p>{error}{hint}</label>',
-			])->radio(['value'=>2, 'label'=>false]) ?>
-	 	</div>
-
-	 	<div class="padding_cust">
-			<?= $form->field($model, 'payment',[
-				'radioTemplate' => '<label>{input}<p>Согласовать с менеджером</p>{error}{hint}</label>',
-			])->radio(['value'=>2, 'label'=>false]) ?>
-	 	</div>
+		<?php
+
+
+		echo $form->field($model, 'payment', [
+		])->radioList([
+			'1' => '<p>Оплата наличными</p>',
+			'2' => '<p>Оплата по безналичному расчету. Код ЕГРПОУ</p>',
+			'3' => '<p>Приват 24</p>',
+			'4' => '<p>Согласовать с менеджером</p>',
+		], [
+			'item' => function ($index, $label, $name, $checked, $value) use ($model) {
+				if($index != 1){
+					return '<div class="padding_cust"><label>' .
+					Html::radio($name, $checked, ['value' => $value]) . $label . '</label></div>';
+				} else {
+					return '<div class="padding_cust"><label>' .
+					Html::radio($name, $checked, ['value' => $value]) . $label . '</label>'.Html::activeTextInput($model,'code').'</div>';
+				}
+
+			},
+		])->label(false);
+
+
+		?>
 
 	</div>
 
diff --git a/frontend/web/css/concat_all.css b/frontend/web/css/concat_all.css
index feb75d2..0824c4e 100644
--- a/frontend/web/css/concat_all.css
+++ b/frontend/web/css/concat_all.css
@@ -1434,7 +1434,6 @@ span.red {
   height: 17px;
   top: -11px;
   position: absolute;
-  left: 315px;
   height: 22px;
   -webkit-border-radius: 2px;
   border-radius: 2px;
diff --git a/frontend/web/js/my_scripts.js b/frontend/web/js/my_scripts.js
index 6617118..b3699d4 100644
--- a/frontend/web/js/my_scripts.js
+++ b/frontend/web/js/my_scripts.js
@@ -13,7 +13,7 @@ $(document).ready(function(){
 	});
 
 	// ion checkradio init
-	$("input[type='checkbox']").ionCheckRadio();
+	$("input[type='radio'], input[type='checkbox']").ionCheckRadio();
 
 	// filter open li
 	var filter_list = $('.filter_list ul li .arrow');
--
libgit2 0.21.4