Completed
Push — master ( 361860...56fb42 )
by Alexey
05:41
created
system/modules/UserForms/models/Form.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
     public static $cols = [
25 25
         'name' => ['type' => 'text'],
26 26
         'description' => ['type' => 'html'],
27
-        'user_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'user'],
27
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
28 28
         'date_create' => ['type' => 'dateTime'],
29 29
         //Менеджеры
30
-        'inputs' => [ 'type' => 'dataManager', 'relation' => 'inputs'],
30
+        'inputs' => ['type' => 'dataManager', 'relation' => 'inputs'],
31 31
     ];
32 32
     public static $dataManagers = [
33 33
         'manager' => [
Please login to merge, or discard this patch.
system/modules/Ui/objects/Tree.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
           }
32 32
           $count += count($items);
33 33
           foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
34
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
35 35
           }
36 36
           ?>
37 37
         </ul>
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
                     echo \Html::el('li', $attributes, $item, true);
64 64
                     echo '<ul>';
65 65
                 }
66
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
66
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
67 67
             }
68 68
         }
69 69
         if ($isset) {
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
               $bestItems = array_slice($bestItems, 0, 3);
20 20
           }
21 21
           $this->widget('Ecommerce\items/icons', ['items' => $bestItems]);
22
-          $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]);
22
+          $this->widget('Ecommerce\items/table', ['items'=>$bestItems, 'hide'=>true]);
23 23
           ?>
24 24
         </div>
25 25
       </div>
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
       $bestItems = App::$cur->ecommerce->getItems(['sort' => ['sales' => 'desc'], 'start' => 0, 'count' => 6]);
30 30
       $this->widget('Ecommerce\items/icons', ['items' => $bestItems]);
31
-      $this->widget('Ecommerce\items/table', ['items'=>$bestItems,'hide'=>true]);
31
+      $this->widget('Ecommerce\items/table', ['items'=>$bestItems, 'hide'=>true]);
32 32
       ?>
33 33
       <a class="ecommerce-showmore" href="/ecommerce/itemList">Показать больше товаров</a>
34 34
     </div>
Please login to merge, or discard this patch.
system/modules/Money/snippets/rewardType/currency.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
     } else {
89 89
         $wallets[$level->params['currency_id']->value]->diff($amount, $text);
90 90
     }
91
-    \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym());
91
+    \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount . ' ' . $wallets[$level->params['currency_id']->value]->currency->acronym());
92 92
 }
93 93
 return $amount;
94 94
 }
Please login to merge, or discard this patch.
system/modules/Money/appControllers/content/confirmTransfer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
     <h2>Подтверждение перевода №<?= $transfer->id; ?></h2>
4 4
     <p>Перевод валюты <?= $transfer->currency->name(); ?> на сумму <?= $transfer->amount; ?> пользователю <?= $transfer->toUser->name(); ?></p>
5 5
     <?php
6
-    if($transfer->comment){
6
+    if ($transfer->comment) {
7 7
         echo "<p>Комментарий: {$transfer->comment}</p>";
8 8
     }
9 9
     ?>
Please login to merge, or discard this patch.
system/modules/Ecommerce/widgets/items/icons.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@
 block discarded – undo
9 9
         </div>
10 10
         <?php
11 11
         ++$i;
12
-        if (!( $i % 3)) {
12
+        if (!($i % 3)) {
13 13
             echo '<div class="clearfix hidden-xs"></div>';
14 14
         }
15
-        if (!( $i % 2)) {
15
+        if (!($i % 2)) {
16 16
             echo '<div class="clearfix visible-xs"></div>';
17 17
         }
18 18
     }
Please login to merge, or discard this patch.
system/modules/Money/models/Transfer.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,16 +48,16 @@
 block discarded – undo
48 48
             ],
49 49
             'name' => 'Переводы',
50 50
             'cols' => [
51
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
51
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
52 52
             ],
53 53
             'actions' => [
54 54
                 'Money\CancelTransfer', 'Money\CompleteTransfer'
55 55
             ],
56 56
             'sortable' => [
57
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
57
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
58 58
             ],
59 59
             'filters' => [
60
-                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled','date_create'
60
+                'user_id', 'to_user_id', 'currency_id', 'amount', 'comment', 'complete', 'canceled', 'date_create'
61 61
             ]
62 62
         ]
63 63
     ];
Please login to merge, or discard this patch.
system/modules/Money/Money.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
             if (empty($blocks[$block->wallet->currency_id])) {
103 103
                 $blocks[$block->wallet->currency_id] = $block->amount;
104 104
             } else {
105
-                $blocks[$block->wallet->currency_id]+= $block->amount;
105
+                $blocks[$block->wallet->currency_id] += $block->amount;
106 106
             }
107 107
         }
108 108
         return $blocks;
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         $rootUser = $rootUser ? $rootUser : \Users\User::$cur;
169 169
         $reward = \Money\Reward::get($reward_id);
170 170
         $reward->checkBlocked();
171
-        $reward_count = \Money\Reward\Recive::getCount([ 'where' => [ 'reward_id', $reward_id]]);
171
+        $reward_count = \Money\Reward\Recive::getCount(['where' => ['reward_id', $reward_id]]);
172 172
         if ($reward_count >= $reward->quantity && $reward->quantity)
173 173
             return false;
174 174
         $types = $this->getSnippets('rewardType');
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
                 $recives = \Money\Reward\Recive::getList(['where' => [['user_id', $user->id], ['reward_id', $reward->id]]]);
190 190
                 $amount = 0;
191 191
                 foreach ($recives as $recive) {
192
-                    $amount+=$recive->amount;
192
+                    $amount += $recive->amount;
193 193
                 }
194 194
                 if ($amount >= $reward->peruser) {
195 195
                     continue;
Please login to merge, or discard this patch.
system/modules/Money/objects/Sums.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -61,21 +61,21 @@
 block discarded – undo
61 61
             if ($first) {
62 62
                 $first = false;
63 63
             } else {
64
-                $string.= '<br />';
64
+                $string .= '<br />';
65 65
             }
66
-            $string.= '<span style="white-space:nowrap;">';
67
-            $string.= number_format($sum, 2, '.', ' ');
66
+            $string .= '<span style="white-space:nowrap;">';
67
+            $string .= number_format($sum, 2, '.', ' ');
68 68
             if (\App::$cur->money) {
69 69
                 $currency = \Money\Currency::get($currency_id);
70 70
                 if ($currency) {
71
-                    $string.= ' ' . $currency->acronym();
71
+                    $string .= ' ' . $currency->acronym();
72 72
                 } else {
73
-                    $string.= ' руб.';
73
+                    $string .= ' руб.';
74 74
                 }
75 75
             } else {
76
-                $string.= ' руб.';
76
+                $string .= ' руб.';
77 77
             }
78
-            $string.= '</span>';
78
+            $string .= '</span>';
79 79
         }
80 80
         return $string;
81 81
     }
Please login to merge, or discard this patch.