injitools / cms-Inji

system/modules/Ecommerce/objects/OptionsParser.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
         //add filter for item type user roles by current user role
         $selectOptions['where'][] = [
-            [Item\Offer\Price\Type::index(), NULL, 'is'],
+            [Item\Offer\Price\Type::index(), null, 'is'],
             [
                 [Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'],
                 [Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'],

system/modules/Ecommerce/widgets/filters.php

Indentation +20 added lines, -20 removed lines

@@ -1,10 +1,10 @@ 
 <div class="filters">
     <form>
       <?php
-      $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]);
-      $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]);
-      if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) {
-          ?>
+        $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]);
+        $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]);
+        if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) {
+            ?>
             <label>Фильтр по цене</label>
             <div class="form-group">      
                 <div class="row">
@@ -18,24 +18,24 @@ 
             ?>
             <div class="filter">  
               <?php
-              switch ($option->type) {
-                  case 'radio':
+                switch ($option->type) {
+                    case 'radio':
                       echo "<label>{$option->name}</label>";
-                      foreach ($option->items as $item) {
-                          $this->widget('Ui\Form/' . $option->type, [
-                              'label' => $item->name,
-                              'name' => "filters[options][{$option->id}]",
-                              !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
-                              'options' => [
-                                  'value' => $item->id,
-                              ]
-                          ]);
-                      }
-                      break;
-                  case 'select':
+                        foreach ($option->items as $item) {
+                            $this->widget('Ui\Form/' . $option->type, [
+                                'label' => $item->name,
+                                'name' => "filters[options][{$option->id}]",
+                                !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
+                                'options' => [
+                                    'value' => $item->id,
+                                ]
+                            ]);
+                        }
+                        break;
+                    case 'select':
                       echo "<label>{$option->name}</label>";
-                      foreach ($option->items as $item) {
-                          ?>
+                        foreach ($option->items as $item) {
+                            ?>
                             <div class="radio">
                                 <label>
                                     <input type="checkbox" name = 'filters[options][<?= $option->id; ?>][]' value ="<?= $item->id; ?>" <?= !empty($_GET['filters']['options'][$option->id]) && in_array($item->id, $_GET['filters']['options'][$option->id]) ? 'checked' : ''; ?>>

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

Braces +16 added lines, -16 removed lines

@@ -16,34 +16,34 @@ 
             '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 +59,33 @@ 
         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/widgets/cabinet/walletHistory.php

Braces +5 added lines, -5 removed lines

@@ -2,17 +2,17 @@ 
 <?php

 $currency_id = !empty($_GET['currency_id']) ? (int) $_GET['currency_id'] : 0;

 $wallets = App::$cur->money->getUserWallets();

-if ($currency_id && empty($wallets[$currency_id])) {

+if ($currency_id && empty($wallets[$currency_id])) {
     Msg::add('У вас нет такого кошелька');

     Msg::show();

     return;

 }

 

-if ($currency_id) {

+if ($currency_id) {
     $ids = $wallets[$currency_id]->id;

-} else {

+} else {
     $ids = [];

-    foreach ($wallets as $wallet) {

+    foreach ($wallets as $wallet) {
         $ids[] = $wallet->id;

     }

     $ids = implode(',', $ids);

@@ -33,7 +33,7 @@ 
             'start' => $pages->params['start'],

             'limit' => $pages->params['limit'],

         ]);

-foreach ($histories as $history) {

+foreach ($histories as $history) {
     $amount = $history->amount ? $history->amount : $history->new - $history->old;

     $table->addRow([

         $history->id,

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

Braces +5 added lines, -5 removed lines

@@ -2,17 +2,17 @@ 
 <?php

 $currency_id = !empty($_GET['currency_id']) ? (int) $_GET['currency_id'] : 0;

 $wallets = App::$cur->money->getUserWallets();

-if ($currency_id && empty($wallets[$currency_id])) {

+if ($currency_id && empty($wallets[$currency_id])) {
     Msg::add('У вас нет такого кошелька');

     Msg::show();

     return;

 }

 

-if ($currency_id) {

+if ($currency_id) {
     $ids = $wallets[$currency_id]->id;

-} else {

+} else {
     $ids = [];

-    foreach ($wallets as $wallet) {

+    foreach ($wallets as $wallet) {
         $ids[] = $wallet->id;

     }

     $ids = implode(',', $ids);

@@ -33,7 +33,7 @@ 
             'start' => $pages->params['start'],

             'limit' => $pages->params['limit'],

         ]);

-foreach ($histories as $history) {

+foreach ($histories as $history) {
     $amount = $history->amount ? $history->amount : $history->new - $history->old;

     $table->addRow([

         $history->id,

system/modules/Db/objects/Mysql/Mysql.php

Spacing +5 added lines, -5 removed lines

@@ -13,11 +13,11 @@
 
 class Mysql extends \Object {
 
-    public $config = [];       // настройки подключения выбраной базы
-    public $connect = false;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = []; // настройки подключения выбраной базы
+    public $connect = false; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = null;
     public $lastQuery = '';
     public $last_error = '';