Commit 444e47453189a21f8c178087caeb04a43e453a90
1 parent
5fb763b2
image size
Showing
2 changed files
with
55 additions
and
40 deletions
Show diff stats
frontend/views/basket/index.php
| ... | ... | @@ -59,9 +59,19 @@ $('#order-delivery input[type=\"radio\"]').click(function(){ |
| 59 | 59 | <div class='delivery-data' id='delivery-data-<?=$item->id?>'> |
| 60 | 60 | <?=$item->text?> |
| 61 | 61 | <?= $form->field($modelOrder, 'delivery') |
| 62 | - ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>$item->id])->asArray()->all(), 'id', 'title'),['id' => 'order-delivery-childs'])->label(false) | |
| 62 | + ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>$item->id])->asArray()->all(), 'id', 'title'), | |
| 63 | + [ | |
| 64 | + 'item' => function($index, $label, $name, $checked, $value) { | |
| 65 | + $return = '<div class="custom-form-buttons">'; | |
| 66 | + $return .= '<input class="custom-radio" id="custom-radio-' . $value . '" ' . ( $checked ? "checked" : "" ) . ' type="radio" name="' . $name . '" value="' . $value . '" >'; | |
| 67 | + $return .= '<label for="custom-radio-' . $value . '" ><span></span>' . $label . '</label>'; | |
| 68 | + $return .= '</div>'; | |
| 69 | + return $return; | |
| 70 | + }, | |
| 71 | + ]); | |
| 63 | 72 | ?> |
| 64 | -</div> | |
| 73 | +</div> | |
| 74 | + | |
| 65 | 75 | <?php endforeach;?> |
| 66 | 76 | |
| 67 | 77 | <?php echo $form->field($modelOrder, 'payment')->radioList(['Оплатить наличными'=>'Оплатить наличными','Оплатить на карту Приват Банка'=>'Оплатить на карту Приват Банка','Оплатить по безналичному расчету'=>'Оплатить по безналичному расчету','Оплатить Правекс-телеграф'=>'Оплатить Правекс-телеграф','Наложенным платежом'=>'Наложенным платежом']); ?> | ... | ... |
frontend/web/js/basket.js
| ... | ... | @@ -26,42 +26,48 @@ |
| 26 | 26 | }); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - var popup = function(w,form){ | |
| 30 | - $.get("/basket/items/", {} ,function(data){ | |
| 31 | - $('.basket_items').html(data); | |
| 32 | - $('.basket_items .delete_button').click(function(){ | |
| 33 | - var id =$(this).data('id'); | |
| 34 | - $.get("/basket/items/", {deleteID : id},function(data){ | |
| 35 | - popup(w,form); | |
| 36 | - start_basket(w,form); | |
| 37 | - }); | |
| 38 | - return false; | |
| 29 | + | |
| 30 | + var update = function(data,form,w){ | |
| 31 | + console.log(data); | |
| 32 | + $('.basket_items').html(data); | |
| 33 | + $('.basket_items .delete_button').click(function(){ | |
| 34 | + var id =$(this).data('id'); | |
| 35 | + $.get("/basket/items/", {deleteID : id},function(data){ | |
| 36 | + popup(w,form); | |
| 37 | + start_basket(w,form); | |
| 39 | 38 | }); |
| 40 | - $(".item_num").bind('input',function(){ | |
| 39 | + return false; | |
| 40 | + }); | |
| 41 | + $(".item_num").bind('input',function(){ | |
| 42 | + sendformitems(w,form); | |
| 43 | + }); | |
| 44 | + $(".minus").click(function(){ | |
| 45 | + var a = $(this).parent().find(".item_num").attr("value"); | |
| 46 | + if (a == 1) { | |
| 47 | + /* минимум 1 элемент */ | |
| 48 | + } | |
| 49 | + else{ | |
| 50 | + a--; | |
| 51 | + $(this).parent().find('.item_num').val(a); | |
| 41 | 52 | sendformitems(w,form); |
| 42 | - }); | |
| 43 | - $(".minus").click(function(){ | |
| 44 | - var a = $(this).parent().find(".item_num").attr("value"); | |
| 45 | - if (a == 1) { | |
| 46 | - /* минимум 1 элемент */ | |
| 47 | - } | |
| 48 | - else{ | |
| 49 | - a--; | |
| 50 | - $(this).parent().find('.item_num').val(a); | |
| 51 | - sendformitems(w,form); | |
| 52 | - } | |
| 53 | - }); | |
| 54 | - $(".plus").click(function(){ | |
| 55 | - var a = $(this).parent().find(".item_num").attr("value"); | |
| 56 | - if (a == 10) { | |
| 57 | - /* минимум 1 элемент */ | |
| 58 | - } | |
| 59 | - else{ | |
| 60 | - a++; | |
| 61 | - $(this).parent().find('.item_num').val(a); | |
| 62 | - sendformitems(w,form); | |
| 63 | - } | |
| 64 | - }); | |
| 53 | + } | |
| 54 | + }); | |
| 55 | + $(".plus").click(function(){ | |
| 56 | + var a = $(this).parent().find(".item_num").attr("value"); | |
| 57 | + if (a == 10) { | |
| 58 | + /* минимум 1 элемент */ | |
| 59 | + } | |
| 60 | + else{ | |
| 61 | + a++; | |
| 62 | + $(this).parent().find('.item_num').val(a); | |
| 63 | + sendformitems(w,form); | |
| 64 | + } | |
| 65 | + }); | |
| 66 | + }; | |
| 67 | + | |
| 68 | + var popup = function(w,form){ | |
| 69 | + $.get("/basket/items/", {} ,function(data){ | |
| 70 | + update(data,form,w); | |
| 65 | 71 | }); |
| 66 | 72 | if(w==0) { |
| 67 | 73 | $(".black").removeClass("hidden"); |
| ... | ... | @@ -76,15 +82,14 @@ |
| 76 | 82 | |
| 77 | 83 | var sendformitems = function(w,form){ |
| 78 | 84 | var data_form = $(form+' .basket_form2').serialize(); |
| 79 | - console.log(data_form); | |
| 80 | - | |
| 85 | + console.log(w); | |
| 81 | 86 | $.ajax({ |
| 82 | 87 | type: 'POST', |
| 83 | 88 | url: "/basket/items/", |
| 84 | 89 | dataType: "json", |
| 85 | 90 | data: data_form, |
| 86 | - success: function(data) { | |
| 87 | - popup(w,form); | |
| 91 | + done: function(data) { | |
| 92 | + update(data,form,w); | |
| 88 | 93 | start_basket(); |
| 89 | 94 | }, |
| 90 | 95 | }); | ... | ... |