injitools / cms-Inji

system/modules/Money/snippets/rewardType/currency.php

Braces +18 added lines, -16 removed lines

@@ -16,34 +16,35 @@ 
             'type' => 'decimal'

         ]

     ],

-    'viewer' => function($level) {

+    'viewer' => function($level) {
 $levelTypes = [

     'procent' => 'Процент',

     'amount' => 'Сумма',

 ];

 return $levelTypes[$level->params['type']->value] . ': ' . $level->params['amount']->value . ' ' . ($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : ''));

 },

-    'rewarder' => function($reward, $sums, $user, $rootUser, $level, $rewardGet) {

+    'rewarder' => function($reward, $sums, $user, $rootUser, $level, $rewardGet) {
 $wallets = \App::$cur->money->getUserWallets($user->id);

 $amount = 0;

-if (!empty($wallets[$level->params['currency_id']->value])) {

-    switch ($level->params['type']->value) {

+if (!empty($wallets[$level->params['currency_id']->value])) {
+    switch ($level->params['type']->value) {
         case 'procent':

             $finalSum = 0;

-            foreach ($sums as $currency_id => $sum) {

-                if ($currency_id != $level->params['currency_id']->value) {

+            foreach ($sums as $currency_id => $sum) {
+                if ($currency_id != $level->params['currency_id']->value) {
                     $rate = \Money\Currency\ExchangeRate::get([

                                 ['currency_id', $currency_id],

                                 ['target_currency_id', $level->params['currency_id']->value],

                     ]);

-                    if ($rate) {

+                    if ($rate) {
                         $finalSum += $sum * $rate->rate;

                     }

-                } else {

+                }
+                else {
                     $finalSum += $sum;

                 }

             }

-            switch ($reward->round_type) {

+            switch ($reward->round_type) {
                 case 'round':

                     $finalSum = round($finalSum, $reward->round_precision);

                     $amount = $finalSum / 100 * (float) $level->params['amount']->value;

@@ -59,33 +60,34 @@ 
         case 'amount':

             $amount = (float) $level->params['amount']->value;

     }

-    if (!$amount) {

+    if (!$amount) {
         return 0;

     }

 

     $text = 'Вознаграждение по программе "' . $reward->name . '"';

-    if ($rootUser->id != $user->id) {

+    if ($rootUser->id != $user->id) {
         $text .= ' от ' . $rootUser->name();

     }

 

-    if (!$rewardGet && $reward->block) {

+    if (!$rewardGet && $reward->block) {
         $block = new \Money\Wallet\Block();

         $block->wallet_id = $wallets[$level->params['currency_id']->value]->id;

         $block->amount = $amount;

         $block->comment = $text;

         $block->data = 'reward:' . $reward->id;

         $dateGenerators = \App::$cur->money->getSnippets('expiredDateGenerator');

-        if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {

+        if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {
             $date = $dateGenerators[$reward->block_date_expired]($reward, $user);

-            if (!empty($date['date'])) {

+            if (!empty($date['date'])) {
                 $block->date_expired = $date['date'];

             }

-            if (!empty($date['type'])) {

+            if (!empty($date['type'])) {
                 $block->expired_type = $date['type'];

             }

         }

         $block->save();

-    } else {

+    }
+    else {
         $wallets[$level->params['currency_id']->value]->diff($amount, $text);

     }

     \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount . ' ' . $wallets[$level->params['currency_id']->value]->currency->acronym());

system/modules/Money/snippets/rewardTriggerHandler/ecommerceCartReward.php

Braces +4 added lines, -2 removed lines

@@ -8,7 +8,8 @@ 
 
         if (!$rewardItemExist) {
             $allowTypes = explode(',', $trigger->params['item_type_id']->value);
-        } else {
+        }
+        else {
             $allowTypes = [];
         }
         foreach ($cart->cartItems as $cartItem) {
@@ -19,7 +20,8 @@ 
             $currency_id = $cartItem->price->currency ? $cartItem->price->currency->id : \App::$cur->ecommerce->config['defaultCurrency'];
             if (empty($sums[$currency_id])) {
                 $sums[$currency_id] = $cartItem->final_price * $cartItem->count;
-            } else {
+            }
+            else {
                 $sums[$currency_id] += $cartItem->final_price * $cartItem->count;
             }
         }

system/modules/Money/snippets/userActivity/lastPurchase.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 

 return [

     'name' => 'Последняя покупка не позднее 90 дней',

-    'checker' => function($user) {

+    'checker' => function($user) {
         $query = 'SELECT * FROM inji_ecommerce_cart iec WHERE iec.cart_cart_status_id >= 5 AND iec.cart_date_create >= NOW() - INTERVAL 90 DAY AND cart_user_id = ?';

         $result = \App::$cur->db->query(['query' => $query, 'params' => [$user->id]]);

         return (bool) $result ? $result->fetch() : false;

system/modules/Money/objects/Sums.php

Braces +6 added lines, -3 removed lines

@@ -54,7 +54,8 @@ 
         foreach ($this->sums as $currency_id => $sum) {
             if ($first) {
                 $first = false;
-            } else {
+            }
+            else {
                 $string.= '<br />';
             }
             $string.= '<span style="white-space:nowrap;">';
@@ -63,10 +64,12 @@ 
                 $currency = \Money\Currency::get($currency_id);
                 if ($currency) {
                     $string.= ' ' . $currency->acronym();
-                } else {
+                }
+                else {
                     $string.= ' руб.';
                 }
-            } else {
+            }
+            else {
                 $string.= ' руб.';
             }
             $string.= '</span>';

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

Braces +24 added lines, -15 removed lines

@@ -27,20 +27,24 @@ 
 
         // Проверка наличия необходимых параметров в POST-запросе
 
-        if (!isset($data["WMI_SIGNATURE"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
+        if (!isset($data["WMI_SIGNATURE"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
+        }
 
-        if (!isset($data["WMI_PAYMENT_NO"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
+        if (!isset($data["WMI_PAYMENT_NO"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
+        }
 
-        if (!isset($data["WMI_ORDER_STATE"]))
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
+        if (!isset($data["WMI_ORDER_STATE"])) {
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
+        }
 
         // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE
         $params = [];
         foreach ($data as $name => $value) {
-            if ($name !== "WMI_SIGNATURE")
-                $params[$name] = $value;
+            if ($name !== "WMI_SIGNATURE") {
+                            $params[$name] = $value;
+            }
         }
 
         // Сортировка массива по именам ключей в порядке возрастания
@@ -69,11 +73,13 @@ 
                 $result['payId'] = $data["WMI_PAYMENT_NO"];
                 $result['status'] = 'success';
                 return $result;
-            } else {
+            }
+            else {
                 // Случилось что-то странное, пришло неизвестное состояние заказа
                 $result['callback'] = print_answer("Retry", "Неверное состояние " . $data["WMI_ORDER_STATE"]);
             }
-        } else {
+        }
+        else {
             // Подпись не совпадает, возможно вы поменяли настройки интернет-магазина
             $result['callback'] = print_answer("Retry", "Неверная подпись " . (!empty($data["WMI_SIGNATURE"]) ? $data["WMI_SIGNATURE"] : 'empty'));
         }
@@ -84,8 +90,9 @@ 
         $config = static::getConfig();
         $merchantCurrency = static::getMerchantCurrency($currency);
 
-        if (!$description)
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+        if (!$description) {
+                    $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
+        }
 
         //Секретный ключ интернет-магазина
         $key = $config['secret'];
@@ -115,13 +122,15 @@ 
         $fieldValues = "";
 
         foreach ($fields as $value) {
-            if (is_array($value))
-                foreach ($value as $v) {
+            if (is_array($value)) {
+                            foreach ($value as $v) {
                     //Конвертация из текущей кодировки (UTF-8)
                     //необходима только если кодировка магазина отлична от Windows-1251
                     $v = iconv("utf-8", "windows-1251", $v);
+            }
                     $fieldValues .= $v;
-                } else {
+                }
+                else {
                 //Конвертация из текущей кодировки (UTF-8)
                 //необходима только если кодировка магазина отлична от Windows-1251
                 $value = iconv("utf-8", "windows-1251", $value);

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

Braces +2 added lines, -1 removed lines

@@ -58,7 +58,8 @@
                 $result['callback'] = $_POST['m_orderid'] . '|success';
                 $result['payId'] = $data["m_orderid"];
                 $result['status'] = 'success';
-            } else {
+            }
+            else {
                 $result['callback'] = $_POST['m_orderid'] . '|error';
             }
         }

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

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
         $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);
-        } else {
+        }
+        else {
             $extra = 0;
         }
         return $sum + $extra;

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

Braces +5 added lines, -3 removed lines

@@ -24,8 +24,9 @@ 
 
         $result['payId'] = $data["InvId"];
 
-        if (strtolower($data['SignatureValue']) == $hashGenerated)
-            $result['status'] = 'success';
+        if (strtolower($data['SignatureValue']) == $hashGenerated) {
+                    $result['status'] = 'success';
+        }
 
         return $result;
     }
@@ -43,7 +44,8 @@ 
         ];
         if (empty($config['test'])) {
             \Tools::redirect('https://auth.robokassa.ru/Merchant/Index.aspx?' . http_build_query($data));
-        } else {
+        }
+        else {
             \Tools::redirect('http://test.robokassa.ru/Index.aspx?' . http_build_query($data));
         }
     }

system/modules/Money/Money.php

Braces +6 added lines, -3 removed lines

@@ -49,7 +49,8 @@ 
     public function reciver($data, $system, $status, $mr) {
         if ($system) {
             $merchant = \Money\Merchant::get($system, 'object_name');
-        } else {
+        }
+        else {
             $merchant = false;
         }
         if ($merchant) {
@@ -96,7 +97,8 @@ 
         foreach ($blocked as $block) {
             if (empty($blocks[$block->wallet->currency_id])) {
                 $blocks[$block->wallet->currency_id] = $block->amount;
-            } else {
+            }
+            else {
                 $blocks[$block->wallet->currency_id]+= $block->amount;
             }
         }
@@ -123,7 +125,8 @@ 
                 $wallet->currency_id = $currency->id;
                 $wallet->save();
                 $result[$walletIdasKey ? $wallet->id : $currency->id] = $forSelect ? $wallet->name() : $wallet;
-            } else {
+            }
+            else {
                 $result[$walletIdasKey ? $wallets[$currency->id]->id : $currency->id] = $forSelect ? $wallets[$currency->id]->name() : $wallets[$currency->id];
             }
         }