Completed
Push — master ( f17270...776132 )
by Alexey
07:15
created
system/modules/Money/widgets/cabinet/walletsWidget.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 <?php
3 3
 $blocked = App::$cur->money->getUserBlocks();
4 4
 $wallets = App::$cur->money->getUserWallets();
5
-foreach ($wallets as $wallet) {
5
+foreach ($wallets as $wallet) {
6 6
     ?>
7 7
     <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />
8 8
     <?php
Please login to merge, or discard this patch.
system/modules/Money/widgets/cabinet/wallets.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <h3>Мои кошельки</h3>
2 2
 <div class="row">
3 3
   <?php
4
-  $blocked = App::$cur->money->getUserBlocks();
5
-  $wallets = App::$cur->money->getUserWallets();
6
-  $rates = Money\Currency\ExchangeRate::getList();
7
-  foreach ($wallets as $wallet) {
8
-      ?>
4
+    $blocked = App::$cur->money->getUserBlocks();
5
+    $wallets = App::$cur->money->getUserWallets();
6
+    $rates = Money\Currency\ExchangeRate::getList();
7
+    foreach ($wallets as $wallet) {
8
+        ?>
9 9
         <div class="col-sm-4">
10 10
             <h4><?= $wallet->currency->name(); ?></h4>
11 11
             <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />
Please login to merge, or discard this patch.
system/modules/Money/widgets/cabinet/rewards.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
             <h3>Уровни начислений</h3>
13 13
             <ul>
14 14
               <?php
15
-              foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
16
-                  ?>
15
+                foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
16
+                    ?>
17 17
 
18 18
                     <li><?= !$level->level ? 'Личный' : $level->level; ?>. <?= $types[$level->type]['viewer']($level); ?></li>
19 19
                     <?php
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
                 <h4 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h4>
35 35
                 <ul>
36 36
                   <?php
37
-                  foreach ($condition->items as $item) {
38
-                      $itemComplete = $item->checkComplete();
39
-                      switch ($item->type) {
40
-                          case 'event':
37
+                    foreach ($condition->items as $item) {
38
+                        $itemComplete = $item->checkComplete();
39
+                        switch ($item->type) {
40
+                            case 'event':
41 41
                               $name = \Events\Event::get($item->value, 'event')->name();
42
-                              break;
43
-                      }
44
-                      ?>
42
+                                break;
43
+                        }
44
+                        ?>
45 45
                         <li> 
46 46
                             <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount(); ?></b>/<?= $item->count; ?> <br />
47 47
                         </li>
Please login to merge, or discard this patch.
system/modules/Money/models/Wallet.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
         'manager' => [
43 43
             'cols' => ['user:id', 'user_id', 'currency_id', 'amount'],
44 44
             'sortable' => ['user:id', 'user_id', 'currency_id', 'amount'],
45
-            'filters' => [ 'currency_id'],
45
+            'filters' => ['currency_id'],
46 46
         ]
47 47
     ];
48 48
 
Please login to merge, or discard this patch.
system/modules/Money/appControllers/MerchantsController.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,14 +28,14 @@
 block discarded – undo
28 28
     public function reciverAction($system = '', $status = '') {
29 29
         $postData = [];
30 30
         foreach ($_POST as $key => $text) {
31
-            if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), TRUE)) {
31
+            if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), true)) {
32 32
                 $postData[$key] = iconv('Windows-1251', 'UTF-8', $text);
33 33
             } else {
34 34
                 $postData[$key] = $text;
35 35
             }
36 36
         }
37 37
         foreach ($_GET as $key => $text) {
38
-            if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), TRUE)) {
38
+            if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), true)) {
39 39
                 $postData[$key] = iconv('Windows-1251', 'UTF-8', $text);
40 40
             } else {
41 41
                 $postData[$key] = $text;
Please login to merge, or discard this patch.
system/modules/Money/appControllers/content/pay.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 block discarded – undo
23 23
                     </td>
24 24
                     <td>
25 25
                       <?php
26
-                      foreach ($allowCurrencies as $allowCurrency) {
27
-                          $className = 'Money\MerchantHelper\\' . $merchant->object_name;
28
-                          $sum = $className::getFinalSum($pay, $allowCurrency);
29
-                          ?>
26
+                        foreach ($allowCurrencies as $allowCurrency) {
27
+                            $className = 'Money\MerchantHelper\\' . $merchant->object_name;
28
+                            $sum = $className::getFinalSum($pay, $allowCurrency);
29
+                            ?>
30 30
                             <b><?= $allowCurrency['currency']->name(); ?></b>
31 31
                             <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a>
32 32
                             <?php
Please login to merge, or discard this patch.
system/modules/UserForms/widgets/userForm.php 1 patch
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!empty($params[0])) {
2
+if (!empty($params[0])) {
3 3
     $form_id = $params[0];
4 4
 }
5
-if (empty($form_id)) {
5
+if (empty($form_id)) {
6 6
     echo('form not found');
7 7
     return;
8 8
 }
9 9
 $userForm = \UserForms\Form::get((int) $form_id);
10
-if (!$userForm) {
10
+if (!$userForm) {
11 11
     echo('form not found');
12 12
     return;
13 13
 }
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
15 15
 $form->begin();
16 16
 ?>
17 17
 <?php
18
-if ($userForm->description) {
18
+if ($userForm->description) {
19 19
     echo "<p class = 'text-center'>{$userForm->description}</p>";
20 20
 }
21
-foreach ($userForm->inputs(['order' => ['weight']]) as $input) {
21
+foreach ($userForm->inputs(['order' => ['weight']]) as $input) {
22 22
     $form->input($input->type, 'UserForms[' . (int) $form_id . '][input' . $input->id . ']', $input->label, ['required' => $input->required]);
23 23
 }
24 24
 ?>
Please login to merge, or discard this patch.
system/modules/Notifications/install_script.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-return function ($step = NULL, $params = []) {
3
+return function($step = NULL, $params = []) {
4 4
 
5 5
     $groups = [
6 6
         [
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-return function ($step = NULL, $params = []) {
3
+return function ($step = null, $params = []) {
4 4
     App::$cur->db->createTable('notifications_notification', [
5 5
         'notification_id' => 'pk',
6 6
         'notification_chanel_id' => 'int(11) UNSIGNED NOT NULL',
Please login to merge, or discard this patch.
system/Inji/Statics.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
      */
22 22
     public static function file($path, $resize = '', $resizeCrop = '', $resizePos = '') {
23 23
         $absolutePath = App::$cur->staticLoader->parsePath($path);
24
-        $convet = FALSE;
24
+        $convet = false;
25 25
         if (!file_exists($absolutePath) && file_exists(mb_convert_encoding($absolutePath, 'Windows-1251', 'UTF-8'))) {
26 26
             $absolutePath = mb_convert_encoding($absolutePath, 'Windows-1251', 'UTF-8');
27 27
             $convet = true;
Please login to merge, or discard this patch.