@@ -268,7 +268,7 @@ |
||
268 | 268 | $result->send(); |
269 | 269 | } |
270 | 270 | |
271 | - $item->sales ++; |
|
271 | + $item->sales++; |
|
272 | 272 | $item->save(); |
273 | 273 | |
274 | 274 | if (empty($_GET['count'])) |
@@ -270,10 +270,11 @@ |
||
270 | 270 | $item->sales ++; |
271 | 271 | $item->save(); |
272 | 272 | |
273 | - if (empty($_GET['count'])) |
|
274 | - $count = 1; |
|
275 | - else |
|
276 | - $count = (float) $_GET['count']; |
|
273 | + if (empty($_GET['count'])) { |
|
274 | + $count = 1; |
|
275 | + } else { |
|
276 | + $count = (float) $_GET['count']; |
|
277 | + } |
|
277 | 278 | |
278 | 279 | $cart = $this->ecommerce->getCurCart(); |
279 | 280 |
@@ -2,9 +2,9 @@ |
||
2 | 2 | <div class="cart-order_page"> |
3 | 3 | <h2>Быстрое оформление заказа</h2> |
4 | 4 | <?php |
5 | - if (!$cart || !$cart->cartItems) |
|
6 | - echo "<h1>Ваша корзина пуста</h1>"; |
|
7 | - else { |
|
5 | + if (!$cart || !$cart->cartItems) { |
|
6 | + echo "<h1>Ваша корзина пуста</h1>"; |
|
7 | + } else { |
|
8 | 8 | $sums = []; |
9 | 9 | $cartDelivery = $cart->delivery; |
10 | 10 | $deliveryPrice = 0; |
@@ -61,12 +61,12 @@ discard block |
||
61 | 61 | </div> |
62 | 62 | </div> |
63 | 63 | <?php |
64 | - $packchecked = ''; |
|
65 | - $packItem = false; |
|
66 | - $packSum = 0; |
|
67 | - if ($packItem) { |
|
68 | - $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked'; |
|
69 | - ?> |
|
64 | + $packchecked = ''; |
|
65 | + $packItem = false; |
|
66 | + $packSum = 0; |
|
67 | + if ($packItem) { |
|
68 | + $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked'; |
|
69 | + ?> |
|
70 | 70 | <fieldset id="additional"> |
71 | 71 | <h2 class="secondary-title">Дополнительно</h2> |
72 | 72 | <div class=" checkout-payment-form"> |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | </div> |
90 | 90 | </fieldset> |
91 | 91 | <?php |
92 | - } |
|
93 | - ?> |
|
92 | + } |
|
93 | + ?> |
|
94 | 94 | </div> |
95 | 95 | </div> |
96 | 96 | <div class="col-sm-8"> |
@@ -115,24 +115,24 @@ discard block |
||
115 | 115 | <div class="col-md-4"> |
116 | 116 | <ul class="nav nav-pills nav-stacked"> |
117 | 117 | <?php |
118 | - $hiddenId = Tools::randomString(); |
|
119 | - foreach ($payTypes as $payType) { |
|
120 | - if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || $payType->id == $cartPayType->id) { |
|
121 | - $checked = 'checked'; |
|
122 | - } else { |
|
123 | - $checked = ''; |
|
124 | - } |
|
125 | - echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
126 | - echo $payType->name; |
|
127 | - echo '</a></li>'; |
|
128 | - } |
|
129 | - $form->input('hidden', "payType", '', [ |
|
130 | - 'value' => $cartPayType->id, |
|
131 | - 'attributes' => [ |
|
132 | - 'id' => $hiddenId |
|
133 | - ], |
|
134 | - ]); |
|
135 | - ?> |
|
118 | + $hiddenId = Tools::randomString(); |
|
119 | + foreach ($payTypes as $payType) { |
|
120 | + if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || $payType->id == $cartPayType->id) { |
|
121 | + $checked = 'checked'; |
|
122 | + } else { |
|
123 | + $checked = ''; |
|
124 | + } |
|
125 | + echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
126 | + echo $payType->name; |
|
127 | + echo '</a></li>'; |
|
128 | + } |
|
129 | + $form->input('hidden', "payType", '', [ |
|
130 | + 'value' => $cartPayType->id, |
|
131 | + 'attributes' => [ |
|
132 | + 'id' => $hiddenId |
|
133 | + ], |
|
134 | + ]); |
|
135 | + ?> |
|
136 | 136 | </ul> |
137 | 137 | </div> |
138 | 138 | <div class="col-md-8"> |
@@ -101,7 +101,7 @@ |
||
101 | 101 | <h3 class="panel-title">Способ доставки</h3> |
102 | 102 | </div> |
103 | 103 | <div class="panel-body"> |
104 | - <?php $this->widget('Ecommerce\cart/delivery', compact('form','cart','deliverys', 'cartDelivery')); ?> |
|
104 | + <?php $this->widget('Ecommerce\cart/delivery', compact('form', 'cart', 'deliverys', 'cartDelivery')); ?> |
|
105 | 105 | </div> |
106 | 106 | </div> |
107 | 107 | </div> |
@@ -6,11 +6,11 @@ discard block |
||
6 | 6 | </tr> |
7 | 7 | </thead> |
8 | 8 | <?php |
9 | - $orderDeatilCols = [ |
|
10 | - 'id' => '№ Заказа', |
|
11 | - 'complete_data' => 'Дата заказа' |
|
12 | - ]; |
|
13 | - ?> |
|
9 | + $orderDeatilCols = [ |
|
10 | + 'id' => '№ Заказа', |
|
11 | + 'complete_data' => 'Дата заказа' |
|
12 | + ]; |
|
13 | + ?> |
|
14 | 14 | <tbody> |
15 | 15 | <tr> |
16 | 16 | <td class="text-left" style="width: 50%;"> |
@@ -63,91 +63,91 @@ discard block |
||
63 | 63 | </thead> |
64 | 64 | <tbody> |
65 | 65 | <?php |
66 | - $sums = []; |
|
67 | - foreach ($cart->cartItems as $cartItem) { |
|
68 | - $item = $cartItem->item; |
|
69 | - $itemName = $item->name(); |
|
70 | - if (!isset($sums[$cartItem->price->currency_id])) { |
|
71 | - $sums[$cartItem->price->currency_id] = $cartItem->price->price; |
|
72 | - } else { |
|
73 | - $sums[$cartItem->price->currency_id] += $cartItem->price->price; |
|
74 | - } |
|
75 | - ?> |
|
66 | + $sums = []; |
|
67 | + foreach ($cart->cartItems as $cartItem) { |
|
68 | + $item = $cartItem->item; |
|
69 | + $itemName = $item->name(); |
|
70 | + if (!isset($sums[$cartItem->price->currency_id])) { |
|
71 | + $sums[$cartItem->price->currency_id] = $cartItem->price->price; |
|
72 | + } else { |
|
73 | + $sums[$cartItem->price->currency_id] += $cartItem->price->price; |
|
74 | + } |
|
75 | + ?> |
|
76 | 76 | <tr> |
77 | 77 | <td class="text-left"><?= $itemName; ?></td> |
78 | 78 | <td class="text-right"><?= $cartItem->count; ?></td> |
79 | 79 | <td class="text-right"><?= $cartItem->price->price; ?> |
80 | 80 | <?php |
81 | - if (App::$cur->money) { |
|
82 | - $currency = Money\Currency::get($cartItem->price->currency_id); |
|
83 | - if ($currency) { |
|
84 | - echo $currency->acronym(); |
|
85 | - } else { |
|
86 | - echo 'руб.'; |
|
87 | - } |
|
88 | - } else { |
|
89 | - echo 'руб.'; |
|
90 | - } |
|
91 | - ?></td> |
|
81 | + if (App::$cur->money) { |
|
82 | + $currency = Money\Currency::get($cartItem->price->currency_id); |
|
83 | + if ($currency) { |
|
84 | + echo $currency->acronym(); |
|
85 | + } else { |
|
86 | + echo 'руб.'; |
|
87 | + } |
|
88 | + } else { |
|
89 | + echo 'руб.'; |
|
90 | + } |
|
91 | + ?></td> |
|
92 | 92 | <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?> |
93 | 93 | <?php |
94 | - if (App::$cur->money) { |
|
95 | - $currency = Money\Currency::get($cartItem->price->currency_id); |
|
96 | - if ($currency) { |
|
97 | - echo $currency->acronym(); |
|
98 | - } else { |
|
99 | - echo 'руб.'; |
|
100 | - } |
|
101 | - } else { |
|
102 | - echo 'руб.'; |
|
103 | - } |
|
104 | - ?></td> |
|
94 | + if (App::$cur->money) { |
|
95 | + $currency = Money\Currency::get($cartItem->price->currency_id); |
|
96 | + if ($currency) { |
|
97 | + echo $currency->acronym(); |
|
98 | + } else { |
|
99 | + echo 'руб.'; |
|
100 | + } |
|
101 | + } else { |
|
102 | + echo 'руб.'; |
|
103 | + } |
|
104 | + ?></td> |
|
105 | 105 | <td class="text-right" style="white-space: nowrap;"> |
106 | 106 | <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1); |
107 | 107 | return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a> |
108 | 108 | </tr> |
109 | 109 | <?php |
110 | - } |
|
111 | - ?> |
|
110 | + } |
|
111 | + ?> |
|
112 | 112 | </tbody> |
113 | 113 | <tfoot> |
114 | 114 | <tr> |
115 | 115 | <td colspan="2"></td> |
116 | 116 | <td class="text-right"><b>Сумма</b></td> |
117 | 117 | <td class="text-right"><?php |
118 | - foreach ($sums as $currency_id => $sum) { |
|
119 | - if (!$sum) { |
|
120 | - continue; |
|
121 | - } |
|
122 | - echo number_format($sum, 2, '.', ' '); |
|
123 | - if (App::$cur->money) { |
|
124 | - $currency = Money\Currency::get($currency_id); |
|
125 | - if ($currency) { |
|
126 | - echo ' ' . $currency->acronym(); |
|
127 | - } else { |
|
128 | - echo ' руб.'; |
|
129 | - } |
|
130 | - } else { |
|
131 | - echo ' руб.'; |
|
132 | - } |
|
133 | - echo '<br />'; |
|
134 | - } |
|
135 | - ?></td> |
|
118 | + foreach ($sums as $currency_id => $sum) { |
|
119 | + if (!$sum) { |
|
120 | + continue; |
|
121 | + } |
|
122 | + echo number_format($sum, 2, '.', ' '); |
|
123 | + if (App::$cur->money) { |
|
124 | + $currency = Money\Currency::get($currency_id); |
|
125 | + if ($currency) { |
|
126 | + echo ' ' . $currency->acronym(); |
|
127 | + } else { |
|
128 | + echo ' руб.'; |
|
129 | + } |
|
130 | + } else { |
|
131 | + echo ' руб.'; |
|
132 | + } |
|
133 | + echo '<br />'; |
|
134 | + } |
|
135 | + ?></td> |
|
136 | 136 | <td></td> |
137 | 137 | </tr> |
138 | 138 | <?php |
139 | - $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0; |
|
140 | - $deliveryPrice = $cart->delivery->price; |
|
141 | - if (!isset($sums[$deliveryCurrency])) { |
|
142 | - $sums[$deliveryCurrency] = $deliveryPrice; |
|
143 | - } else { |
|
144 | - $sums[$deliveryCurrency] += $deliveryPrice; |
|
145 | - } |
|
146 | - $delCurrency = false; |
|
147 | - if (App::$cur->money) { |
|
148 | - $delCurrency = Money\Currency::get($deliveryPrice); |
|
149 | - } |
|
150 | - ?> |
|
139 | + $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0; |
|
140 | + $deliveryPrice = $cart->delivery->price; |
|
141 | + if (!isset($sums[$deliveryCurrency])) { |
|
142 | + $sums[$deliveryCurrency] = $deliveryPrice; |
|
143 | + } else { |
|
144 | + $sums[$deliveryCurrency] += $deliveryPrice; |
|
145 | + } |
|
146 | + $delCurrency = false; |
|
147 | + if (App::$cur->money) { |
|
148 | + $delCurrency = Money\Currency::get($deliveryPrice); |
|
149 | + } |
|
150 | + ?> |
|
151 | 151 | <tr> |
152 | 152 | <td colspan="2"></td> |
153 | 153 | <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td> |
@@ -158,24 +158,24 @@ discard block |
||
158 | 158 | <td colspan="2"></td> |
159 | 159 | <td class="text-right"><b>Итого</b></td> |
160 | 160 | <td class="text-right"><?php |
161 | - foreach ($sums as $currency_id => $sum) { |
|
162 | - if (!$sum) { |
|
163 | - continue; |
|
164 | - } |
|
165 | - echo number_format($sum, 2, '.', ' '); |
|
166 | - if (App::$cur->money) { |
|
167 | - $currency = Money\Currency::get($currency_id); |
|
168 | - if ($currency) { |
|
169 | - echo ' ' . $currency->acronym(); |
|
170 | - } else { |
|
171 | - echo ' руб.'; |
|
172 | - } |
|
173 | - } else { |
|
174 | - echo ' руб.'; |
|
175 | - } |
|
176 | - echo '<br />'; |
|
177 | - } |
|
178 | - ?></td> |
|
161 | + foreach ($sums as $currency_id => $sum) { |
|
162 | + if (!$sum) { |
|
163 | + continue; |
|
164 | + } |
|
165 | + echo number_format($sum, 2, '.', ' '); |
|
166 | + if (App::$cur->money) { |
|
167 | + $currency = Money\Currency::get($currency_id); |
|
168 | + if ($currency) { |
|
169 | + echo ' ' . $currency->acronym(); |
|
170 | + } else { |
|
171 | + echo ' руб.'; |
|
172 | + } |
|
173 | + } else { |
|
174 | + echo ' руб.'; |
|
175 | + } |
|
176 | + echo '<br />'; |
|
177 | + } |
|
178 | + ?></td> |
|
179 | 179 | <td></td> |
180 | 180 | </tr> |
181 | 181 | </tfoot> |
@@ -50,12 +50,12 @@ |
||
50 | 50 | <td> |
51 | 51 | <ul> |
52 | 52 | <?php |
53 | - foreach ($card->levels as $level) { |
|
54 | - ?> |
|
53 | + foreach ($card->levels as $level) { |
|
54 | + ?> |
|
55 | 55 | <li><?= $level->name; ?> - <?= $level->discount->name; ?></li> |
56 | 56 | <?php |
57 | - } |
|
58 | - ?> |
|
57 | + } |
|
58 | + ?> |
|
59 | 59 | </ul> |
60 | 60 | </td> |
61 | 61 | <td> |
@@ -19,18 +19,18 @@ |
||
19 | 19 | <div class="items-icons"> |
20 | 20 | <div class="row"> |
21 | 21 | <?php |
22 | - $i = 0; |
|
23 | - foreach ($items as $item) { |
|
24 | - ?> |
|
22 | + $i = 0; |
|
23 | + foreach ($items as $item) { |
|
24 | + ?> |
|
25 | 25 | <div class="col-sm-4"> |
26 | 26 | <?php $this->widget('Ecommerce\items/item', ['item' => $item]); ?> |
27 | 27 | </div> |
28 | 28 | <?php |
29 | - if (!( ++$i % 3)) { |
|
30 | - echo '</div><div class="row">'; |
|
31 | - } |
|
32 | - } |
|
33 | - ?> |
|
29 | + if (!( ++$i % 3)) { |
|
30 | + echo '</div><div class="row">'; |
|
31 | + } |
|
32 | + } |
|
33 | + ?> |
|
34 | 34 | </div> |
35 | 35 | </div> |
36 | 36 | <div class="text-center"> |
@@ -275,8 +275,9 @@ |
||
275 | 275 | break; |
276 | 276 | } |
277 | 277 | } |
278 | - if (!$price) |
|
279 | - return false; |
|
278 | + if (!$price) { |
|
279 | + return false; |
|
280 | + } |
|
280 | 281 | |
281 | 282 | if ($count <= 0) { |
282 | 283 | $count = 1; |
@@ -46,7 +46,7 @@ |
||
46 | 46 | static $forms = [ |
47 | 47 | 'manager' => [ |
48 | 48 | 'map' => [ |
49 | - ['name',], |
|
49 | + ['name', ], |
|
50 | 50 | ['price', 'currency_id'], |
51 | 51 | ['max_cart_price', 'icon_file_id'], |
52 | 52 | ['info'] |
@@ -72,12 +72,12 @@ |
||
72 | 72 | { |
73 | 73 | $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]); |
74 | 74 | if ($warehouse) { |
75 | - $warehouse->count +=(float) $count; |
|
75 | + $warehouse->count += (float) $count; |
|
76 | 76 | $warehouse->save(); |
77 | 77 | } else { |
78 | 78 | $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]); |
79 | 79 | if ($warehouse) { |
80 | - $warehouse->count +=(float) $count; |
|
80 | + $warehouse->count += (float) $count; |
|
81 | 81 | $warehouse->save(); |
82 | 82 | } |
83 | 83 | } |
@@ -39,7 +39,7 @@ |
||
39 | 39 | static $forms = [ |
40 | 40 | 'manager' => [ |
41 | 41 | 'map' => [ |
42 | - ['price', 'currency_id',], |
|
42 | + ['price', 'currency_id', ], |
|
43 | 43 | ['item_offer_price_type_id', 'item_offer_id'] |
44 | 44 | ] |
45 | 45 | ]]; |