@@ -17,7 +17,8 @@ |
||
17 | 17 | } |
18 | 18 | if (!file_exists($path)) { |
19 | 19 | Tools::header(404, true); |
20 | - } else { |
|
20 | + } |
|
21 | + else { |
|
21 | 22 | $this->module->giveFile($path); |
22 | 23 | } |
23 | 24 | } |
@@ -18,7 +18,8 @@ discard block |
||
18 | 18 | public function getArray($keyCol = '') { |
19 | 19 | if (!$keyCol) { |
20 | 20 | return $this->pdoResult->fetchAll(\PDO::FETCH_ASSOC); |
21 | - } else { |
|
21 | + } |
|
22 | + else { |
|
22 | 23 | $array = []; |
23 | 24 | while ($row = $this->pdoResult->fetch(\PDO::FETCH_ASSOC)) { |
24 | 25 | $array[$row[$keyCol]] = $row; |
@@ -33,7 +34,8 @@ discard block |
||
33 | 34 | while ($object = $this->pdoResult->fetchObject($class)) { |
34 | 35 | if ($keyCol) { |
35 | 36 | $array[$object->$keyCol] = $object; |
36 | - } else { |
|
37 | + } |
|
38 | + else { |
|
37 | 39 | $array[] = $object; |
38 | 40 | } |
39 | 41 | } |
@@ -44,7 +46,8 @@ discard block |
||
44 | 46 | public function fetch($className = '') { |
45 | 47 | if ($className) { |
46 | 48 | return $this->pdoResult->fetchObject($className); |
47 | - } else { |
|
49 | + } |
|
50 | + else { |
|
48 | 51 | return $this->pdoResult->fetch(\PDO::FETCH_ASSOC); |
49 | 52 | } |
50 | 53 | } |
@@ -15,11 +15,13 @@ |
||
15 | 15 | $param = isset($this->config['default']) ? $this->config['default'] : 'local'; |
16 | 16 | } |
17 | 17 | if (!is_array($param)) { |
18 | - if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) |
|
19 | - return false; |
|
18 | + if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) { |
|
19 | + return false; |
|
20 | + } |
|
20 | 21 | |
21 | 22 | $db = $dbOption; |
22 | - } else { |
|
23 | + } |
|
24 | + else { |
|
23 | 25 | $db = $param; |
24 | 26 | } |
25 | 27 | $className = 'Db\\' . $db['driver']; |
@@ -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 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <h3>Мои кошельки</h3> |
2 | 2 | <div class="row"> |
3 | 3 | <?php |
4 | - $blocked = App::$cur->money->getUserBlocks(); |
|
5 | - $wallets = App::$cur->money->getUserWallets(); |
|
6 | - $rates = Money\Currency\ExchangeRate::getList(); |
|
7 | - foreach ($wallets as $wallet) { |
|
8 | - ?> |
|
4 | + $blocked = App::$cur->money->getUserBlocks(); |
|
5 | + $wallets = App::$cur->money->getUserWallets(); |
|
6 | + $rates = Money\Currency\ExchangeRate::getList(); |
|
7 | + foreach ($wallets as $wallet) { |
|
8 | + ?> |
|
9 | 9 | <div class="col-sm-4"> |
10 | 10 | <h4><?= $wallet->currency->name(); ?></h4> |
11 | 11 | <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br /> |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | <h3>Уровни начислений</h3> |
13 | 13 | <ul> |
14 | 14 | <?php |
15 | - foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) { |
|
16 | - ?> |
|
15 | + foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) { |
|
16 | + ?> |
|
17 | 17 | |
18 | 18 | <li><?= !$level->level ? 'Личный' : $level->level; ?>. <?= $types[$level->type]['viewer']($level); ?></li> |
19 | 19 | <?php |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | <h4 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h4> |
35 | 35 | <ul> |
36 | 36 | <?php |
37 | - foreach ($condition->items as $item) { |
|
38 | - $itemComplete = $item->checkComplete(); |
|
39 | - switch ($item->type) { |
|
40 | - case 'event': |
|
37 | + foreach ($condition->items as $item) { |
|
38 | + $itemComplete = $item->checkComplete(); |
|
39 | + switch ($item->type) { |
|
40 | + case 'event': |
|
41 | 41 | $name = \Events\Event::get($item->value, 'event')->name(); |
42 | - break; |
|
43 | - } |
|
44 | - ?> |
|
42 | + break; |
|
43 | + } |
|
44 | + ?> |
|
45 | 45 | <li> |
46 | 46 | <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount(); ?></b>/<?= $item->count; ?> <br /> |
47 | 47 | </li> |