@@ -52,8 +52,9 @@ |
||
52 | 52 | */ |
53 | 53 | static function get($clean = false) |
54 | 54 | { |
55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
56 | - return []; |
|
55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
56 | + return []; |
|
57 | + } |
|
57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
58 | 59 | if ($clean) { |
59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -22,16 +22,19 @@ discard block |
||
22 | 22 | |
23 | 23 | $sitePath = App::$primary->path; |
24 | 24 | |
25 | - if (!is_uploaded_file($file['tmp_name'])) |
|
26 | - return 0; |
|
25 | + if (!is_uploaded_file($file['tmp_name'])) { |
|
26 | + return 0; |
|
27 | + } |
|
27 | 28 | |
28 | 29 | $fileinfo = pathinfo($file['name']); |
29 | - if (empty($fileinfo['extension'])) |
|
30 | - return 0; |
|
30 | + if (empty($fileinfo['extension'])) { |
|
31 | + return 0; |
|
32 | + } |
|
31 | 33 | |
32 | 34 | $type = Files\Type::get($fileinfo['extension'], 'ext'); |
33 | - if (!$type) |
|
34 | - return 0; |
|
35 | + if (!$type) { |
|
36 | + return 0; |
|
37 | + } |
|
35 | 38 | |
36 | 39 | if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) { |
37 | 40 | return 0; |
@@ -47,8 +50,9 @@ discard block |
||
47 | 50 | } |
48 | 51 | $fileObject->name = $fileinfo['filename']; |
49 | 52 | $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension']; |
50 | - if ($fileObject->id && file_exists($sitePath . $fileObject->path)) |
|
51 | - unlink($sitePath . $fileObject->path); |
|
53 | + if ($fileObject->id && file_exists($sitePath . $fileObject->path)) { |
|
54 | + unlink($sitePath . $fileObject->path); |
|
55 | + } |
|
52 | 56 | |
53 | 57 | Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/'); |
54 | 58 | |
@@ -84,12 +88,14 @@ discard block |
||
84 | 88 | $sitePath = App::$primary->path; |
85 | 89 | |
86 | 90 | $fileinfo = pathinfo($url); |
87 | - if (empty($fileinfo['extension'])) |
|
88 | - return 0; |
|
91 | + if (empty($fileinfo['extension'])) { |
|
92 | + return 0; |
|
93 | + } |
|
89 | 94 | |
90 | 95 | $type = Files\Type::get($fileinfo['extension'], 'ext'); |
91 | - if (!$type) |
|
92 | - return 0; |
|
96 | + if (!$type) { |
|
97 | + return 0; |
|
98 | + } |
|
93 | 99 | |
94 | 100 | if (!empty($options['accept_group']) && $options['accept_group'] != $type->group) { |
95 | 101 | return 0; |
@@ -105,8 +111,9 @@ discard block |
||
105 | 111 | } |
106 | 112 | $fileObject->name = $fileinfo['filename']; |
107 | 113 | $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension']; |
108 | - if ($fileObject->id && file_exists($sitePath . $fileObject->path)) |
|
109 | - unlink($sitePath . $fileObject->path); |
|
114 | + if ($fileObject->id && file_exists($sitePath . $fileObject->path)) { |
|
115 | + unlink($sitePath . $fileObject->path); |
|
116 | + } |
|
110 | 117 | |
111 | 118 | Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/'); |
112 | 119 |
@@ -24,7 +24,8 @@ |
||
24 | 24 | <?php |
25 | 25 | if ($file->type->group == 'image') { |
26 | 26 | echo "<img class='img-responsive' src ='{$file->path}?resize=200x200' />"; |
27 | - } else { |
|
27 | + } |
|
28 | + else { |
|
28 | 29 | echo "<img class='img-responsive' src ='/static/moduleAsset/Files/images/formats/" . pathinfo($file->path, PATHINFO_EXTENSION) . ".png' />"; |
29 | 30 | } |
30 | 31 | ?> |
@@ -27,7 +27,8 @@ |
||
27 | 27 | 'callback_method' => 'cartPayRecive' |
28 | 28 | ]); |
29 | 29 | $pay->save(); |
30 | - } elseif ($pay->sum != $sum) { |
|
30 | + } |
|
31 | + elseif ($pay->sum != $sum) { |
|
31 | 32 | $pay->sum = $sum; |
32 | 33 | $pay->save(); |
33 | 34 | } |
@@ -18,7 +18,8 @@ |
||
18 | 18 | "relation": "infos"} |
19 | 19 | )'><?= $count . ' ' . Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']); ?></a> |
20 | 20 | <?php |
21 | -} else { |
|
21 | +} |
|
22 | +else { |
|
22 | 23 | foreach ($item->infos as $info) { |
23 | 24 | echo $info->value . ' '; |
24 | 25 | } |
@@ -26,7 +26,8 @@ discard block |
||
26 | 26 | $currency_id = $cartItem->price && $cartItem->price->currency ? $cartItem->price->currency->id : (!empty(\App::$cur->ecommerce->config['defaultCurrency']) ? \App::$cur->ecommerce->config['defaultCurrency'] : 0); |
27 | 27 | if (empty($sums[$currency_id])) { |
28 | 28 | $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
29 | - } else { |
|
29 | + } |
|
30 | + else { |
|
30 | 31 | $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
31 | 32 | } |
32 | 33 | } |
@@ -34,7 +35,8 @@ discard block |
||
34 | 35 | $currency_id = $cart->delivery->currency_id; |
35 | 36 | if (empty($sums[$currency_id])) { |
36 | 37 | $sums[$currency_id] = $cart->delivery->price; |
37 | - } else { |
|
38 | + } |
|
39 | + else { |
|
38 | 40 | $sums[$currency_id] += $cart->delivery->price; |
39 | 41 | } |
40 | 42 | } |
@@ -42,7 +44,8 @@ discard block |
||
42 | 44 | $currency_id = $extra->currency ? $extra->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
43 | 45 | if (empty($sums[$currency_id])) { |
44 | 46 | $sums[$currency_id] = $extra->price * $extra->count; |
45 | - } else { |
|
47 | + } |
|
48 | + else { |
|
46 | 49 | $sums[$currency_id] += $extra->price * $extra->count; |
47 | 50 | } |
48 | 51 | } |
@@ -62,10 +65,12 @@ discard block |
||
62 | 65 | $currency = Money\Currency::get($currency_id); |
63 | 66 | if ($currency) { |
64 | 67 | echo ' ' . $currency->acronym(); |
65 | - } else { |
|
68 | + } |
|
69 | + else { |
|
66 | 70 | echo ' р.'; |
67 | 71 | } |
68 | - } else { |
|
72 | + } |
|
73 | + else { |
|
69 | 74 | echo ' р.'; |
70 | 75 | } |
71 | 76 | echo '<br />'; |
@@ -76,9 +81,11 @@ discard block |
||
76 | 81 | <td><?php |
77 | 82 | if ($cart->payed) { |
78 | 83 | echo 'Оплачено'; |
79 | - } elseif (!App::$cur->money) { |
|
84 | + } |
|
85 | + elseif (!App::$cur->money) { |
|
80 | 86 | echo 'Не оплачено'; |
81 | - } else { |
|
87 | + } |
|
88 | + else { |
|
82 | 89 | $handlers = App::$cur->ecommerce->getSnippets('payTypeHandler'); |
83 | 90 | $redirect = ['/ecommerce/cart/success']; |
84 | 91 | if ($cart->payType && !empty($handlers[$cart->payType->handler]['handler'])) { |
@@ -86,7 +93,8 @@ discard block |
||
86 | 93 | } |
87 | 94 | if (!empty($newRedirect[0])) { |
88 | 95 | echo '<a class="btn btn-warning btn-sm" href = "' . $newRedirect[0] . '">Оплатить</a>'; |
89 | - } else { |
|
96 | + } |
|
97 | + else { |
|
90 | 98 | echo 'Не оплачено'; |
91 | 99 | } |
92 | 100 | } |
@@ -6,7 +6,8 @@ discard block |
||
6 | 6 | foreach ($payTypes as $payType) { |
7 | 7 | if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) { |
8 | 8 | $checked = 'checked'; |
9 | - } else { |
|
9 | + } |
|
10 | + else { |
|
10 | 11 | $checked = ''; |
11 | 12 | } |
12 | 13 | echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
@@ -27,7 +28,8 @@ discard block |
||
27 | 28 | if ($cart->payType) { |
28 | 29 | echo "<h4>Информация об оплате</h4>"; |
29 | 30 | echo $cart->payType->info; |
30 | - } else { |
|
31 | + } |
|
32 | + else { |
|
31 | 33 | echo "<h4>Выберите способ оплаты</h4>"; |
32 | 34 | } |
33 | 35 | ?> |
@@ -8,6 +8,7 @@ |
||
8 | 8 | if (!$userCards) { |
9 | 9 | echo '<p>У вас нет <b>дисконтной карты</b>, вы можете её оформить и сразу начать пльзоваться её приемуществами.</p>'; |
10 | 10 | echo '<p><a class ="btn btn-primary btn-xs" href = "/ecommerce/buyCard"><b>Оформить дисконтную карту</b></a></p>'; |
11 | -} else { |
|
11 | +} |
|
12 | +else { |
|
12 | 13 | echo '<p><button type="button" onclick="inji.Ecommerce.Cart.calcSum();" class ="btn btn-primary btn-xs"><b>Применить дисконтную карту</b></button></p>'; |
13 | 14 | } |
14 | 15 | \ No newline at end of file |
@@ -3,7 +3,8 @@ discard block |
||
3 | 3 | $price = $cartItem->item->getPrice(); |
4 | 4 | if (empty(App::$cur->ecommerce->config['sell_over_warehouse'])) { |
5 | 5 | $max = $price->offer->warehouseCount((!empty($_SESSION['cart']['cart_id']) ? $_SESSION['cart']['cart_id'] : 0)); |
6 | -} else { |
|
6 | +} |
|
7 | +else { |
|
7 | 8 | $max = 100; |
8 | 9 | } |
9 | 10 | if (!empty($options[16]) && $options[16]->value) { |
@@ -15,7 +16,8 @@ discard block |
||
15 | 16 | <input type = "text" data-miltiple="1000" class ="combineRanger item-counter" data-step ="<?= $step; ?>" data-max="<?= $max; ?>" data-price ="<?= $price->price; ?>" name="cartItems[<?php echo $cartItem->id; ?>]" value ="<?= $cartItem->count; ?>" /> |
16 | 17 | <?php |
17 | 18 | echo '</div>'; |
18 | -} else { |
|
19 | +} |
|
20 | +else { |
|
19 | 21 | ?> |
20 | 22 | <div class="input-group number-spinner" > |
21 | 23 | <span class="input-group-btn"> |