@@ -38,7 +38,7 @@ |
||
38 | 38 | $table->addRow([ |
39 | 39 | $history->id, |
40 | 40 | $history->wallet->currency->name(), |
41 | - '<span class = "' . ($amount > 0 ? "text-success" : 'text-danger') . '">' . $amount . '</span>', |
|
41 | + '<span class = "'.($amount > 0 ? "text-success" : 'text-danger').'">'.$amount.'</span>', |
|
42 | 42 | $history->comment, |
43 | 43 | $history->date_create |
44 | 44 | ]); |
@@ -11,7 +11,7 @@ |
||
11 | 11 | <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br /> |
12 | 12 | <?php |
13 | 13 | if (!empty($blocked[$wallet->currency_id])) { |
14 | - echo "Заблокировано: {$blocked[$wallet->currency_id]} " . $wallet->currency->acronym() . "<br />"; |
|
14 | + echo "Заблокировано: {$blocked[$wallet->currency_id]} ".$wallet->currency->acronym()."<br />"; |
|
15 | 15 | } |
16 | 16 | if ($wallet->currency->refill) { |
17 | 17 | echo "<a href = '/money/refill?currency_id={$wallet->currency_id}'>Пополнить</a> "; |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $transfer->confirm(); |
44 | 44 | } |
45 | 45 | $count = count($transfers); |
46 | - return 'Завершено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']); |
|
46 | + return 'Завершено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | } |
51 | 51 | $count = count($pays); |
52 | - return 'Оплачено <b>' . $count . '</b> ' . \Tools::getNumEnding($pays, ['счет', 'счета', 'счетов']); |
|
52 | + return 'Оплачено <b>'.$count.'</b> '.\Tools::getNumEnding($pays, ['счет', 'счета', 'счетов']); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $transfer->cancel(); |
44 | 44 | } |
45 | 45 | $count = count($transfers); |
46 | - return 'Отменено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']); |
|
46 | + return 'Отменено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | } |
@@ -61,21 +61,21 @@ |
||
61 | 61 | if ($first) { |
62 | 62 | $first = false; |
63 | 63 | } else { |
64 | - $string.= '<br />'; |
|
64 | + $string .= '<br />'; |
|
65 | 65 | } |
66 | - $string.= '<span style="white-space:nowrap;">'; |
|
67 | - $string.= number_format($sum, 2, '.', ' '); |
|
66 | + $string .= '<span style="white-space:nowrap;">'; |
|
67 | + $string .= number_format($sum, 2, '.', ' '); |
|
68 | 68 | if (\App::$cur->money) { |
69 | 69 | $currency = \Money\Currency::get($currency_id); |
70 | 70 | if ($currency) { |
71 | - $string.= ' ' . $currency->acronym(); |
|
71 | + $string .= ' '.$currency->acronym(); |
|
72 | 72 | } else { |
73 | - $string.= ' руб.'; |
|
73 | + $string .= ' руб.'; |
|
74 | 74 | } |
75 | 75 | } else { |
76 | - $string.= ' руб.'; |
|
76 | + $string .= ' руб.'; |
|
77 | 77 | } |
78 | - $string.= '</span>'; |
|
78 | + $string .= '</span>'; |
|
79 | 79 | } |
80 | 80 | return $string; |
81 | 81 | } |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | |
22 | 22 | function print_answer($result, $description) |
23 | 23 | { |
24 | - $print = "WMI_RESULT=" . strtoupper($result) . "&"; |
|
25 | - $print .= "WMI_DESCRIPTION=" . urlencode($description); |
|
24 | + $print = "WMI_RESULT=".strtoupper($result)."&"; |
|
25 | + $print .= "WMI_DESCRIPTION=".urlencode($description); |
|
26 | 26 | return $print; |
27 | 27 | } |
28 | 28 | |
@@ -59,24 +59,24 @@ discard block |
||
59 | 59 | |
60 | 60 | // Формирование подписи для сравнения ее с параметром WMI_SIGNATURE |
61 | 61 | |
62 | - $signature = base64_encode(pack("H*", md5($values . $skey))); |
|
62 | + $signature = base64_encode(pack("H*", md5($values.$skey))); |
|
63 | 63 | |
64 | 64 | //Сравнение полученной подписи с подписью W1 |
65 | 65 | |
66 | 66 | if (!empty($data["WMI_SIGNATURE"]) && $signature == $data["WMI_SIGNATURE"]) { |
67 | 67 | if (strtoupper($data["WMI_ORDER_STATE"]) == "ACCEPTED") { |
68 | 68 | // вызываем функцию обработки в случае успеха |
69 | - $result['callback'] = print_answer("Ok", "Заказ #" . $data["WMI_PAYMENT_NO"] . " оплачен!"); |
|
69 | + $result['callback'] = print_answer("Ok", "Заказ #".$data["WMI_PAYMENT_NO"]." оплачен!"); |
|
70 | 70 | $result['payId'] = $data["WMI_PAYMENT_NO"]; |
71 | 71 | $result['status'] = 'success'; |
72 | 72 | return $result; |
73 | 73 | } else { |
74 | 74 | // Случилось что-то странное, пришло неизвестное состояние заказа |
75 | - $result['callback'] = print_answer("Retry", "Неверное состояние " . $data["WMI_ORDER_STATE"]); |
|
75 | + $result['callback'] = print_answer("Retry", "Неверное состояние ".$data["WMI_ORDER_STATE"]); |
|
76 | 76 | } |
77 | 77 | } else { |
78 | 78 | // Подпись не совпадает, возможно вы поменяли настройки интернет-магазина |
79 | - $result['callback'] = print_answer("Retry", "Неверная подпись " . (!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty')); |
|
79 | + $result['callback'] = print_answer("Retry", "Неверная подпись ".(!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty')); |
|
80 | 80 | } |
81 | 81 | return $result; |
82 | 82 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $merchantCurrency = static::getMerchantCurrency($currency); |
88 | 88 | |
89 | 89 | if (!$description) |
90 | - $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
90 | + $description = "Оплата заказа на сайте ".idn_to_utf8(INJI_DOMAIN_NAME); |
|
91 | 91 | |
92 | 92 | //Секретный ключ интернет-магазина |
93 | 93 | $key = $config['secret']; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $fields["WMI_PAYMENT_AMOUNT"] = number_format($amount, 0, '.', ''); |
100 | 100 | $fields["WMI_CURRENCY_ID"] = $merchantCurrency->code; |
101 | 101 | $fields["WMI_PAYMENT_NO"] = $payId; |
102 | - $fields["WMI_DESCRIPTION"] = "BASE64:" . base64_encode($description); |
|
102 | + $fields["WMI_DESCRIPTION"] = "BASE64:".base64_encode($description); |
|
103 | 103 | $fields["WMI_EXPIRED_DATE"] = "2019-12-31T23:59:59"; |
104 | 104 | $fields["WMI_SUCCESS_URL"] = $success; |
105 | 105 | $fields["WMI_FAIL_URL"] = $false; |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | // вычисления отпечатка, сформированного выше сообщения, |
136 | 136 | // по алгоритму MD5 и представление его в Base64 |
137 | 137 | |
138 | - $signature = base64_encode(pack("H*", md5($fieldValues . $key))); |
|
138 | + $signature = base64_encode(pack("H*", md5($fieldValues.$key))); |
|
139 | 139 | |
140 | 140 | //Добавление параметра WMI_SIGNATURE в словарь параметров формы |
141 | 141 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | print "<input type=\"submit\"/></form>"; |
157 | 157 | */ |
158 | - \Tools::redirect('https://www.walletone.com/checkout/default.aspx?' . http_build_query($fields)); |
|
158 | + \Tools::redirect('https://www.walletone.com/checkout/default.aspx?'.http_build_query($fields)); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | } |
@@ -21,7 +21,7 @@ |
||
21 | 21 | public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/') |
22 | 22 | { |
23 | 23 | $wallets = \App::$cur->money->getUserWallets(); |
24 | - \Tools::redirect('/money/walletPay/' . $payId . '/' . $wallets[$currency->id]->id); |
|
24 | + \Tools::redirect('/money/walletPay/'.$payId.'/'.$wallets[$currency->id]->id); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | } |
@@ -20,14 +20,14 @@ |
||
20 | 20 | |
21 | 21 | public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/') |
22 | 22 | { |
23 | - \Tools::redirect('/money/primaryPay/' . $payId . '/' . $currency->id); |
|
23 | + \Tools::redirect('/money/primaryPay/'.$payId.'/'.$currency->id); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public static function getFinalSum($pay, $method) |
27 | 27 | { |
28 | 28 | $sum = parent::getFinalSum($pay, $method); |
29 | 29 | if ($pay->data && $cart = \Ecommerce\Cart::get($pay->data)) { |
30 | - $extra = '0.' . (strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id); |
|
30 | + $extra = '0.'.(strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id); |
|
31 | 31 | } else { |
32 | 32 | $extra = 0; |
33 | 33 | } |