Administrator / baucenter

Commit 724698679831e16dad93a1d708231f4dda12fa62

Authored by Karnovsky A
2 parents a1860416 1f343d5d

Merge branch 'master' of gitlab.artweb.com.ua:root/baucenter

Showing 4 changed files with 47 additions and 19 deletions   Show diff stats
Inline Side-by-side
frontend/views/catalog/product.php
  Show/Hide comments   View file @7246986
... ... @@ -48,8 +48,9 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku;
48 48 <div class="counter">
49 49 <div class="price"><?= $product->variant->price?></div>
50 50 <div class="sign">грн.</div>
  51 +
51 52 <div class="count_block">
52   - <div class="count_number">1</div>
  53 + <input type="text" name="" class="form-control buy_one_item" value="1">
53 54 <div class="count_buttons">
54 55 <div class="button_plus">+</div>
55 56 <div class="button_minus">-</div>
... ...
frontend/views/orders/basket-step-01.php
  Show/Hide comments   View file @7246986
... ... @@ -6,7 +6,6 @@ use yii\bootstrap\ActiveForm;
6 6  
7 7 $this->title = 'Оформление заказа';
8 8 $this->params['breadcrumbs'][] = $this->title;
9   -$model->delivery = 2;
10 9 ?>
11 10  
12 11  
... ... @@ -49,20 +48,20 @@ $model-&gt;delivery = 2;
49 48  
50 49 <div class="padding_cust">
51 50 <?= $form->field($model, 'delivery',[
52   - 'radioTemplate' => "{beginLabel}\n{input}\n{labelTitle}\n{endLabel}\n{error}\n{hint}\n<p>Курьерска доставка по Киеву и области</p>",
53   - ])->radio() ?>
  51 + 'radioTemplate' => '<label>{input}<p>Курьерска доставка по Киеву и области</p>{error}{hint}</label>',
  52 + ])->radio(['value'=>1, 'label'=>false]) ?>
54 53 </div>
55 54  
56 55 <div class="padding_cust">
57 56 <?= $form->field($model, 'delivery',[
58   - 'template' => '<label>{input}</label><p>В любой регион Украины</p>{error}{hint}',
59   - ])->radio(['value'=>2,'label'=>false]) ?>
  57 + 'radioTemplate' => '<label>{input}<p>В любой регион Украины</p>{error}{hint}</label>',
  58 + ])->radio(['value'=>2, 'label'=>false]) ?>
60 59 </div>
61 60  
62 61 <div class="padding_cust">
63 62 <?= $form->field($model, 'delivery',[
64   - 'template' => '<label>{input}</label><p>Самовывоз (бесплатно)</p><span class="placehold">уточните подробности по телефону 044 ХХХ-ХХ-ХХ</span>{error}{hint}',
65   - ])->radio(['value'=>3,'label'=>false]) ?>
  63 + 'radioTemplate' => '<label>{input}<p>Самовывоз (бесплатно)</p></label><span class="placehold">уточните подробности по телефону 044 ХХХ-ХХ-ХХ</span>{error}{hint}',
  64 + ])->radio(['value'=>3, 'label'=>false]) ?>
66 65 </div>
67 66 </div>
68 67  
... ... @@ -72,24 +71,32 @@ $model-&gt;delivery = 2;
72 71 <h3>Оплата</h3>
73 72  
74 73 <div class="padding_cust">
75   - <label><input type="radio" name="pay_way" value="0" checked="true" /></label>
76   - <p>Оплата наличными</p>
  74 + <?= $form->field($model, 'payment',[
  75 + 'radioTemplate' => '<label>{input}<p>Оплата наличными</p>{error}{hint}</label>',
  76 + ])->radio(['value'=>1, 'label'=>false]) ?>
77 77 </div>
78 78  
79 79 <div class="padding_cust">
80   - <label><input type="radio" name="pay_way" value="0" /></label>
81   - <p>Оплата по безналичному расчету. Код ЕГРПОУ </p>
82   - <input type="text" name="code">
  80 + <?= $form->field($model, 'payment',[
  81 + 'radioTemplate' => '<label>{input}<p>Оплата по безналичному расчету. Код ЕГРПОУ</p>{error}{hint}</label>',
  82 + ])->radio(['value'=>2, 'label'=>false]) ?>
  83 + <?=
  84 + $form->field($model, 'code',[
  85 + 'template' => '{input}',
  86 + ])->textInput()->label(false);
  87 + ?>
83 88 </div>
84 89  
85 90 <div class="padding_cust">
86   - <label><input type="radio" name="pay_way" value="0" /></label>
87   - <p>Приват 24</p>
  91 + <?= $form->field($model, 'payment',[
  92 + 'radioTemplate' => '<label>{input}<p>Приват 24</p>{error}{hint}</label>',
  93 + ])->radio(['value'=>2, 'label'=>false]) ?>
88 94 </div>
89 95  
90 96 <div class="padding_cust">
91   - <label><input type="radio" name="pay_way" value="0" /></label>
92   - <p>Согласовать с менеджером</p>
  97 + <?= $form->field($model, 'payment',[
  98 + 'radioTemplate' => '<label>{input}<p>Согласовать с менеджером</p>{error}{hint}</label>',
  99 + ])->radio(['value'=>2, 'label'=>false]) ?>
93 100 </div>
94 101  
95 102 </div>
... ...
frontend/web/js/basket.js
  Show/Hide comments   View file @7246986
1 1 $(document).ready(function(){
2 2  
3 3 var result_block = $('.basket_result');
  4 + var one_item_block = $('.busket_block');
4 5  
5 6  
6 7 function changeAjaxPrice(id, num){
... ... @@ -30,7 +31,8 @@ $(document).ready(function(){
30 31  
31 32 $('.main_cont_wrap').on('click', '.cart_btn', function(e){
32 33 var id = $(this).data('id');
33   - $.post( "/orders/buy-items", {id: id, num:1}, function( data ) {
  34 + var num = one_item_block.find('.buy_one_item').val();
  35 + $.post( "/orders/buy-items", {id: id, num:num}, function( data ) {
34 36 $('.basket_result').each(function(){
35 37 $(this).html(data)
36 38 });
... ... @@ -124,4 +126,22 @@ $(document).ready(function(){
124 126  
125 127  
126 128  
  129 + one_item_block.on('click', '.button_minus', function(){
  130 + var input = one_item_block.find('.buy_one_item');
  131 + var number = input.val();
  132 + if(number > 1){
  133 + number--;
  134 + input.val(number);
  135 + }
  136 + });
  137 +
  138 +
  139 + one_item_block.on('click', '.button_plus', function(){
  140 + var input = one_item_block.find('.buy_one_item');
  141 + var number = input.val();
  142 + number++;
  143 + input.val(number);
  144 + });
  145 +
  146 +
127 147 });
128 148 \ No newline at end of file
... ...
frontend/web/js/my_scripts.js
  Show/Hide comments   View file @7246986
... ... @@ -13,7 +13,7 @@ $(document).ready(function(){
13 13 });
14 14  
15 15 // ion checkradio init
16   - $("input[type='radio'], input[type='checkbox']").ionCheckRadio();
  16 + $("input[type='checkbox']").ionCheckRadio();
17 17  
18 18 // filter open li
19 19 var filter_list = $('.filter_list ul li .arrow');
... ...