injitools / cms-Inji

system/modules/Ui/objects/DataManager/Action/Delete.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 

     public static function rowButton($dataManager, $item, $params, $actionParams)

     {

-        return '<a href ="#" onclick=\'inji.Ui.dataManagers.get(this).delRow(' . $item->pk() . ');

+        return '<a href ="#" onclick=\'inji.Ui.dataManagers.get(this).delRow('.$item->pk().');

                                       return false;\'><i class="glyphicon glyphicon-remove"></i></a>';

     }

 

@@ -31,7 +31,7 @@ 
             $model->delete();

         }

         $count = count($models);

-        return 'Удалено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['запись', 'записи', 'записей']);

+        return 'Удалено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['запись', 'записи', 'записей']);

     }

 

 }

system/modules/UserForms/widgets/userForm.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     echo "<p class = 'text-center'>{$userForm->description}</p>";

 }

 foreach ($userForm->inputs(['order' => ['weight']]) as $input) {

-    $form->input($input->type, 'UserForms[' . (int) $form_id . '][input' . $input->id . ']', $input->label, ['required' => $input->required]);

+    $form->input($input->type, 'UserForms['.(int) $form_id.'][input'.$input->id.']', $input->label, ['required' => $input->required]);

 }

 ?>

 <button class = 'btn btn-success btn-block'>Отправить</button>

system/modules/UserForms/widgets/formData.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 $inputs = json_decode($params[0]->fr_data, true);
 foreach ($params[0]->form->inputs as $input) {
-    if (isset($inputs['input' . $input->fi_id])) {
-        echo "{$input->fi_label}: " . htmlspecialchars($inputs['input' . $input->fi_id]) . "<br />";
+    if (isset($inputs['input'.$input->fi_id])) {
+        echo "{$input->fi_label}: ".htmlspecialchars($inputs['input'.$input->fi_id])."<br />";
     }
 }

system/modules/Ecommerce/models/Card/Item.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
     public function name()
     {
-        return $this->code ? $this->code : $this->id . ' - ' . $this->user->name();
+        return $this->code ? $this->code : $this->id.' - '.$this->user->name();
     }
 
 }

system/modules/Ecommerce/models/Item.php

Spacing +6 added lines, -6 removed lines

@@ -112,17 +112,17 @@ 
     {
 
         if ($this->id) {
-            $this->search_index = $this->name . ' ';
+            $this->search_index = $this->name.' ';
             if ($this->category) {
-                $this->search_index .= $this->category->name . ' ';
+                $this->search_index .= $this->category->name.' ';
             }
             if ($this->options) {
                 foreach ($this->options as $option) {
                     if ($option->item_option_searchable && $option->value) {
                         if ($option->item_option_type != 'select') {
-                            $this->search_index .= $option->value . ' ';
+                            $this->search_index .= $option->value.' ';
                         } elseif (!empty($option->option->items[$option->value])) {
-                            $option->option->items[$option->value]->value . ' ';
+                            $option->option->items[$option->value]->value.' ';
                         }
                     }
                 }
@@ -144,7 +144,7 @@ 
                 'col' => 'item_id',
                 //'resultKey' => 'code',
                 'resultKey' => 'item_option_id',
-                'join' => [Item\Option::table(), Item\Option::index() . ' = ' . Item\Param::colPrefix() . Item\Option::index()]
+                'join' => [Item\Option::table(), Item\Option::index().' = '.Item\Param::colPrefix().Item\Option::index()]
             ],
             'offers' => [
                 'type' => 'many',
@@ -181,7 +181,7 @@ 
                 $curPrice = $price;
             } elseif (
                     (!$price->type->roles && !$curPrice) ||
-                    ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false)
+                    ($price->type->roles && !$curPrice && strpos($price->type->roles, "|".\Users\User::$cur->role_id."|") !== false)
             ) {
                 $curPrice = $price;
             }

system/modules/Ecommerce/models/Cart/Item.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                     $event->save();
                 }
                 if ($cur->count != $this->count) {
-                    $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 4, 'info' => $this->item_offer_price_id . "|" . ($this->count - $cur->count)]);
+                    $event = new Event(['cart_id' => $this->cart->cart_id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 4, 'info' => $this->item_offer_price_id."|".($this->count - $cur->count)]);
                     $event->save();
                 }
             }

system/modules/Ecommerce/models/Item/Offer.php

Spacing +10 added lines, -10 removed lines

@@ -78,12 +78,12 @@ 
     {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count +=(float) $count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count +=(float) $count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }
@@ -91,19 +91,19 @@ 
 
     public function warehouseCount($cart_id = 0)
     {
-        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count),0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Item\Offer\Warehouse::colPrefix().'count),0) as `sum` ';
         $warehouse = \App::$cur->db->select(\Ecommerce\Item\Offer\Warehouse::table())->fetch();
 
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0) as `sum` ';
-        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Warehouse\Block::colPrefix().'count) ,0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
         if ($cart_id) {
-            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int) $cart_id, '!=');
+            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index(), (int) $cart_id, '!=');
         }
         $on = '
-            ' . \Ecommerce\Cart::index() . ' = ' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
-            (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) || 
-            (`' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+            ' . \Ecommerce\Cart::index().' = '.\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index().' AND (
+            (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) || 
+            (`' . \Ecommerce\Cart::colPrefix().'cart_status_id` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
         ';
         \App::$cur->db->join(\Ecommerce\Cart::table(), $on, 'inner');

system/modules/Ecommerce/appAdminControllers/EcommerceController.php

Spacing +2 added lines, -2 removed lines

@@ -74,8 +74,8 @@
                 unset($items[$key]);
                 unset($item);
             }
-            echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
-            Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+            echo 'Происходит процесс индексации: проиндексировано '.$i * $count;
+            Tools::redirect('/admin/ecommerce/reSearchIndex/'.$i);
         }
     }
 

system/modules/Ecommerce/widgets/admin/contacts.php

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
                         "mode": "",
                         "all": false,
                         "relation": "infos"}
-              )'><?= $count . ' ' . Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']); ?></a>
+              )'><?= $count.' '.Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']); ?></a>
     <?php
 } else {
     foreach ($item->infos as $info) {
-        echo $info->value . ' ';
+        echo $info->value.' ';
     }
 }
 ?>
\ No newline at end of file