injitools / cms-Inji

system/modules/Modules/Modules.php

Spacing +48 added lines, -48 removed lines

@@ -13,19 +13,19 @@ 
     public function createBlankModule($name, $codeName)
     {
         $codeName = ucfirst($codeName);
-        Tools::createDir(App::$primary->path . '/modules/' . $codeName);
+        Tools::createDir(App::$primary->path.'/modules/'.$codeName);
         ob_start();
-        include $this->path . '/tpls/BlankModule.php';
+        include $this->path.'/tpls/BlankModule.php';
         $moduleCode = ob_get_contents();
         ob_end_clean();
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/' . $codeName . '.php', $moduleCode);
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/info.php', "<?php\nreturn " . CodeGenerator::genArray(['name' => $name]));
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/generatorHash.php', "<?php\nreturn " . CodeGenerator::genArray([$codeName . '.php' => md5($moduleCode)]));
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/'.$codeName.'.php', $moduleCode);
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/info.php', "<?php\nreturn ".CodeGenerator::genArray(['name' => $name]));
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/generatorHash.php', "<?php\nreturn ".CodeGenerator::genArray([$codeName.'.php' => md5($moduleCode)]));
     }
 
     public function parseColsForModel($cols = [])
     {
-        $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []];
+        $modelCols = ['labels' => [], 'cols' => [], 'relations' => []];
         foreach ($cols as $col) {
             $modelCols['labels'][$col['code']] = $col['label'];
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];
@@ -50,11 +50,11 @@ 
 
         $colsExist = App::$cur->db->getTableCols($tableName);
         $tableCols = [];
-        if (empty($colsExist[$colPrefix . 'id'])) {
-            $tableCols[$colPrefix . 'id'] = 'pk';
+        if (empty($colsExist[$colPrefix.'id'])) {
+            $tableCols[$colPrefix.'id'] = 'pk';
         }
         foreach ($cols as $col) {
-            if (!empty($colsExist[$colPrefix . $col['code']])) {
+            if (!empty($colsExist[$colPrefix.$col['code']])) {
                 continue;
             }
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];
@@ -62,23 +62,23 @@ 
                 case 'image':
                 case 'number':
                 case 'relation':
-                    $tableCols[$colPrefix . $col['code']] = 'int(11) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'int(11) NOT NULL';
                     break;
                 case 'decimal':
-                    $tableCols[$colPrefix . $col['code']] = 'decimal(11,2) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'decimal(11,2) NOT NULL';
                     break;
                 case 'dateTime':
-                    $tableCols[$colPrefix . $col['code']] = 'timestamp NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'timestamp NOT NULL';
                     break;
                 case 'currentDateTime':
-                    $tableCols[$colPrefix . $col['code']] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+                    $tableCols[$colPrefix.$col['code']] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
                     break;
                 case 'text':
-                    $tableCols[$colPrefix . $col['code']] = 'varchar(255) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'varchar(255) NOT NULL';
                     break;
                 case 'textarea':
                 default:
-                    $tableCols[$colPrefix . $col['code']] = 'text NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'text NOT NULL';
                     break;
             }
         }
@@ -94,8 +94,8 @@ 
         $modelCols = $this->parseColsForModel();
         if (!empty($options['cols'])) {
             $modelCols = $this->parseColsForModel($options['cols']);
-            $tableName = strtolower($module) . '_' . strtolower($codeName);
-            $tableCols = $this->parseColsForTable($options['cols'], strtolower($codeName) . '_', $tableName);
+            $tableName = strtolower($module).'_'.strtolower($codeName);
+            $tableCols = $this->parseColsForTable($options['cols'], strtolower($codeName).'_', $tableName);
             if (App::$cur->db->tableExist($tableName)) {
                 foreach ($tableCols as $colKey => $params) {
                     App::$cur->db->add_col($tableName, $colKey, $params);
@@ -107,15 +107,15 @@ 
         $class->addProperty('objectName', $name, true);
         $class->addProperty('cols', $modelCols['cols'], true);
         $class->addProperty('labels', $modelCols['labels'], true);
-        $class->addMethod('relations', 'return ' . CodeGenerator::genArray($modelCols['relations']), [], true);
-        $modelCode = "<?php \n\nnamespace {$module};\n\n" . $class->generate();
+        $class->addMethod('relations', 'return '.CodeGenerator::genArray($modelCols['relations']), [], true);
+        $modelCode = "<?php \n\nnamespace {$module};\n\n".$class->generate();
 
         $modulePath = Module::getModulePath($module);
-        Tools::createDir($modulePath . '/models');
-        file_put_contents($modulePath . '/models/' . $codeName . '.php', $modelCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config['models/' . $codeName . '.php'] = md5($modelCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        Tools::createDir($modulePath.'/models');
+        file_put_contents($modulePath.'/models/'.$codeName.'.php', $modelCode);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config['models/'.$codeName.'.php'] = md5($modelCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
     public function install($module, $params = [])
@@ -135,7 +135,7 @@ 
 
         $type = 'modules';
 
-        $path = INJI_SYSTEM_DIR . '/modules/';
+        $path = INJI_SYSTEM_DIR.'/modules/';
         $location = 'modules';
 
         $config[$location][] = $module;
@@ -148,8 +148,8 @@ 
             }
         }
         Config::save('app', $config, null, App::$primary);
-        if (file_exists($path . $module . '/install_script.php')) {
-            $installFunction = include $path . $module . '/install_script.php';
+        if (file_exists($path.$module.'/install_script.php')) {
+            $installFunction = include $path.$module.'/install_script.php';
             $installFunction(1, $params);
         }
     }
@@ -178,8 +178,8 @@ 
             $info = Modules::getInfo($module);
             $moduleName = !empty($info['name']) ? $info['name'] : $module;
             foreach ($modelsNames as $modelName) {
-                $fullModelName = $module . '\\' . $modelName;
-                $models[$fullModelName] = $moduleName . ' - ' . ($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
+                $fullModelName = $module.'\\'.$modelName;
+                $models[$fullModelName] = $moduleName.' - '.($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
             }
         }
         foreach (App::$primary->config['modules'] as $configModule) {
@@ -190,9 +190,9 @@ 
             $info = Modules::getInfo($configModule);
             $moduleName = !empty($info['name']) ? $info['name'] : $configModule;
             foreach ($modelsNames as $modelName) {
-                $fullModelName = $configModule . '\\' . $modelName;
+                $fullModelName = $configModule.'\\'.$modelName;
                 Router::loadClass($fullModelName);
-                $models[$fullModelName] = $moduleName . ' - ' . ($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
+                $models[$fullModelName] = $moduleName.' - '.($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
             }
         }
         return $models;
@@ -201,16 +201,16 @@ 
     public function getModelsList($module, $dir = '')
     {
         $modulePath = Module::getModulePath($module);
-        $path = rtrim($modulePath . '/models/' . $dir, '/');
+        $path = rtrim($modulePath.'/models/'.$dir, '/');
         $models = [];
         if (file_exists($path)) {
             foreach (array_slice(scandir($path), 2) as $file) {
                 $modelLastName = pathinfo($file, PATHINFO_FILENAME);
-                if (is_dir($path . '/' . $file)) {
-                    $models = array_merge($models, $this->getModelsList($module, $dir . '/' . $modelLastName));
+                if (is_dir($path.'/'.$file)) {
+                    $models = array_merge($models, $this->getModelsList($module, $dir.'/'.$modelLastName));
                 }
-                $nameSpace = trim(preg_replace('!/' . $modelLastName . '$!', '', $dir), '/');
-                $models[] = trim(str_replace('/', '\\', $nameSpace) . '\\' . $modelLastName, '\\');
+                $nameSpace = trim(preg_replace('!/'.$modelLastName.'$!', '', $dir), '/');
+                $models[] = trim(str_replace('/', '\\', $nameSpace).'\\'.$modelLastName, '\\');
             }
         }
         return $models;
@@ -219,30 +219,30 @@ 
     public function createController($module, $controllerType)
     {
         $modulePath = Module::getModulePath($module);
-        $path = $modulePath . '/' . $controllerType . '/' . $module . 'Controller.php';
+        $path = $modulePath.'/'.$controllerType.'/'.$module.'Controller.php';
         $class = new CodeGenerator\ClassGenerator();
-        $class->name = $module . 'Controller';
+        $class->name = $module.'Controller';
         $class->extends = 'Controller';
-        $controllerCode = "<?php\n\n" . $class->generate();
+        $controllerCode = "<?php\n\n".$class->generate();
         Tools::createDir(pathinfo($path, PATHINFO_DIRNAME));
         file_put_contents($path, $controllerCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config[$controllerType . '/' . $module . 'Controller.php'] = md5($controllerCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config[$controllerType.'/'.$module.'Controller.php'] = md5($controllerCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
     public function addActionToController($module, $type, $controller, $url)
     {
         $modulePath = Module::getModulePath($module);
-        $path = Modules::getModulePath($module) . '/' . $type . '/' . $controller . '.php';
+        $path = Modules::getModulePath($module).'/'.$type.'/'.$controller.'.php';
         $class = CodeGenerator::parseClass($path);
-        $class->addMethod($url . 'Action');
-        $controllerCode = "<?php\n\n" . $class->generate();
+        $class->addMethod($url.'Action');
+        $controllerCode = "<?php\n\n".$class->generate();
         Tools::createDir(pathinfo($path, PATHINFO_DIRNAME));
         file_put_contents($path, $controllerCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config[$type . '/' . $module . 'Controller.php'] = md5($controllerCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config[$type.'/'.$module.'Controller.php'] = md5($controllerCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
 }

system/modules/Modules/tpls/Model.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
 class <?= $codeName; ?> extends \Model {
 //modelParams<?php
 if (!empty($name)) {
-    echo "\n    static " . '$objectName = \'' . $name . "';";
+    echo "\n    static ".'$objectName = \''.$name."';";
 }
 if (!empty($labels)) {
-    echo "\n    static " . '$labels = [' . CodeGenerator::genArray($labels, 1) . "\n    ];";
+    echo "\n    static ".'$labels = ['.CodeGenerator::genArray($labels, 1)."\n    ];";
 }
 if (!empty($cols)) {
-    echo "\n    static " . '$cols = [' . CodeGenerator::genArray($cols, 1) . "\n    ];";
+    echo "\n    static ".'$cols = ['.CodeGenerator::genArray($cols, 1)."\n    ];";
 }
 ?>
 //!modelParams

system/modules/Money/models/Reward.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function checkBlocked()
     {
         $blocked = Wallet\Block::getList(['where' => [
-                        ['data', 'reward:' . $this->id],
+                        ['data', 'reward:'.$this->id],
                         [
                             ['date_expired', '0000-00-00 00:00:00'],
                             ['date_expired', date('Y-m-d H:i:s'), '>', 'OR']

system/modules/Money/models/Transfer.php

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
 
     public static function itemName($item)
     {
-        return $item->pk() . '. ' . $item->name();
+        return $item->pk().'. '.$item->name();
     }
 
     public static $dataManagers = [
@@ -48,16 +48,16 @@ 
             ],
             'name' => 'Переводы',
             'cols' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ],
             'actions' => [
                 'Money\CancelTransfer', 'Money\CompleteTransfer'
             ],
             'sortable' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ],
             'filters' => [
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
             ]
         ]
     ];
@@ -182,7 +182,7 @@ 
 
     public function name()
     {
-        return 'Перевод на сумму ' . $this->amount . ' ' . $this->currency->name . ' от ' . $this->user->name() . ' для ' . $this->toUser->name();
+        return 'Перевод на сумму '.$this->amount.' '.$this->currency->name.' от '.$this->user->name().' для '.$this->toUser->name();
     }
 
     public function cancel()
@@ -192,14 +192,14 @@ 
         }
 
         $this->canceled = 1;
-        $block = \Money\Wallet\Block::get('Money\Transfer:' . $this->id, 'data');
+        $block = \Money\Wallet\Block::get('Money\Transfer:'.$this->id, 'data');
         if ($block) {
             $block->delete();
         }
         $wallets = \App::$cur->money->getUserWallets($this->user_id);
         $text = 'Отмена перевода средств';
         $wallets[$this->currency_id]->diff($this->amount, $text);
-        \App::$cur->users->AddUserActivity($this->user_id, 4, $text . '<br />' . (float) $this->amount . ' ' . $wallets[$this->currency_id]->currency->acronym());
+        \App::$cur->users->AddUserActivity($this->user_id, 4, $text.'<br />'.(float) $this->amount.' '.$wallets[$this->currency_id]->currency->acronym());
         $this->save();
         return true;
     }
@@ -211,14 +211,14 @@ 
         }
 
         $this->complete = 1;
-        $block = \Money\Wallet\Block::get('Money\Transfer:' . $this->id, 'data');
+        $block = \Money\Wallet\Block::get('Money\Transfer:'.$this->id, 'data');
         if ($block) {
             $block->delete();
         }
         $wallets = \App::$cur->money->getUserWallets($this->to_user_id);
-        $text = 'Перевод средств от ' . $this->user->name() . '.' . ($this->comment ? ' Комментарий:' . $this->comment : '');
+        $text = 'Перевод средств от '.$this->user->name().'.'.($this->comment ? ' Комментарий:'.$this->comment : '');
         $wallets[$this->currency_id]->diff($this->amount, $text);
-        \App::$cur->users->AddUserActivity($this->to_user_id, 4, $text . '<br />' . (float) $this->amount . ' ' . $wallets[$this->currency_id]->currency->acronym());
+        \App::$cur->users->AddUserActivity($this->to_user_id, 4, $text.'<br />'.(float) $this->amount.' '.$wallets[$this->currency_id]->currency->acronym());
         $this->save();
         return true;
     }

system/modules/Money/install_script.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $currencies = [
         [
@@ -46,22 +46,22 @@ 
         [
             'name' => 'Wallet One',
             'object_name' => 'WalletOne',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/WalletOne.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/WalletOne.png')
         ],
         [
             'name' => 'Robokassa',
             'object_name' => 'Robokassa',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/Robokassa.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/Robokassa.png')
         ],
         [
             'name' => 'Payeer',
             'object_name' => 'Payeer',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/Payeer.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/Payeer.png')
         ],
         [
             'name' => 'PerfectMoney',
             'object_name' => 'PerfectMoney',
-            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__ . '/static/images/PerfectMoney.png')
+            'image_file_id' => App::$cur->Files->uploadFromUrl(__DIR__.'/static/images/PerfectMoney.png')
         ],
     ];
     $merchantsConfig = [

system/modules/Money/appControllers/MerchantsController.php

Spacing +5 added lines, -5 removed lines

@@ -21,8 +21,8 @@ 
             'callback_method' => ''

                 ], null, [

             'description' => 'Тестовый платеж',

-            'success' => 'http://' . INJI_DOMAIN_NAME . '/',

-            'false' => 'http://' . INJI_DOMAIN_NAME . '/'

+            'success' => 'http://'.INJI_DOMAIN_NAME.'/',

+            'false' => 'http://'.INJI_DOMAIN_NAME.'/'

         ]);

     }

 

@@ -122,9 +122,9 @@ 
             Tools::redirect('/', 'Валюта для этого способа оплаты не найдена', 'danger');

         }

         $merchantOptions = [

-            'description' => $pay->description ? '#' . $pay->id . ' ' . $pay->description : 'Оплата счета №' . $pay->id . ' на сайте: ' . idn_to_utf8(INJI_DOMAIN_NAME),

-            'success' => 'http://' . INJI_DOMAIN_NAME . '/',

-            'false' => 'http://' . INJI_DOMAIN_NAME . '/'

+            'description' => $pay->description ? '#'.$pay->id.' '.$pay->description : 'Оплата счета №'.$pay->id.' на сайте: '.idn_to_utf8(INJI_DOMAIN_NAME),

+            'success' => 'http://'.INJI_DOMAIN_NAME.'/',

+            'false' => 'http://'.INJI_DOMAIN_NAME.'/'

         ];

 

         $this->Money->goToMerchant($pay, $merchant, $method, $merchantOptions);

system/modules/Money/appControllers/content/pays.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
             $pay->description,

             $pay->sum,

             $pay->currency->name(),

-            '<a href = "/money/merchants/pay/' . $pay->id . '" class="btn btn-success btn-sm">Оплатить</a>',

-            '<a href = "/money/merchants/cancelPay/' . $pay->id . '" class="btn btn-danger btn-sm">Отказаться</a>'

+            '<a href = "/money/merchants/pay/'.$pay->id.'" class="btn btn-success btn-sm">Оплатить</a>',

+            '<a href = "/money/merchants/cancelPay/'.$pay->id.'" class="btn btn-danger btn-sm">Отказаться</a>'

         ]);

     }

     $table->draw();

system/modules/Money/appControllers/content/pay.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
             <td>
               <?php
               foreach ($allowCurrencies as $allowCurrency) {
-                  $className = 'Money\MerchantHelper\\' . $merchant->object_name;
+                  $className = 'Money\MerchantHelper\\'.$merchant->object_name;
                   $sum = $className::getFinalSum($pay, $allowCurrency);
                   ?>
                   <b><?= $allowCurrency['currency']->name(); ?></b>
@@ -34,7 +34,7 @@ 
               ?>
             </td>
             <td width="100%">
-              <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?>
+              <?= $merchant->previewImage ? '<img src="'.$merchant->previewImage->path.'" class="img-responsive" />' : ''; ?>
             </td>
           </tr>
           <?php

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')]);