Administrator / liniya-svitla

Commit a46c643bef1134520be7a4dbc0d22a1e63d73e29

Authored by Yarik
1 parent 53638a15

Link on top basket and remove button.

Showing 7 changed files with 20 additions and 7 deletions   Show diff stats
Inline Side-by-side
frontend/controllers/BasketController.php
  Show/Hide comments   View file @a46c643
@@ -17,6 +17,7 @@ class BasketController extends \yii\web\Controller @@ -17,6 +17,7 @@ class BasketController extends \yii\web\Controller
17 $basket = \Yii::$app->basket; 17 $basket = \Yii::$app->basket;
18 $result = [ 18 $result = [
19 'basket' => $basket->getData(), 19 'basket' => $basket->getData(),
  20 + 'modal' => $basket->getModal(),
20 ]; 21 ];
21 return $result; 22 return $result;
22 } 23 }
frontend/views/basket/modal_items.php
  Show/Hide comments   View file @a46c643
@@ -51,7 +51,9 @@ @@ -51,7 +51,9 @@
51 $item = $basket->getItem($model->product_variant_id); 51 $item = $basket->getItem($model->product_variant_id);
52 echo $item['count'] * $item['price']; 52 echo $item['count'] * $item['price'];
53 ?> 53 ?>
54 - </span><span class="currency">&nbsp;<!--грн.--></span></span> 54 + </span><span class="currency">&nbsp;<!--грн.--></span>
  55 + </span>
  56 + <span class="cart_remove">x</span>
55 </div> 57 </div>
56 <input type="hidden" name="prod_id" value="" id="prod_id"> 58 <input type="hidden" name="prod_id" value="" id="prod_id">
57 </td> 59 </td>
frontend/views/layouts/main.php
  Show/Hide comments   View file @a46c643
@@ -153,7 +153,7 @@ AppAsset::register($this); @@ -153,7 +153,7 @@ AppAsset::register($this);
153 <li><a href="#" data-toggle="modal" data-target="#myAccount">Личный кабинет</a></li> 153 <li><a href="#" data-toggle="modal" data-target="#myAccount">Личный кабинет</a></li>
154 </ul> 154 </ul>
155 <div id="top-cart" class="pull-right"> 155 <div id="top-cart" class="pull-right">
156 - <a href="http://www.linija-svitla.ua/ordering.htm" class="btn btn-cart ">Корзина <i></i></a> 156 + <button class="btn btn-cart ">Корзина <i></i></button>
157 <div id="top-cart-content"> 157 <div id="top-cart-content">
158 <p class="empty-cart">Корзина пуста</p> 158 <p class="empty-cart">Корзина пуста</p>
159 </div> 159 </div>
frontend/web/js/artbox_basket.js
  Show/Hide comments   View file @a46c643
@@ -2,7 +2,7 @@ var ArtboxBasket = (function () { @@ -2,7 +2,7 @@ var ArtboxBasket = (function () {
2 function ArtboxBasket() { 2 function ArtboxBasket() {
3 $.get('/basket', function (data) { 3 $.get('/basket', function (data) {
4 this._items = data.basket; 4 this._items = data.basket;
5 - this.updateCart(); 5 + this.updateModal(data.modal);
6 }.bind(this), 'json').fail(function () { 6 }.bind(this), 'json').fail(function () {
7 console.error('Basket cannot be init'); 7 console.error('Basket cannot be init');
8 }); 8 });
@@ -46,7 +46,7 @@ var ArtboxBasket = (function () { @@ -46,7 +46,7 @@ var ArtboxBasket = (function () {
46 var cart = $('#top-cart-content'); 46 var cart = $('#top-cart-content');
47 var count = this.count; 47 var count = this.count;
48 if (count > 0) { 48 if (count > 0) {
49 - $(cart).html('<a href="ordering.htm"><span class="in_the_cart">В корзине</span><span id="in_cart_col">' + count + ' товар' + ((count > 4) ? 'ов' : ((count > 1) ? 'а' : '')) + '</span><br/><span id="in_cart_sum">на ' + this.sum + ' </span><br/></a><div id="in_cart_a"><a class="btn" href="ordering.htm">оформить покупку</a></div>'); 49 + $(cart).html('<span class="in_the_cart">В корзине</span><span id="in_cart_col">' + count + ' товар' + ((count > 4) ? 'ов' : ((count > 1) ? 'а' : '')) + '</span><br/><span id="in_cart_sum">на ' + this.sum + ' </span><br/><div id="in_cart_a"><a class="btn" href="ordering.htm">оформить покупку</a></div>');
50 } 50 }
51 else { 51 else {
52 $(cart).html('<p class="empty-cart">Корзина пуста</p>'); 52 $(cart).html('<p class="empty-cart">Корзина пуста</p>');
frontend/web/js/artbox_basket.js.map
  Show/Hide comments   View file @a46c643
1 -{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":[],"mappings":"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"}  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":[],"mappings":"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"}
3 \ No newline at end of file 3 \ No newline at end of file
frontend/web/js/artbox_basket.ts
  Show/Hide comments   View file @a46c643
@@ -6,7 +6,7 @@ class ArtboxBasket { @@ -6,7 +6,7 @@ class ArtboxBasket {
6 constructor() { 6 constructor() {
7 $.get('/basket', function (data) { 7 $.get('/basket', function (data) {
8 this._items = data.basket; 8 this._items = data.basket;
9 - this.updateCart(); 9 + this.updateModal(data.modal);
10 }.bind(this), 'json').fail(function() { 10 }.bind(this), 'json').fail(function() {
11 console.error('Basket cannot be init'); 11 console.error('Basket cannot be init');
12 }); 12 });
@@ -42,7 +42,7 @@ class ArtboxBasket { @@ -42,7 +42,7 @@ class ArtboxBasket {
42 var cart = $('#top-cart-content'); 42 var cart = $('#top-cart-content');
43 var count = this.count; 43 var count = this.count;
44 if(count > 0) { 44 if(count > 0) {
45 - $(cart).html('<a href="ordering.htm"><span class="in_the_cart">В корзине</span><span id="in_cart_col">' + count + ' товар' + ((count > 4) ? 'ов' : ((count > 1) ? 'а' : '')) + '</span><br/><span id="in_cart_sum">на ' + this.sum + ' </span><br/></a><div id="in_cart_a"><a class="btn" href="ordering.htm">оформить покупку</a></div>'); 45 + $(cart).html('<span class="in_the_cart">В корзине</span><span id="in_cart_col">' + count + ' товар' + ((count > 4) ? 'ов' : ((count > 1) ? 'а' : '')) + '</span><br/><span id="in_cart_sum">на ' + this.sum + ' </span><br/><div id="in_cart_a"><a class="btn" href="ordering.htm">оформить покупку</a></div>');
46 } else { 46 } else {
47 $(cart).html('<p class="empty-cart">Корзина пуста</p>'); 47 $(cart).html('<p class="empty-cart">Корзина пуста</p>');
48 } 48 }
frontend/web/js/script.js
  Show/Hide comments   View file @a46c643
@@ -31,4 +31,14 @@ $(document).on(&#39;click&#39;, &#39;#buyForm .count_choise .plus&#39;, function(e) { @@ -31,4 +31,14 @@ $(document).on(&#39;click&#39;, &#39;#buyForm .count_choise .plus&#39;, function(e) {
31 var new_value = parseInt(value) + 1; 31 var new_value = parseInt(value) + 1;
32 $(input).val(new_value); 32 $(input).val(new_value);
33 $(input).trigger('change'); 33 $(input).trigger('change');
  34 +});
  35 +$(document).on('click', '#top-cart', function() {
  36 + if(artbox_basket.count > 0) {
  37 + $('#buyForm').modal('show');
  38 + }
  39 +});
  40 +$(document).on('click', '#buyForm .cart_remove', function() {
  41 + var container = $(this).parents('tr');
  42 + var id = $(container).data('id');
  43 + artbox_basket.set(id, 0);
34 }); 44 });
35 \ No newline at end of file 45 \ No newline at end of file