From 1f343d5d76644b1bc6c020cc20de834978c0d310 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 25 Mar 2016 15:11:54 +0200 Subject: [PATCH] 25.03.16 finish 1 --- frontend/views/catalog/product.php | 3 ++- frontend/views/orders/basket-step-01.php | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- frontend/web/js/basket.js | 22 +++++++++++++++++++++- frontend/web/js/my_scripts.js | 2 +- 4 files changed, 98 insertions(+), 67 deletions(-) diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index e5c6eea..3d40160 100644 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -48,8 +48,9 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku;
variant->price?>
грн.
+
-
1
+
+
-
diff --git a/frontend/views/orders/basket-step-01.php b/frontend/views/orders/basket-step-01.php index adad723..2e3c9f3 100644 --- a/frontend/views/orders/basket-step-01.php +++ b/frontend/views/orders/basket-step-01.php @@ -2,97 +2,107 @@ use yii\helpers\Html; use yii\helpers\Url; -use yii\widgets\ActiveForm; +use yii\bootstrap\ActiveForm; $this->title = 'Оформление заказа'; $this->params['breadcrumbs'][] = $this->title; - ?>

Оформление заказа

- 'basket_order_01_form' -]); ?> - - -
+ 'basket_order_01_form' + ]); ?> -

Личные данные

-
- field($model, 'name',[ - 'template' => '', - ])->textInput() ?> -
- -
- field($model, 'email',[ - 'template' => '', - ])->textInput() ?> -
+
-
- field($model, 'phone',[ - 'template' => '', - ])->textInput() ?> -
+

Личные данные

-
+
+ field($model, 'name',[ + 'template' => '', + ])->textInput() ?> +
-
+
+ field($model, 'email',[ + 'template' => '', + ])->textInput() ?> +
-
-

Доставка

+
+ field($model, 'phone',[ + 'template' => '', + ])->textInput() ?> +
-
- -

Курьерска доставка по Киеву и области

-
- -

В любой регион Украины

-
+
-
- -

Самовывоз (бесплатно)

- уточните подробности по телефону 044 ХХХ-ХХ-ХХ -
-
+
+

Доставка

-
+
+ field($model, 'delivery',[ + 'radioTemplate' => '', + ])->radio(['value'=>1, 'label'=>false]) ?> +
-
-

Оплата

+
+ field($model, 'delivery',[ + 'radioTemplate' => '', + ])->radio(['value'=>2, 'label'=>false]) ?> +
-
- -

Оплата наличными

+
+ field($model, 'delivery',[ + 'radioTemplate' => 'уточните подробности по телефону 044 ХХХ-ХХ-ХХ{error}{hint}', + ])->radio(['value'=>3, 'label'=>false]) ?> +
-
- -

Оплата по безналичному расчету. Код ЕГРПОУ

-
+
+ +
+

Оплата

+ +
+ field($model, 'payment',[ + 'radioTemplate' => '', + ])->radio(['value'=>1, 'label'=>false]) ?> +
+ +
+ field($model, 'payment',[ + 'radioTemplate' => '', + ])->radio(['value'=>2, 'label'=>false]) ?> + field($model, 'code',[ + 'template' => '{input}', + ])->textInput()->label(false); + ?> +
+ +
+ field($model, 'payment',[ + 'radioTemplate' => '', + ])->radio(['value'=>2, 'label'=>false]) ?> +
+ +
+ field($model, 'payment',[ + 'radioTemplate' => '', + ])->radio(['value'=>2, 'label'=>false]) ?> +
-
- -

Приват 24

-
- -

Согласовать с менеджером

+
+ 'order_01_btn', 'name' => 'signup-button']) ?>
-
- -
- 'order_01_btn', 'name' => 'signup-button']) ?> -
- \ No newline at end of file diff --git a/frontend/web/js/basket.js b/frontend/web/js/basket.js index 0657dfc..a3b3574 100644 --- a/frontend/web/js/basket.js +++ b/frontend/web/js/basket.js @@ -1,6 +1,7 @@ $(document).ready(function(){ var result_block = $('.basket_result'); + var one_item_block = $('.busket_block'); function changeAjaxPrice(id, num){ @@ -30,7 +31,8 @@ $(document).ready(function(){ $('.main_cont_wrap').on('click', '.cart_btn', function(e){ var id = $(this).data('id'); - $.post( "/orders/buy-items", {id: id, num:1}, function( data ) { + var num = one_item_block.find('.buy_one_item').val(); + $.post( "/orders/buy-items", {id: id, num:num}, function( data ) { $('.basket_result').each(function(){ $(this).html(data) }); @@ -124,4 +126,22 @@ $(document).ready(function(){ + one_item_block.on('click', '.button_minus', function(){ + var input = one_item_block.find('.buy_one_item'); + var number = input.val(); + if(number > 1){ + number--; + input.val(number); + } + }); + + + one_item_block.on('click', '.button_plus', function(){ + var input = one_item_block.find('.buy_one_item'); + var number = input.val(); + number++; + input.val(number); + }); + + }); \ No newline at end of file diff --git a/frontend/web/js/my_scripts.js b/frontend/web/js/my_scripts.js index b3699d4..6617118 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='radio'], input[type='checkbox']").ionCheckRadio(); + $("input[type='checkbox']").ionCheckRadio(); // filter open li var filter_list = $('.filter_list ul li .arrow'); -- libgit2 0.21.4