Completed
Push — master ( 0fc305...2f7f6c )
by Alexey
06:05
created
system/modules/Ecommerce/models/Cart.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@
 block discarded – undo
216 216
 
217 217
     public static function itemName($item)
218 218
     {
219
-        return $item->pk() . '. ' . $item->name();
219
+        return $item->pk().'. '.$item->name();
220 220
     }
221 221
 
222 222
     public static $forms = [
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/Item/Offer.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
     {
79 79
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
80 80
         if ($warehouse) {
81
-            $warehouse->count +=(float) $count;
81
+            $warehouse->count += (float) $count;
82 82
             $warehouse->save();
83 83
         } else {
84 84
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
85 85
             if ($warehouse) {
86
-                $warehouse->count +=(float) $count;
86
+                $warehouse->count += (float) $count;
87 87
                 $warehouse->save();
88 88
             }
89 89
         }
@@ -101,21 +101,21 @@  discard block
 block discarded – undo
101 101
             }
102 102
         }
103 103
         if ($warehouseIds) {
104
-            \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index(), $warehouseIds, 'IN');
104
+            \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index(), $warehouseIds, 'IN');
105 105
         }
106
-        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
107
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count),0) as `sum` ';
106
+        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
107
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Item\Offer\Warehouse::colPrefix().'count),0) as `sum` ';
108 108
         $warehouse = \App::$cur->db->select(\Ecommerce\Item\Offer\Warehouse::table())->fetch();
109 109
 
110
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0) as `sum` ';
111
-        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
110
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Warehouse\Block::colPrefix().'count) ,0) as `sum` ';
111
+        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
112 112
         if ($cart_id) {
113
-            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int) $cart_id, '!=');
113
+            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index(), (int) $cart_id, '!=');
114 114
         }
115 115
         $on = '
116
-            ' . \Ecommerce\Cart::index() . ' = ' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
117
-            (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) || 
118
-            (`' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
116
+            ' . \Ecommerce\Cart::index().' = '.\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index().' AND (
117
+            (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) || 
118
+            (`' . \Ecommerce\Cart::colPrefix().'cart_status_id` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
119 119
             )
120 120
         ';
121 121
         \App::$cur->db->join(\Ecommerce\Cart::table(), $on, 'inner');
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object/Value.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                 $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
73 73
                 if ($this->model->{$this->param->value}) {
74 74
                     $file = \Files\File::get($this->model->{$this->param->value});
75
-                    if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
75
+                    if ($file && $value && file_exists($dir.'/'.$value) && file_exists(\App::$primary->path.$file->path) && md5_file($dir.'/'.$value) == md5_file(\App::$primary->path.$file->path)) {
76 76
                         $notEq = false;
77 77
                     }
78 78
                     if ($file && $notEq) {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                     }
82 82
                 }
83 83
                 if ($notEq) {
84
-                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
84
+                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
85 85
                 }
86 86
                 break;
87 87
             default:
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
                         if ($param->type == 'custom') {
63 63
                             $parserName = $param->value;
64 64
                         } else {
65
-                            $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
65
+                            $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type);
66 66
                         }
67 67
                         $parser = new $parserName;
68 68
                         $parser->data = &$data[$param->code];
Please login to merge, or discard this patch.
system/modules/Ui/objects/Tree.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -23,17 +23,17 @@
 block discarded – undo
23 23
         ?>
24 24
         <ul class="treeview" data-col='tree_path'>
25 25
           <?php
26
-          if (is_string($objectRoot)) {
27
-              $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
28
-          } else {
29
-              $class = get_class($objectRoot);
30
-              $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()], 'order' => $order]);
31
-          }
32
-          $count += count($items);
33
-          foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
35
-          }
36
-          ?>
26
+            if (is_string($objectRoot)) {
27
+                $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
28
+            } else {
29
+                $class = get_class($objectRoot);
30
+                $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()], 'order' => $order]);
31
+            }
32
+            $count += count($items);
33
+            foreach ($items as $objectChild) {
34
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
35
+            }
36
+            ?>
37 37
         </ul>
38 38
         <?php
39 39
         return $count;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 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, $order);
34
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
35 35
           }
36 36
           ?>
37 37
         </ul>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             $item = $item['text'];
53 53
         }
54 54
         if (!isset($attributes['id'])) {
55
-            $attributes['id'] = str_replace('\\', '_', get_class($object)) . "-{$object->pk()}";
55
+            $attributes['id'] = str_replace('\\', '_', get_class($object))."-{$object->pk()}";
56 56
         }
57 57
         if (!$maxDeep || $deep < $maxDeep) {
58 58
             $items = $class::getList(['where' => ['parent_id', $object->pk()], 'order' => $order]);
@@ -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, $order);
66
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
67 67
             }
68 68
         }
69 69
         if ($isset) {
Please login to merge, or discard this patch.
system/modules/Money/models/Wallet.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         'manager' => [
44 44
             'cols' => ['user:id', 'user_id', 'currency_id', 'amount'],
45 45
             'sortable' => ['user:id', 'user_id', 'currency_id', 'amount'],
46
-            'filters' => [ 'currency_id'],
46
+            'filters' => ['currency_id'],
47 47
         ]
48 48
     ];
49 49
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
     {
67 67
         $amount = (float) $amount;
68 68
         $query = \App::$cur->db->newQuery();
69
-        $string = 'UPDATE ' . \App::$cur->db->table_prefix . $this->table() . ' SET `' . $this->colPrefix() . 'amount`=`' . $this->colPrefix() . 'amount`+' . $amount . ' where `' . $this->index() . '` = ' . $this->id;
69
+        $string = 'UPDATE '.\App::$cur->db->table_prefix.$this->table().' SET `'.$this->colPrefix().'amount`=`'.$this->colPrefix().'amount`+'.$amount.' where `'.$this->index().'` = '.$this->id;
70 70
         $query->query($string);
71 71
         $history = new Wallet\History();
72 72
         $history->wallet_id = $this->pk();
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     {
87 87
         switch ($this->currency->round_type) {
88 88
             case 'floor':
89
-                $dif = (float) ('1' . str_repeat('0', $this->currency->round_precision));
89
+                $dif = (float) ('1'.str_repeat('0', $this->currency->round_precision));
90 90
                 return floor($this->amount * $dif) / $dif;
91 91
             default :
92 92
                 return $this->amount;
Please login to merge, or discard this patch.
system/modules/Dashboard/appAdminControllers/content/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <div class="dashboard-widgets">
2
-  <h4 class ='dashboard-widgets-welcome'>Добро Пожаловать в панель управления<?= class_exists('\Users\User') ? ', ' . \Users\User::$cur->name() : ''; ?></h4>
2
+  <h4 class ='dashboard-widgets-welcome'>Добро Пожаловать в панель управления<?= class_exists('\Users\User') ? ', '.\Users\User::$cur->name() : ''; ?></h4>
3 3
   <div class = "row">
4 4
     <?php
5 5
     $rowSum = 0;
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
         }
10 10
 
11 11
         $widgetSize = !empty($section['size']) ? $section['size'] : 1;
12
-        $rowSum+=$widgetSize;
12
+        $rowSum += $widgetSize;
13 13
         ?>
14 14
         <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div>
15 15
         <?php
Please login to merge, or discard this patch.
system/modules/View/appAdminControllers/content/template/chooseFile.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@
 block discarded – undo
3 3
 <hr/>
4 4
 <?php
5 5
 foreach ($template->config['css'] as $file) {
6
-    if (file_exists($template->path . '/css/' . $file)) {
6
+    if (file_exists($template->path.'/css/'.$file)) {
7 7
         ?>
8
-        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>
8
+        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/'.$file; ?>'><?= $file; ?></a>
9 9
         <?php
10 10
     }
11 11
 }
Please login to merge, or discard this patch.
system/modules/View/appAdminControllers/TemplateController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,15 +22,15 @@
 block discarded – undo
22 22
     function editFileAction($templateName)
23 23
     {
24 24
         $template = \View\Template::get($templateName, \App::$primary);
25
-        if (!empty($_GET['path']) && file_exists($template->path . '/' . Tools::parsePath($_GET['path']))) {
25
+        if (!empty($_GET['path']) && file_exists($template->path.'/'.Tools::parsePath($_GET['path']))) {
26 26
             $code = file_get_contents("php://input");
27 27
             if (!empty($code)) {
28 28
                 $result = new Server\Result();
29 29
                 $result->successMsg = 'Файл сохранен';
30
-                $content = file_put_contents($template->path . '/' . Tools::parsePath($_GET['path']), $code);
30
+                $content = file_put_contents($template->path.'/'.Tools::parsePath($_GET['path']), $code);
31 31
                 $result->send();
32 32
             }
33
-            $content = file_get_contents($template->path . '/' . Tools::parsePath($_GET['path']));
33
+            $content = file_get_contents($template->path.'/'.Tools::parsePath($_GET['path']));
34 34
             $this->libs->loadLib('Ace');
35 35
             $this->view->page(['content' => 'template/edit', 'data' => compact('template', 'content')]);
36 36
         } else {
Please login to merge, or discard this patch.