Completed
Push — master ( 0afdc4...0e57e6 )
by Alexey
04:27
created
system/modules/Money/objects/CompleteTransfer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
system/modules/Money/objects/ClosePayBtn.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
system/modules/Money/objects/CancelTransfer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/WalletOne.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/Wallet.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/Primary.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,14 +20,14 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/Payeer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
             $data['m_key']
35 35
         );
36 36
         $data['m_sign'] = strtoupper(hash('sha256', implode(':', $arHash)));
37
-        \Tools::redirect('http://payeer.com/merchant/?' . http_build_query($data));
37
+        \Tools::redirect('http://payeer.com/merchant/?'.http_build_query($data));
38 38
     }
39 39
 
40 40
     public static function reciver($data, $status)
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
                 $m_key);
58 58
             $sign_hash = strtoupper(hash('sha256', implode(':', $arHash)));
59 59
             if ($_POST['m_sign'] == $sign_hash && $_POST['m_status'] == 'success') {
60
-                $result['callback'] = $_POST['m_orderid'] . '|success';
60
+                $result['callback'] = $_POST['m_orderid'].'|success';
61 61
                 $result['payId'] = $data["m_orderid"];
62 62
                 $result['status'] = 'success';
63 63
             } else {
64
-                $result['callback'] = $_POST['m_orderid'] . '|error';
64
+                $result['callback'] = $_POST['m_orderid'].'|error';
65 65
             }
66 66
         }
67 67
 
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/PerfectMoney.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         $request['PAYMENT_AMOUNT'] = $amount;
26 26
         $request['PAYMENT_UNITS'] = $merchantCurrency->code;
27 27
         $request['SUGGESTED_MEMO'] = $description;
28
-        $request['STATUS_URL'] = 'http://' . INJI_DOMAIN_NAME . '/money/merchants/reciver/PerfectMoney';
28
+        $request['STATUS_URL'] = 'http://'.INJI_DOMAIN_NAME.'/money/merchants/reciver/PerfectMoney';
29 29
         $request['PAYMENT_URL'] = $success;
30 30
         $request['NOPAYMENT_URL'] = $false;
31 31
         $request['PAYMENT_METHOD'] = 'PerfectMoney account';
@@ -50,10 +50,10 @@  discard block
 block discarded – undo
50 50
 
51 51
         $config = static::getConfig();
52 52
 
53
-        $string = $_POST['PAYMENT_ID'] . ':' . $_POST['PAYEE_ACCOUNT'] . ':' .
54
-                $_POST['PAYMENT_AMOUNT'] . ':' . $_POST['PAYMENT_UNITS'] . ':' .
55
-                $_POST['PAYMENT_BATCH_NUM'] . ':' .
56
-                $_POST['PAYER_ACCOUNT'] . ':' . strtoupper(md5($config['secret'])) . ':' .
53
+        $string = $_POST['PAYMENT_ID'].':'.$_POST['PAYEE_ACCOUNT'].':'.
54
+                $_POST['PAYMENT_AMOUNT'].':'.$_POST['PAYMENT_UNITS'].':'.
55
+                $_POST['PAYMENT_BATCH_NUM'].':'.
56
+                $_POST['PAYER_ACCOUNT'].':'.strtoupper(md5($config['secret'])).':'.
57 57
                 $_POST['TIMESTAMPGMT'];
58 58
 
59 59
         $hash = strtoupper(md5($string));
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/Robokassa.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
44 44
             'SignatureValue' => $hash
45 45
         ];
46 46
         if (empty($config['test'])) {
47
-            \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?' . http_build_query($data));
47
+            \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?'.http_build_query($data));
48 48
         } else {
49
-            \Tools::redirect('http://test.robokassa.ru/Index.aspx?' . http_build_query($data));
49
+            \Tools::redirect('http://test.robokassa.ru/Index.aspx?'.http_build_query($data));
50 50
         }
51 51
     }
52 52
 
Please login to merge, or discard this patch.