injitools / cms-Inji

system/modules/Money/appControllers/MoneyController.php

Spacing +20 added lines, -20 removed lines

@@ -22,23 +22,23 @@ 
             $transfer->save();
 
             $wallets = $this->money->getUserWallets();
-            $text = 'Перевод средств для ' . $transfer->toUser->name();
+            $text = 'Перевод средств для '.$transfer->toUser->name();
             $wallets[$transfer->currency_id]->diff(-$transfer->amount, $text);
-            \App::$cur->users->AddUserActivity($transfer->user_id, 4, $text . '<br />' . (float) $transfer->amount . ' ' . $wallets[$transfer->currency_id]->currency->acronym());
+            \App::$cur->users->AddUserActivity($transfer->user_id, 4, $text.'<br />'.(float) $transfer->amount.' '.$wallets[$transfer->currency_id]->currency->acronym());
 
             $block = new Money\Wallet\Block();
             $block->wallet_id = $wallets[$transfer->currency_id]->id;
             $block->amount = $transfer->amount;
-            $block->comment = 'Заблокированно на перевод средств для ' . $transfer->toUser->name();
-            $block->data = 'Money\Transfer:' . $transfer->id;
+            $block->comment = 'Заблокированно на перевод средств для '.$transfer->toUser->name();
+            $block->data = 'Money\Transfer:'.$transfer->id;
             $block->save();
 
-            $from = 'noreply@' . INJI_DOMAIN_NAME;
+            $from = 'noreply@'.INJI_DOMAIN_NAME;
             $to = \Users\User::$cur->mail;
             $subject = 'Подтверждение перевода';
-            $text = 'Чтобы подтвержить перевод №' . $transfer->id . ' введите код <b>' . $transfer->code . '</b> на <a href = "http://' . INJI_DOMAIN_NAME . '/money/confirmTransfer/' . $transfer->id . '?code=' . $transfer->code . '">странице</a> перевода';
+            $text = 'Чтобы подтвержить перевод №'.$transfer->id.' введите код <b>'.$transfer->code.'</b> на <a href = "http://'.INJI_DOMAIN_NAME.'/money/confirmTransfer/'.$transfer->id.'?code='.$transfer->code.'">странице</a> перевода';
             Tools::sendMail($from, $to, $subject, $text);
-            Tools::redirect('/money/confirmTransfer/' . $transfer->id);
+            Tools::redirect('/money/confirmTransfer/'.$transfer->id);
         }
         $this->view->setTitle('Перевод средств');
         $this->view->page(['data' => compact('form')]);
@@ -55,12 +55,12 @@ 
                 Msg::add('Код не совпадает', 'danger');
             } else {
                 $transfer->complete = 1;
-                $block = Money\Wallet\Block::get('Money\Transfer:' . $transfer->id, 'data');
+                $block = Money\Wallet\Block::get('Money\Transfer:'.$transfer->id, 'data');
                 $block->delete();
                 $wallets = $this->money->getUserWallets($transfer->to_user_id);
-                $text = 'Перевод средств от ' . $transfer->user->name() . '.' . ($transfer->comment ? ' Комментарий:' . $transfer->comment : '');
+                $text = 'Перевод средств от '.$transfer->user->name().'.'.($transfer->comment ? ' Комментарий:'.$transfer->comment : '');
                 $wallets[$transfer->currency_id]->diff($transfer->amount, $text);
-                \App::$cur->users->AddUserActivity($transfer->to_user_id, 4, $text . '<br />' . (float) $transfer->amount . ' ' . $wallets[$transfer->currency_id]->currency->acronym());
+                \App::$cur->users->AddUserActivity($transfer->to_user_id, 4, $text.'<br />'.(float) $transfer->amount.' '.$wallets[$transfer->currency_id]->currency->acronym());
                 $transfer->save();
                 Tools::redirect('/users/cabinet', 'Перевод был успешно завершен', 'success');
             }
@@ -92,12 +92,12 @@ 
                 'currency_id' => $currency->id,
                 'sum' => (float) str_replace(',', '.', $_POST['amount']),
                 'type' => 'refill',
-                'description' => 'Пополнение баланса ' . $currency->name(),
+                'description' => 'Пополнение баланса '.$currency->name(),
                 'callback_module' => 'Money',
                 'callback_method' => 'refillPayRecive'
             ]);
             $pay->save();
-            Tools::redirect('/money/merchants/pay/' . $pay->id);
+            Tools::redirect('/money/merchants/pay/'.$pay->id);
         } else {
             $currencies = Money\Currency::getList(['where' => ['refill', 1], 'forSelect' => true]);
             $this->view->setTitle('Пополнение счета');
@@ -146,8 +146,8 @@ 
                 $error = true;
             }
             if (!$error) {
-                $wallets[$currency->id]->diff(-$amount, 'Обмен валюты на ' . $targetCurrency->name());
-                $wallets[$targetCurrency->id]->diff($amount * $rate->rate, 'Обмне валюты с ' . $currency->name());
+                $wallets[$currency->id]->diff(-$amount, 'Обмен валюты на '.$targetCurrency->name());
+                $wallets[$targetCurrency->id]->diff($amount * $rate->rate, 'Обмне валюты с '.$currency->name());
                 Tools::redirect('/users/cabinet', 'Обмен был успешно проведен');
             }
         }
@@ -163,21 +163,21 @@ 
         }
         $wallet = Money\Wallet::get((int) $walletId);
         if (!$wallet || $wallet->user_id != \Users\User::$cur->id) {
-            Tools::redirect('/money/merchants/pay/' . $pay->id, 'Такой кошелек не найден');
+            Tools::redirect('/money/merchants/pay/'.$pay->id, 'Такой кошелек не найден');
         }
         if ($pay->currency_id != $wallet->currency_id) {
             $rate = \Money\Currency\ExchangeRate::get([['currency_id', $wallet->currency_id], ['target_currency_id', $pay->currency_id]]);
             if (!$rate) {
-                Tools::redirect('/money/merchants/pay/' . $pay->id, 'Нет возможности оплатить счет в валюте ' . $pay->currency->name() . ' валютой ' . $wallet->currency->name());
+                Tools::redirect('/money/merchants/pay/'.$pay->id, 'Нет возможности оплатить счет в валюте '.$pay->currency->name().' валютой '.$wallet->currency->name());
             }
             $sum = $pay->sum / $rate->rate;
         } else {
             $sum = $pay->sum;
         }
         if ($sum > $wallet->amount) {
-            Tools::redirect('/money/merchants/pay/' . $pay->id, 'На вашем счете недостаточно средств', 'danger');
+            Tools::redirect('/money/merchants/pay/'.$pay->id, 'На вашем счете недостаточно средств', 'danger');
         }
-        $wallet->diff(-$sum, 'Оплата счета №' . $payId);
+        $wallet->diff(-$sum, 'Оплата счета №'.$payId);
         $statuses = \Money\Pay\Status::getList(['key' => 'code']);
         if (!empty($statuses['success'])) {
             $pay->pay_status_id = $statuses['success']->id;
@@ -198,7 +198,7 @@ 
         }
         $merchant = \Money\MerchantHelper\Primary::getMerchant();
         if (!$merchant->active) {
-            Tools::redirect('/money/merchants/pay/' . $pay->id, 'Этот способ оплаты недоступен');
+            Tools::redirect('/money/merchants/pay/'.$pay->id, 'Этот способ оплаты недоступен');
         }
         $allowCurrencies = $merchant->allowCurrencies($pay);
         $method = [];
@@ -211,7 +211,7 @@ 
         if (!$method) {
             Tools::redirect('/', 'Валюта для этого способа оплаты не найдена', 'danger');
         }
-        $className = 'Money\MerchantHelper\\' . $merchant->object_name;
+        $className = 'Money\MerchantHelper\\'.$merchant->object_name;
         $sum = $className::getFinalSum($pay, $method);
         $this->view->setTitle('Прямая оплата');
         $this->view->page(['data' => compact('pay', 'sum', 'method')]);

system/modules/Money/widgets/cabinet/walletHistory.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     $table->addRow([

         $history->id,

         $history->wallet->currency->name(),

-        '<span class = "' . ($amount > 0 ? "text-success" : 'text-danger') . '">' . $amount . '</span>',

+        '<span class = "'.($amount > 0 ? "text-success" : 'text-danger').'">'.$amount.'</span>',

         $history->comment,

         $history->date_create

     ]);

system/modules/Money/objects/CompleteTransfer.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             $transfer->confirm();
         }
         $count = count($transfers);
-        return 'Завершено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']);
+        return 'Завершено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']);
     }
 
 }

system/modules/Money/objects/ClosePayBtn.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             }
         }
         $count = count($pays);
-        return 'Оплачено <b>' . $count . '</b> ' . \Tools::getNumEnding($pays, ['счет', 'счета', 'счетов']);
+        return 'Оплачено <b>'.$count.'</b> '.\Tools::getNumEnding($pays, ['счет', 'счета', 'счетов']);
     }
 
 }

system/modules/Money/objects/CancelTransfer.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
             $transfer->cancel();
         }
         $count = count($transfers);
-        return 'Отменено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']);
+        return 'Отменено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['перевод', 'перевода', 'переводов']);
     }
 
 }

system/modules/Money/objects/MerchantHelper/Wallet.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/')
     {
         $wallets = \App::$cur->money->getUserWallets();
-        \Tools::redirect('/money/walletPay/' . $payId . '/' . $wallets[$currency->id]->id);
+        \Tools::redirect('/money/walletPay/'.$payId.'/'.$wallets[$currency->id]->id);
     }
 
 }

system/modules/Money/objects/MerchantHelper/Primary.php

Spacing +2 added lines, -2 removed lines

@@ -20,14 +20,14 @@
 
     public static function goToMerchant($payId, $amount, $currency, $description = '', $success = '/', $false = '/')
     {
-        \Tools::redirect('/money/primaryPay/' . $payId . '/' . $currency->id);
+        \Tools::redirect('/money/primaryPay/'.$payId.'/'.$currency->id);
     }
 
     public static function getFinalSum($pay, $method)
     {
         $sum = parent::getFinalSum($pay, $method);
         if ($pay->data && $cart = \Ecommerce\Cart::get($pay->data)) {
-            $extra = '0.' . (strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id);
+            $extra = '0.'.(strlen((string) $cart->id) > 1 ? substr((string) $cart->id, -2) : $cart->id);
         } else {
             $extra = 0;
         }

system/modules/Money/objects/MerchantHelper/Payeer.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
             $data['m_key']
         );
         $data['m_sign'] = strtoupper(hash('sha256', implode(':', $arHash)));
-        \Tools::redirect('http://payeer.com/merchant/?' . http_build_query($data));
+        \Tools::redirect('http://payeer.com/merchant/?'.http_build_query($data));
     }
 
     public static function reciver($data, $status)
@@ -57,11 +57,11 @@ 
                 $m_key);
             $sign_hash = strtoupper(hash('sha256', implode(':', $arHash)));
             if ($_POST['m_sign'] == $sign_hash && $_POST['m_status'] == 'success') {
-                $result['callback'] = $_POST['m_orderid'] . '|success';
+                $result['callback'] = $_POST['m_orderid'].'|success';
                 $result['payId'] = $data["m_orderid"];
                 $result['status'] = 'success';
             } else {
-                $result['callback'] = $_POST['m_orderid'] . '|error';
+                $result['callback'] = $_POST['m_orderid'].'|error';
             }
         }
 

system/modules/Money/objects/MerchantHelper/PerfectMoney.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
         $request['PAYMENT_AMOUNT'] = $amount;
         $request['PAYMENT_UNITS'] = $merchantCurrency->code;
         $request['SUGGESTED_MEMO'] = $description;
-        $request['STATUS_URL'] = 'http://' . INJI_DOMAIN_NAME . '/money/merchants/reciver/PerfectMoney';
+        $request['STATUS_URL'] = 'http://'.INJI_DOMAIN_NAME.'/money/merchants/reciver/PerfectMoney';
         $request['PAYMENT_URL'] = $success;
         $request['NOPAYMENT_URL'] = $false;
         $request['PAYMENT_METHOD'] = 'PerfectMoney account';
@@ -50,10 +50,10 @@ 
 
         $config = static::getConfig();
 
-        $string = $_POST['PAYMENT_ID'] . ':' . $_POST['PAYEE_ACCOUNT'] . ':' .
-                $_POST['PAYMENT_AMOUNT'] . ':' . $_POST['PAYMENT_UNITS'] . ':' .
-                $_POST['PAYMENT_BATCH_NUM'] . ':' .
-                $_POST['PAYER_ACCOUNT'] . ':' . strtoupper(md5($config['secret'])) . ':' .
+        $string = $_POST['PAYMENT_ID'].':'.$_POST['PAYEE_ACCOUNT'].':'.
+                $_POST['PAYMENT_AMOUNT'].':'.$_POST['PAYMENT_UNITS'].':'.
+                $_POST['PAYMENT_BATCH_NUM'].':'.
+                $_POST['PAYER_ACCOUNT'].':'.strtoupper(md5($config['secret'])).':'.
                 $_POST['TIMESTAMPGMT'];
 
         $hash = strtoupper(md5($string));