@@ -8,7 +8,8 @@ discard block |
||
8 | 8 | |
9 | 9 | if (!$rewardItemExist) { |
10 | 10 | $allowTypes = explode(',', $trigger->params['item_type_id']->value); |
11 | - } else { |
|
11 | + } |
|
12 | + else { |
|
12 | 13 | $allowTypes = []; |
13 | 14 | } |
14 | 15 | foreach ($cart->cartItems as $cartItem) { |
@@ -19,7 +20,8 @@ discard block |
||
19 | 20 | $currency_id = $cartItem->price->currency ? $cartItem->price->currency->id : \App::$cur->ecommerce->config['defaultCurrency']; |
20 | 21 | if (empty($sums[$currency_id])) { |
21 | 22 | $sums[$currency_id] = $cartItem->final_price * $cartItem->count; |
22 | - } else { |
|
23 | + } |
|
24 | + else { |
|
23 | 25 | $sums[$currency_id] += $cartItem->final_price * $cartItem->count; |
24 | 26 | } |
25 | 27 | } |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | 'name' => 'Последняя покупка не позднее 90 дней', |
5 | - 'checker' => function($user) { |
|
5 | + 'checker' => function($user) { |
|
6 | 6 | $query = 'SELECT * FROM inji_ecommerce_cart iec WHERE iec.cart_cart_status_id >= 5 AND iec.cart_date_create >= NOW() - INTERVAL 90 DAY AND cart_user_id = ?'; |
7 | 7 | $result = \App::$cur->db->query(['query' => $query, 'params' => [$user->id]]); |
8 | 8 | return (bool) $result ? $result->fetch() : false; |
@@ -27,20 +27,24 @@ discard block |
||
27 | 27 | |
28 | 28 | // Проверка наличия необходимых параметров в POST-запросе |
29 | 29 | |
30 | - if (!isset($data["WMI_SIGNATURE"])) |
|
31 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE"); |
|
30 | + if (!isset($data["WMI_SIGNATURE"])) { |
|
31 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE"); |
|
32 | + } |
|
32 | 33 | |
33 | - if (!isset($data["WMI_PAYMENT_NO"])) |
|
34 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO"); |
|
34 | + if (!isset($data["WMI_PAYMENT_NO"])) { |
|
35 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO"); |
|
36 | + } |
|
35 | 37 | |
36 | - if (!isset($data["WMI_ORDER_STATE"])) |
|
37 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE"); |
|
38 | + if (!isset($data["WMI_ORDER_STATE"])) { |
|
39 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE"); |
|
40 | + } |
|
38 | 41 | |
39 | 42 | // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE |
40 | 43 | $params = []; |
41 | 44 | foreach ($data as $name => $value) { |
42 | - if ($name !== "WMI_SIGNATURE") |
|
43 | - $params[$name] = $value; |
|
45 | + if ($name !== "WMI_SIGNATURE") { |
|
46 | + $params[$name] = $value; |
|
47 | + } |
|
44 | 48 | } |
45 | 49 | |
46 | 50 | // Сортировка массива по именам ключей в порядке возрастания |
@@ -69,11 +73,13 @@ discard block |
||
69 | 73 | $result['payId'] = $data["WMI_PAYMENT_NO"]; |
70 | 74 | $result['status'] = 'success'; |
71 | 75 | return $result; |
72 | - } else { |
|
76 | + } |
|
77 | + else { |
|
73 | 78 | // Случилось что-то странное, пришло неизвестное состояние заказа |
74 | 79 | $result['callback'] = print_answer("Retry", "Неверное состояние " . $data["WMI_ORDER_STATE"]); |
75 | 80 | } |
76 | - } else { |
|
81 | + } |
|
82 | + else { |
|
77 | 83 | // Подпись не совпадает, возможно вы поменяли настройки интернет-магазина |
78 | 84 | $result['callback'] = print_answer("Retry", "Неверная подпись " . (!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty')); |
79 | 85 | } |
@@ -84,8 +90,9 @@ discard block |
||
84 | 90 | $config = static::getConfig(); |
85 | 91 | $merchantCurrency = static::getMerchantCurrency($currency); |
86 | 92 | |
87 | - if (!$description) |
|
88 | - $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
93 | + if (!$description) { |
|
94 | + $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
95 | + } |
|
89 | 96 | |
90 | 97 | //Секретный ключ интернет-магазина |
91 | 98 | $key = $config['secret']; |
@@ -115,13 +122,15 @@ discard block |
||
115 | 122 | $fieldValues = ""; |
116 | 123 | |
117 | 124 | foreach ($fields as $value) { |
118 | - if (is_array($value)) |
|
119 | - foreach ($value as $v) { |
|
125 | + if (is_array($value)) { |
|
126 | + foreach ($value as $v) { |
|
120 | 127 | //Конвертация из текущей кодировки (UTF-8) |
121 | 128 | //необходима только если кодировка магазина отлична от Windows-1251 |
122 | 129 | $v = iconv("utf-8", "windows-1251", $v); |
130 | + } |
|
123 | 131 | $fieldValues .= $v; |
124 | - } else { |
|
132 | + } |
|
133 | + else { |
|
125 | 134 | //Конвертация из текущей кодировки (UTF-8) |
126 | 135 | //необходима только если кодировка магазина отлична от Windows-1251 |
127 | 136 | $value = iconv("utf-8", "windows-1251", $value); |
@@ -58,7 +58,8 @@ |
||
58 | 58 | $result['callback'] = $_POST['m_orderid'] . '|success'; |
59 | 59 | $result['payId'] = $data["m_orderid"]; |
60 | 60 | $result['status'] = 'success'; |
61 | - } else { |
|
61 | + } |
|
62 | + else { |
|
62 | 63 | $result['callback'] = $_POST['m_orderid'] . '|error'; |
63 | 64 | } |
64 | 65 | } |
@@ -25,7 +25,8 @@ |
||
25 | 25 | $sum = parent::getFinalSum($pay, $method); |
26 | 26 | if ($pay->data && $cart = \Ecommerce\Cart::get($pay->data)) { |
27 | 27 | $extra = '0.' . (strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id); |
28 | - } else { |
|
28 | + } |
|
29 | + else { |
|
29 | 30 | $extra = 0; |
30 | 31 | } |
31 | 32 | return $sum + $extra; |
@@ -24,8 +24,9 @@ discard block |
||
24 | 24 | |
25 | 25 | $result['payId'] = $data["InvId"]; |
26 | 26 | |
27 | - if (strtolower($data['SignatureValue']) == $hashGenerated) |
|
28 | - $result['status'] = 'success'; |
|
27 | + if (strtolower($data['SignatureValue']) == $hashGenerated) { |
|
28 | + $result['status'] = 'success'; |
|
29 | + } |
|
29 | 30 | |
30 | 31 | return $result; |
31 | 32 | } |
@@ -43,7 +44,8 @@ discard block |
||
43 | 44 | ]; |
44 | 45 | if (empty($config['test'])) { |
45 | 46 | \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?' . http_build_query($data)); |
46 | - } else { |
|
47 | + } |
|
48 | + else { |
|
47 | 49 | \Tools::redirect('http://test.robokassa.ru/Index.aspx?' . http_build_query($data)); |
48 | 50 | } |
49 | 51 | } |
@@ -2,17 +2,18 @@ discard block |
||
2 | 2 | <?php |
3 | 3 | $currency_id = !empty($_GET['currency_id']) ? (int) $_GET['currency_id'] : 0; |
4 | 4 | $wallets = App::$cur->money->getUserWallets(); |
5 | -if ($currency_id && empty($wallets[$currency_id])) { |
|
5 | +if ($currency_id && empty($wallets[$currency_id])) { |
|
6 | 6 | Msg::add('У вас нет такого кошелька'); |
7 | 7 | Msg::show(); |
8 | 8 | return; |
9 | 9 | } |
10 | 10 | |
11 | -if ($currency_id) { |
|
11 | +if ($currency_id) { |
|
12 | 12 | $ids = $wallets[$currency_id]->id; |
13 | -} else { |
|
13 | +} |
|
14 | +else { |
|
14 | 15 | $ids = []; |
15 | - foreach ($wallets as $wallet) { |
|
16 | + foreach ($wallets as $wallet) { |
|
16 | 17 | $ids[] = $wallet->id; |
17 | 18 | } |
18 | 19 | $ids = implode(',', $ids); |
@@ -33,7 +34,7 @@ discard block |
||
33 | 34 | 'start' => $pages->params['start'], |
34 | 35 | 'limit' => $pages->params['limit'], |
35 | 36 | ]); |
36 | -foreach ($histories as $history) { |
|
37 | +foreach ($histories as $history) { |
|
37 | 38 | $amount = $history->amount ? $history->amount : $history->new - $history->old; |
38 | 39 | $table->addRow([ |
39 | 40 | $history->id, |
@@ -2,7 +2,7 @@ |
||
2 | 2 | <?php |
3 | 3 | $blocked = App::$cur->money->getUserBlocks(); |
4 | 4 | $wallets = App::$cur->money->getUserWallets(); |
5 | -foreach ($wallets as $wallet) { |
|
5 | +foreach ($wallets as $wallet) { |
|
6 | 6 | ?> |
7 | 7 | <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br /> |
8 | 8 | <?php |
@@ -2,17 +2,18 @@ discard block |
||
2 | 2 | <?php |
3 | 3 | $currency_id = !empty($_GET['currency_id']) ? (int) $_GET['currency_id'] : 0; |
4 | 4 | $wallets = App::$cur->money->getUserWallets(); |
5 | -if ($currency_id && empty($wallets[$currency_id])) { |
|
5 | +if ($currency_id && empty($wallets[$currency_id])) { |
|
6 | 6 | Msg::add('У вас нет такого кошелька'); |
7 | 7 | Msg::show(); |
8 | 8 | return; |
9 | 9 | } |
10 | 10 | |
11 | -if ($currency_id) { |
|
11 | +if ($currency_id) { |
|
12 | 12 | $ids = $wallets[$currency_id]->id; |
13 | -} else { |
|
13 | +} |
|
14 | +else { |
|
14 | 15 | $ids = []; |
15 | - foreach ($wallets as $wallet) { |
|
16 | + foreach ($wallets as $wallet) { |
|
16 | 17 | $ids[] = $wallet->id; |
17 | 18 | } |
18 | 19 | $ids = implode(',', $ids); |
@@ -33,7 +34,7 @@ discard block |
||
33 | 34 | 'start' => $pages->params['start'], |
34 | 35 | 'limit' => $pages->params['limit'], |
35 | 36 | ]); |
36 | -foreach ($histories as $history) { |
|
37 | +foreach ($histories as $history) { |
|
37 | 38 | $amount = $history->amount; |
38 | 39 | $table->addRow([ |
39 | 40 | $history->id, |