injitools / cms-Inji

system/modules/Migrations/objects/Parser/Object/Value.php

Indentation +30 added lines, -30 removed lines

@@ -13,85 +13,85 @@
 
 class Value extends \Migrations\Parser {
 
-  public function parse() {
+    public function parse() {
     $options = $this->param->options ? json_decode($this->param->options, true) : [];
     $modelName = get_class($this->model);
     $cols = $modelName::$cols;
     $value = $this->data;
     if (is_array($value)) {
-      $value = '';
+        $value = '';
     }
     if (!empty($cols[$this->param->value])) {
-      $col = $cols[$this->param->value];
-      if ($col['type'] == 'dynamicType') {
+        $col = $cols[$this->param->value];
+        if ($col['type'] == 'dynamicType') {
         switch ($col['typeSource']) {
-          case'selfMethod':
+            case'selfMethod':
             $type = $this->model->{$col['selfMethod']}();
             if (is_array($type)) {
-              if (strpos($type['relation'], ':')) {
+                if (strpos($type['relation'], ':')) {
                 $relationPath = explode(':', $type['relation']);
                 $relationName = array_pop($relationPath);
                 $item = $this->model;
                 foreach ($relationPath as $path) {
-                  $item = $item->$path;
+                    $item = $item->$path;
                 }
                 $itemModel = get_class($item);
                 $relation = $itemModel::getRelation($relationName);
                 $sourceModel = $relation['model'];
-              } else {
+                } else {
                 $relation = $modelName::getRelation($type['relation']);
                 $sourceModel = $relation['model'];
-              }
-              $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel);
-              if ($objectId) {
+                }
+                $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel);
+                if ($objectId) {
                 $value = $objectId->object_id;
-              }
+                }
             }
             break;
         }
-      } else {
+        } else {
         $type = $col['type'];
-      }
+        }
     } else {
-      $type = 'text';
+        $type = 'text';
     }
 
     if (!empty($options['valueReplace'])) {
-      $values = $this->param->values(['key' => 'original']);
-      if (empty($values[$value])) {
+        $values = $this->param->values(['key' => 'original']);
+        if (empty($values[$value])) {
         $valueObject = new \Migrations\Migration\Object\Param\Value();
         $valueObject->param_id = $this->param->id;
         $valueObject->original = $value;
         $valueObject->save();
-      } else {
+        } else {
         $valueObject = $values[$value];
-      }
-      $value = $valueObject->replace;
+        }
+        $value = $valueObject->replace;
     }
     switch ($type) {
-      case 'image':
+        case 'image':
         $notEq = true;
         $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
         if ($this->model->{$this->param->value}) {
-          $file = \Files\File::get($this->model->{$this->param->value});
-          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)) {
+            $file = \Files\File::get($this->model->{$this->param->value});
+            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)) {
             $notEq = false;
-          }
-          if ($file && $notEq) {
+            }
+            if ($file && $notEq) {
             $file->delete();
             $this->model->{$this->param->value} = 0;
-          }
+            }
         }
         if ($notEq) {
-          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+            $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         }
         break;
-      default:
+        default:
         if (is_array($value)) {
-          $value = implode(' ', $value);
+            $value = implode(' ', $value);
         }
         $this->model->{$this->param->value} = $value;
     }
-  }
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
         $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
         if ($this->model->{$this->param->value}) {
           $file = \Files\File::get($this->model->{$this->param->value});
-          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)) {
+          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)) {
             $notEq = false;
           }
           if ($file && $notEq) {
@@ -83,7 +83,7 @@ 
           }
         }
         if ($notEq) {
-          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         }
         break;
       default:

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

Indentation +61 added lines, -61 removed lines

@@ -13,63 +13,63 @@ 
 
 class Option extends \Model {
 
-  public static $objectName = 'Свойство';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'filter_name' => ['type' => 'text'],
-      'image_file_id' => ['type' => 'image'],
-      'code' => ['type' => 'text'],
-      'type' => ['type' => 'text'],
-      'postfix' => ['type' => 'text'],
-      'default_val' => ['type' => 'text'],
-      'view' => ['type' => 'bool'],
-      'searchable' => ['type' => 'bool'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'advance' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'item' => ['type' => 'dataManager', 'relation' => 'items'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'filter_name' => 'Название в фильтре',
-      'image_file_id' => 'Иконка',
-      'code' => 'Код',
-      'type' => 'Тип',
-      'postfix' => 'Постфикс',
-      'default_val' => 'Значение по умолчанию',
-      'view' => 'Отображается',
-      'searchable' => 'Используется при поиске',
-      'weight' => 'Вес сортировки',
-      'advance' => 'Дополнительные параметры',
-      'user_id' => 'Создатель',
-      'date_create' => 'Дата создания',
-      'item' => 'Значения для списка'
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Свойства товаров',
-          'cols' => [
-              'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
-          ]
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'filter_name'],
-              ['code', 'type', 'image_file_id'],
-              ['default_val', 'postfix'],
-              ['view', 'searchable'],
-              ['item']
-          ]
-      ]
-  ];
+    public static $objectName = 'Свойство';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'filter_name' => ['type' => 'text'],
+        'image_file_id' => ['type' => 'image'],
+        'code' => ['type' => 'text'],
+        'type' => ['type' => 'text'],
+        'postfix' => ['type' => 'text'],
+        'default_val' => ['type' => 'text'],
+        'view' => ['type' => 'bool'],
+        'searchable' => ['type' => 'bool'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'advance' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'item' => ['type' => 'dataManager', 'relation' => 'items'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'filter_name' => 'Название в фильтре',
+        'image_file_id' => 'Иконка',
+        'code' => 'Код',
+        'type' => 'Тип',
+        'postfix' => 'Постфикс',
+        'default_val' => 'Значение по умолчанию',
+        'view' => 'Отображается',
+        'searchable' => 'Используется при поиске',
+        'weight' => 'Вес сортировки',
+        'advance' => 'Дополнительные параметры',
+        'user_id' => 'Создатель',
+        'date_create' => 'Дата создания',
+        'item' => 'Значения для списка'
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Свойства товаров',
+            'cols' => [
+                'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
+            ]
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'filter_name'],
+                ['code', 'type', 'image_file_id'],
+                ['default_val', 'postfix'],
+                ['view', 'searchable'],
+                ['item']
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'user' => [
             'model' => 'Users\User',
@@ -85,15 +85,15 @@ 
             'col' => 'image_file_id'
         ],
     ];
-  }
+    }
 
-  public function beforeSave() {
+    public function beforeSave() {
     if (!isset($this->id)) {
-      $this->user_id = \Users\User::$cur->id;
+        $this->user_id = \Users\User::$cur->id;
     }
     if ($this->advance && is_array($this->advance)) {
-      $this->advance = json_encode($this->advance);
+        $this->advance = json_encode($this->advance);
+    }
     }
-  }
 
 }

system/modules/Ecommerce/Ecommerce.php

Spacing +45 added lines, -45 removed lines

@@ -48,7 +48,7 @@ 
     $name = '';
     foreach ($fields as $field) {
       if ($field->save && !empty($data[$field->id])) {
-        $name .= htmlspecialchars($data[$field->id]) . ' ';
+        $name .= htmlspecialchars($data[$field->id]).' ';
       }
     }
     $name = trim($name);
@@ -104,7 +104,7 @@ 
     $name = '';
     foreach ($fields as $field) {
       if ($field->save && !empty($data[$field->id])) {
-        $name .= htmlspecialchars($data[$field->id]) . ' ';
+        $name .= htmlspecialchars($data[$field->id]).' ';
       }
     }
     $name = trim($name);
@@ -189,7 +189,7 @@ 
       foreach ($options['sort'] as $col => $direction) {
         switch ($col) {
           case 'price':
-            $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
+            $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
           case 'name':
             $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
@@ -208,22 +208,22 @@ 
       $selectOptions['where'][] = ['image_file_id', 0, '!='];
     }
 
-    $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
+    $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index().' = '.Ecommerce\Item\Offer::colPrefix().Ecommerce\Item::index(), 'inner'];
 
     $selectOptions['join'][] = [Ecommerce\Item\Offer\Price::table(),
-        Ecommerce\Item\Offer::index() . ' = ' . Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer::index() .
-        (empty($this->config['show_zero_price']) ? ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0' : ''),
+        Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().
+        (empty($this->config['show_zero_price']) ? ' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0' : ''),
         empty($this->config['show_without_price']) ? 'inner' : 'left'];
 
     $selectOptions['join'][] = [
-        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index() . ' = ' . Ecommerce\Item\Offer\Price\Type::index()
+        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index()
     ];
 
     $selectOptions['where'][] = [
         [Ecommerce\Item\Offer\Price\Type::index(), NULL, 'is'],
         [
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'],
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'],
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '', '=', 'OR'],
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '%|'.\Users\User::$cur->role_id.'|%', 'LIKE', 'OR'],
         ],
     ];
 
@@ -231,10 +231,10 @@ 
     if (!empty($this->config['view_filter'])) {
       if (!empty($this->config['view_filter']['options'])) {
         foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
-          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-              'inner', 'option' . $optionId];
+          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+              'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+              'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
+              'inner', 'option'.$optionId];
         }
       }
     }
@@ -244,10 +244,10 @@ 
         switch ($col) {
           case 'price':
             if (!empty($filter['min'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
+              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['min'], '>='];
             }
             if (!empty($filter['max'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
+              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['max'], '<='];
             }
             break;
           case 'options':
@@ -258,14 +258,14 @@ 
                 foreach ($optionValue as $val) {
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
               } else {
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
               }
-              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
-                  'inner', 'option' . $optionId];
+              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+                  'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+                  'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value '.$qstr.'',
+                  'inner', 'option'.$optionId];
             }
             break;
           case 'offerOptions':
@@ -277,14 +277,14 @@ 
                 foreach ($optionValue as $val) {
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
               } else {
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
               }
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
-                  'inner', 'offerOption' . $optionId];
+              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index().' = '.'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer::index().' AND '.
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer\Option::index().' = "'.(int) $optionId.'" AND '.
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().'value '.$qstr,
+                  'inner', 'offerOption'.$optionId];
             }
             break;
         }
@@ -299,13 +299,13 @@ 
           continue;
         }
         $category = \Ecommerce\Category::get($categoryId);
-        $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
+        $where[] = ['tree_path', $category->tree_path.(int) $categoryId.'/%', 'LIKE', $first ? 'AND' : 'OR'];
         $first = false;
       }
       $selectOptions['where'][] = $where;
     } elseif (!empty($options['parent'])) {
       $category = \Ecommerce\Category::get($options['parent']);
-      $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+      $selectOptions['where'][] = ['tree_path', $category->tree_path.(int) $options['parent'].'/%', 'LIKE'];
     }
 
     //search
@@ -315,7 +315,7 @@ 
       foreach (explode(' ', $searchStr) as $part) {
         $part = trim($part);
         if ($part && strlen($part) > 2) {
-          $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+          $searchArr[] = ['search_index', '%'.$part.'%', 'LIKE'];
         }
       }
       if (!empty($searchArr)) {
@@ -334,19 +334,19 @@ 
       }
       $selectOptions['where'][] = [
           '(
-          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
-            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
-                ' . ($warehouseIds ? ' AND iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index() . ' IN(' . implode(',', $warehouseIds) . ')' : '') . '
+          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix().'count`),0) 
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Item\Offer\Warehouse::table().' iciw 
+            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().'
+                ' . ($warehouseIds ? ' AND iciw.'.\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index().' IN('.implode(',', $warehouseIds).')' : '').'
             )
           -
-          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0)
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Warehouse\Block::table() . ' iewb
-            inner JOIN ' . \App::$cur->db->table_prefix . \Ecommerce\Cart::table() . ' icc ON icc.' . \Ecommerce\Cart::index() . ' = iewb.' . \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() . \Ecommerce\Cart\Status::index() . '` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix().'count) ,0)
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Warehouse\Block::table().' iewb
+            inner JOIN ' . \App::$cur->db->table_prefix.\Ecommerce\Cart::table().' icc ON icc.'.\Ecommerce\Cart::index().' = iewb.'.\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().\Ecommerce\Cart\Status::index().'` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
-            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
+            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().')
           )',
           0,
           '>'
@@ -374,7 +374,7 @@ 
     $items = Ecommerce\Item::getList($selectOptions);
     $items = Ecommerce\Item\Param::getList([
                 'where' => ['item_id', array_keys($items), 'IN'],
-                'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index() . ' = ' . \Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' and ' . \Ecommerce\Item\Option::colPrefix() . 'searchable = 1', 'inner']],
+                'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index().' = '.\Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' and '.\Ecommerce\Item\Option::colPrefix().'searchable = 1', 'inner']],
                 'distinct' => \Ecommerce\Item\Option::index()
     ]);
     return $items;
@@ -405,7 +405,7 @@ 
     if (is_array($counts)) {
       $sum = 0;
       foreach ($counts as $count) {
-        $sum +=$count['count'];
+        $sum += $count['count'];
       }
       return $sum;
     }
@@ -439,7 +439,7 @@ 
 
     if (!empty($conf['files']['aditionTemplateFiels'])) {
       foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-        $return[$file['file']] = '- ' . $file['name'];
+        $return[$file['file']] = '- '.$file['name'];
       }
     }
     return $return;
@@ -513,7 +513,7 @@ 
       $map[] = [
           'name' => $item->name,
           'url' => [
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
           ],
       ];
     }
@@ -526,7 +526,7 @@ 
         $map[] = [
             'name' => $item->name,
             'url' => [
-                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
             ],
         ];
       }

Indentation +238 added lines, -238 removed lines

@@ -10,172 +10,172 @@ 
  */
 class Ecommerce extends Module {
 
-  public function init() {
+    public function init() {
     App::$primary->view->customAsset('js', '/moduleAsset/Ecommerce/js/cart.js');
-  }
+    }
 
-  public function getPayTypeHandlers($forSelect = false) {
+    public function getPayTypeHandlers($forSelect = false) {
     if (!$forSelect) {
-      return $this->getSnippets('payTypeHandler');
+        return $this->getSnippets('payTypeHandler');
     }
     $handlers = ['' => 'Не выбрано'];
     foreach ($this->getSnippets('payTypeHandler') as $key => $handler) {
-      if (empty($handler)) {
+        if (empty($handler)) {
         continue;
-      }
-      $handlers[$key] = $handler['name'];
+        }
+        $handlers[$key] = $handler['name'];
     }
     return $handlers;
-  }
+    }
 
-  public function cartPayRecive($data) {
+    public function cartPayRecive($data) {
     $cart = Ecommerce\Cart::get($data['pay']->data);
     if ($cart) {
-      $payed = true;
-      foreach ($cart->pays as $pay) {
+        $payed = true;
+        foreach ($cart->pays as $pay) {
         if ($pay->pay_status_id != 2) {
-          $payed = false;
-          break;
+            $payed = false;
+            break;
         }
-      }
-      $cart->payed = $payed;
-      $cart->save();
+        }
+        $cart->payed = $payed;
+        $cart->save();
+    }
     }
-  }
 
-  public function parseFields($data, $cart) {
+    public function parseFields($data, $cart) {
     $fields = \Ecommerce\UserAdds\Field::getList();
     $name = '';
     foreach ($fields as $field) {
-      if ($field->save && !empty($data[$field->id])) {
+        if ($field->save && !empty($data[$field->id])) {
         $name .= htmlspecialchars($data[$field->id]) . ' ';
-      }
+        }
     }
     $name = trim($name);
 
     $userAdds = Ecommerce\UserAdds::get([['user_id', $cart->user->id], ['name', $name]]);
     if (!$userAdds) {
-      $userAdds = new Ecommerce\UserAdds();
-      $userAdds->user_id = $cart->user->id;
-      $userAdds->name = $name;
-      $userAdds->save();
-      foreach ($fields as $field) {
+        $userAdds = new Ecommerce\UserAdds();
+        $userAdds->user_id = $cart->user->id;
+        $userAdds->name = $name;
+        $userAdds->save();
+        foreach ($fields as $field) {
         if (!$field->save) {
-          continue;
+            continue;
         }
         $userAddsValue = new Ecommerce\UserAdds\Value();
         $userAddsValue->value = htmlspecialchars($data[$field->id]);
         $userAddsValue->useradds_field_id = $field->id;
         $userAddsValue->useradds_id = $userAdds->id;
         $userAddsValue->save();
-      }
+        }
     }
     $user = \Users\User::get($cart->user_id);
     foreach ($fields as $field) {
-      $info = new \Ecommerce\Cart\Info();
-      $info->name = $field->name;
-      $info->value = htmlspecialchars($data[$field->id]);
-      $info->useradds_field_id = $field->id;
-      $info->cart_id = $cart->id;
-      $info->save();
-      $relations = [];
-      if ($field->userfield) {
+        $info = new \Ecommerce\Cart\Info();
+        $info->name = $field->name;
+        $info->value = htmlspecialchars($data[$field->id]);
+        $info->useradds_field_id = $field->id;
+        $info->cart_id = $cart->id;
+        $info->save();
+        $relations = [];
+        if ($field->userfield) {
         if (strpos($field->userfield, ':')) {
-          $path = explode(':', $field->userfield);
-          if (!$user->{$path[0]}->{$path[1]}) {
+            $path = explode(':', $field->userfield);
+            if (!$user->{$path[0]}->{$path[1]}) {
             $user->{$path[0]}->{$path[1]} = $info->value;
             $relations[$path[0]] = $path[0];
-          }
+            }
         } else {
-          if (!$user->{$field->userfield}) {
+            if (!$user->{$field->userfield}) {
             $user->{$field->userfield} = $info->value;
-          }
+            }
         }
-      }
-      foreach ($relations as $rel) {
+        }
+        foreach ($relations as $rel) {
         $user->$rel->save();
-      }
-      $user->save();
+        }
+        $user->save();
     }
     return $userAdds;
-  }
+    }
 
-  public function parseDeliveryFields($data, $cart, $fields) {
+    public function parseDeliveryFields($data, $cart, $fields) {
     $name = '';
     foreach ($fields as $field) {
-      if ($field->save && !empty($data[$field->id])) {
+        if ($field->save && !empty($data[$field->id])) {
         $name .= htmlspecialchars($data[$field->id]) . ' ';
-      }
+        }
     }
     $name = trim($name);
 
     $save = Ecommerce\Delivery\Save::get([['user_id', $cart->user->id], ['name', $name]]);
     if (!$save) {
-      $save = new Ecommerce\Delivery\Save();
-      $save->user_id = $cart->user->id;
-      $save->name = $name;
-      $save->save();
-      foreach ($fields as $field) {
+        $save = new Ecommerce\Delivery\Save();
+        $save->user_id = $cart->user->id;
+        $save->name = $name;
+        $save->save();
+        foreach ($fields as $field) {
         if (!$field->save) {
-          continue;
+            continue;
         }
         $saveValue = new Ecommerce\Delivery\Value();
         $saveValue->value = htmlspecialchars($data[$field->id]);
         $saveValue->delivery_field_id = $field->id;
         $saveValue->delivery_save_id = $save->id;
         $saveValue->save();
-      }
+        }
     }
     $user = \Users\User::get($cart->user_id);
     foreach ($fields as $field) {
-      $info = new \Ecommerce\Cart\DeliveryInfo();
-      $info->name = $field->name;
-      $info->value = htmlspecialchars($data[$field->id]);
-      $info->delivery_field_id = $field->id;
-      $info->cart_id = $cart->id;
-      $info->save();
-      $relations = [];
-      if ($field->userfield) {
+        $info = new \Ecommerce\Cart\DeliveryInfo();
+        $info->name = $field->name;
+        $info->value = htmlspecialchars($data[$field->id]);
+        $info->delivery_field_id = $field->id;
+        $info->cart_id = $cart->id;
+        $info->save();
+        $relations = [];
+        if ($field->userfield) {
         if (strpos($field->userfield, ':')) {
-          $path = explode(':', $field->userfield);
-          if (!$user->{$path[0]}->{$path[1]}) {
+            $path = explode(':', $field->userfield);
+            if (!$user->{$path[0]}->{$path[1]}) {
             $user->{$path[0]}->{$path[1]} = $info->value;
             $relations[$path[0]] = $path[0];
-          }
+            }
         } else {
-          if (!$user->{$field->userfield}) {
+            if (!$user->{$field->userfield}) {
             $user->{$field->userfield} = $info->value;
-          }
+            }
         }
-      }
-      foreach ($relations as $rel) {
+        }
+        foreach ($relations as $rel) {
         $user->$rel->save();
-      }
-      $user->save();
+        }
+        $user->save();
     }
     return $save;
-  }
+    }
 
-  public function getCurCart($create = true) {
+    public function getCurCart($create = true) {
     $cart = false;
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']);
+        $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']);
     }
     if (!$cart && $create) {
-      $cart = new Ecommerce\Cart();
-      $cart->cart_status_id = 1;
-      $cart->user_id = Users\User::$cur->id;
-      $userCard = \Ecommerce\Card\Item::get(\Users\User::$cur->id, 'user_id');
-      if ($userCard) {
+        $cart = new Ecommerce\Cart();
+        $cart->cart_status_id = 1;
+        $cart->user_id = Users\User::$cur->id;
+        $userCard = \Ecommerce\Card\Item::get(\Users\User::$cur->id, 'user_id');
+        if ($userCard) {
         $cart->card_item_id = $userCard->id;
-      }
-      $cart->save();
-      $_SESSION['cart']['cart_id'] = $cart->id;
+        }
+        $cart->save();
+        $_SESSION['cart']['cart_id'] = $cart->id;
     }
     return $cart;
-  }
+    }
 
-  public function parseOptions($options = []) {
+    public function parseOptions($options = []) {
     $selectOptions = [
         'where' => !empty($options['where']) ? $options['where'] : [],
         'distinct' => false,
@@ -186,29 +186,29 @@ 
         'limit' => !empty($options['count']) ? (int) $options['count'] : 0,
     ];
     if (!empty($options['sort']) && is_array($options['sort'])) {
-      foreach ($options['sort'] as $col => $direction) {
+        foreach ($options['sort'] as $col => $direction) {
         switch ($col) {
-          case 'price':
+            case 'price':
             $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'name':
+            case 'name':
             $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'sales':
+            case 'sales':
             $selectOptions['order'][] = ['sales', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'weight':
+            case 'weight':
             $selectOptions['order'][] = ['weight', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'new':
+            case 'new':
             $selectOptions['order'][] = ['date_create', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
         }
-      }
+        }
     }
     $selectOptions['where'][] = ['deleted', 0];
     if (empty($this->config['view_empty_image'])) {
-      $selectOptions['where'][] = ['image_file_id', 0, '!='];
+        $selectOptions['where'][] = ['image_file_id', 0, '!='];
     }
 
     $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
@@ -232,111 +232,111 @@ 
 
 
     if (!empty($this->config['view_filter'])) {
-      if (!empty($this->config['view_filter']['options'])) {
+        if (!empty($this->config['view_filter']['options'])) {
         foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
-          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-              'inner', 'option' . $optionId];
+            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
+                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
+                'inner', 'option' . $optionId];
+        }
         }
-      }
     }
     //filters
     if (!empty($options['filters'])) {
-      foreach ($options['filters'] as $col => $filter) {
+        foreach ($options['filters'] as $col => $filter) {
         switch ($col) {
-          case 'price':
+            case 'price':
             if (!empty($filter['min'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
+                $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
             }
             if (!empty($filter['max'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
+                $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
             }
             break;
-          case 'options':
+            case 'options':
             foreach ($filter as $optionId => $optionValue) {
-              $optionId = (int) $optionId;
-              if (is_array($optionValue)) {
+                $optionId = (int) $optionId;
+                if (is_array($optionValue)) {
                 $optionValueArr = [];
                 foreach ($optionValue as $val) {
-                  $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
+                    $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-              } else {
+                } else {
                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
-              }
-              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
-                  'inner', 'option' . $optionId];
+                }
+                $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
+                    'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                    'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
+                    'inner', 'option' . $optionId];
             }
             break;
-          case 'offerOptions':
+            case 'offerOptions':
             //$selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = offer.' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'left', 'offer'];
             foreach ($filter as $optionId => $optionValue) {
-              $optionId = (int) $optionId;
-              if (is_array($optionValue)) {
+                $optionId = (int) $optionId;
+                if (is_array($optionValue)) {
                 $optionValueArr = [];
                 foreach ($optionValue as $val) {
-                  $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
+                    $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-              } else {
+                } else {
                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
-              }
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
-                  'inner', 'offerOption' . $optionId];
+                }
+                $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
+                    'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                    'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
+                    'inner', 'offerOption' . $optionId];
             }
             break;
         }
-      }
+        }
     }
     //parents
     if (!empty($options['parent']) && strpos($options['parent'], ',') !== false) {
-      $first = true;
-      $where = [];
-      foreach (explode(',', $options['parent']) as $categoryId) {
+        $first = true;
+        $where = [];
+        foreach (explode(',', $options['parent']) as $categoryId) {
         if (!$categoryId) {
-          continue;
+            continue;
         }
         $category = \Ecommerce\Category::get($categoryId);
         $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
         $first = false;
-      }
-      $selectOptions['where'][] = $where;
+        }
+        $selectOptions['where'][] = $where;
     } elseif (!empty($options['parent'])) {
-      $category = \Ecommerce\Category::get($options['parent']);
-      $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+        $category = \Ecommerce\Category::get($options['parent']);
+        $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
     }
 
     //search
     if (!empty($options['search'])) {
-      $searchStr = preg_replace('![^A-zА-я0-9 ]!iSu', ' ', $options['search']);
-      $searchArr = [];
-      foreach (explode(' ', $searchStr) as $part) {
+        $searchStr = preg_replace('![^A-zА-я0-9 ]!iSu', ' ', $options['search']);
+        $searchArr = [];
+        foreach (explode(' ', $searchStr) as $part) {
         $part = trim($part);
         if ($part && strlen($part) > 2) {
-          $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+            $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+        }
         }
-      }
-      if (!empty($searchArr)) {
+        if (!empty($searchArr)) {
         $selectOptions['where'][] = $searchArr;
-      }
+        }
     }
     if (empty($this->config['view_empty_warehouse'])) {
-      $warehouseIds = [];
-      if (App::$cur->geography && \Geography\City::$cur) {
+        $warehouseIds = [];
+        if (App::$cur->geography && \Geography\City::$cur) {
         $warehouses = \Geography\City\Data::get([['code', 'warehouses'], ['city_id', \Geography\City::$cur->id]]);
         if ($warehouses && $warehouses->data) {
-          foreach (explode(',', $warehouses->data) as $id) {
+            foreach (explode(',', $warehouses->data) as $id) {
             $warehouseIds[$id] = $id;
-          }
+            }
+        }
         }
-      }
-      $selectOptions['where'][] = [
-          '(
+        $selectOptions['where'][] = [
+            '(
           (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
             FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
             WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
@@ -351,28 +351,28 @@ 
             )
             WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
           )',
-          0,
-          '>'
-      ];
+            0,
+            '>'
+        ];
     }
 
     $selectOptions['group'] = Ecommerce\Item::index();
 
     return $selectOptions;
-  }
-
-  /**
-   * Getting items params with params
-   * 
-   * @param array $params
-   * @return array
-   */
-  public function getItemsParams($params = []) {
+    }
+
+    /**
+     * Getting items params with params
+     * 
+     * @param array $params
+     * @return array
+     */
+    public function getItemsParams($params = []) {
     $selectOptions = $this->parseOptions($params);
 
     $items = Ecommerce\Item::getList($selectOptions);
     if (!$items) {
-      return [];
+        return [];
     }
     $items = Ecommerce\Item\Param::getList([
                 'where' => ['item_id', array_keys($items), 'IN'],
@@ -380,58 +380,58 @@ 
                 'distinct' => \Ecommerce\Item\Option::index()
     ]);
     return $items;
-  }
-
-  /**
-   * Getting items with params
-   * 
-   * @param array $params
-   * @return array
-   */
-  public function getItems($params = []) {
+    }
+
+    /**
+     * Getting items with params
+     * 
+     * @param array $params
+     * @return array
+     */
+    public function getItems($params = []) {
     $selectOptions = $this->parseOptions($params);
     $items = Ecommerce\Item::getList($selectOptions);
     return $items;
-  }
-
-  /**
-   * Return count of items with params
-   * 
-   * @param array $params
-   * @return int
-   */
-  public function getItemsCount($params = []) {
+    }
+
+    /**
+     * Return count of items with params
+     * 
+     * @param array $params
+     * @return int
+     */
+    public function getItemsCount($params = []) {
     $selectOptions = $this->parseOptions($params);
     $selectOptions['distinct'] = \Ecommerce\Item::index();
     $counts = Ecommerce\Item::getCount($selectOptions);
     if (is_array($counts)) {
-      $sum = 0;
-      foreach ($counts as $count) {
+        $sum = 0;
+        foreach ($counts as $count) {
         $sum +=$count['count'];
-      }
-      return $sum;
+        }
+        return $sum;
     }
     return $counts;
-  }
+    }
 
-  public function viewsCategoryList($inherit = true) {
+    public function viewsCategoryList($inherit = true) {
     $return = [];
     if ($inherit) {
-      $return['inherit'] = 'Как у родителя';
+        $return['inherit'] = 'Как у родителя';
     }
     $return['itemList'] = 'Список товаров';
     $conf = App::$primary->view->template->config;
     if (!empty($conf['files']['modules']['Ecommerce'])) {
-      foreach ($conf['files']['modules']['Ecommerce'] as $file) {
+        foreach ($conf['files']['modules']['Ecommerce'] as $file) {
         if ($file['type'] == 'Category') {
-          $return[$file['file']] = $file['name'];
+            $return[$file['file']] = $file['name'];
+        }
         }
-      }
     }
     return $return;
-  }
+    }
 
-  public function templatesCategoryList() {
+    public function templatesCategoryList() {
     $return = [
         'inherit' => 'Как у родителя',
         'current' => 'Текущая тема'
@@ -440,107 +440,107 @@ 
     $conf = App::$primary->view->template->config;
 
     if (!empty($conf['files']['aditionTemplateFiels'])) {
-      foreach ($conf['files']['aditionTemplateFiels'] as $file) {
+        foreach ($conf['files']['aditionTemplateFiels'] as $file) {
         $return[$file['file']] = '- ' . $file['name'];
-      }
+        }
     }
     return $return;
-  }
+    }
 
-  public function cartStatusDetector($event) {
+    public function cartStatusDetector($event) {
     $cart = $event['eventObject'];
     if (!empty($cart->_changedParams['cart_cart_status_id'])) {
-      $cart->date_status = date('Y-m-d H:i:s');
-      $event = new Ecommerce\Cart\Event(['cart_id' => $cart->id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 5, 'info' => $cart->cart_status_id]);
-      $event->save();
+        $cart->date_status = date('Y-m-d H:i:s');
+        $event = new Ecommerce\Cart\Event(['cart_id' => $cart->id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 5, 'info' => $cart->cart_status_id]);
+        $event->save();
 
-      $prev_status_id = $cart->_changedParams['cart_cart_status_id'];
-      $now_status_id = $cart->cart_status_id;
+        $prev_status_id = $cart->_changedParams['cart_cart_status_id'];
+        $now_status_id = $cart->cart_status_id;
 
-      $status = Ecommerce\Cart\Status::getList(['where' => ['id', implode(',', [$prev_status_id, $now_status_id]), 'IN']]);
+        $status = Ecommerce\Cart\Status::getList(['where' => ['id', implode(',', [$prev_status_id, $now_status_id]), 'IN']]);
 
-      $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
-      \App::$cur->users->AddUserActivity($cart->user_id, 3, "Статус вашего заказа номер {$prefix}{$cart->id} изменился с {$status[$prev_status_id]->name} на {$status[$now_status_id]->name}");
+        $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
+        \App::$cur->users->AddUserActivity($cart->user_id, 3, "Статус вашего заказа номер {$prefix}{$cart->id} изменился с {$status[$prev_status_id]->name} на {$status[$now_status_id]->name}");
 
-      if ($cart->cart_status_id == 5) {
+        if ($cart->cart_status_id == 5) {
         Inji::$inst->event('ecommerceCartClosed', $cart);
-      }
+        }
     }
     return $cart;
-  }
+    }
 
-  public function cardTrigger($event) {
+    public function cardTrigger($event) {
     $cart = $event['eventObject'];
     if ($cart->card) {
-      $sum = 0;
-      foreach ($cart->cartItems as $cartItem) {
+        $sum = 0;
+        foreach ($cart->cartItems as $cartItem) {
         $sum += $cartItem->final_price * $cartItem->count;
-      }
-      $cardItemHistory = new Ecommerce\Card\Item\History();
-      $cardItemHistory->amount = $sum;
-      $cardItemHistory->card_item_id = $cart->card_item_id;
-      $cardItemHistory->save();
-      $cart->card->sum += $sum;
-      $cart->card->save();
+        }
+        $cardItemHistory = new Ecommerce\Card\Item\History();
+        $cardItemHistory->amount = $sum;
+        $cardItemHistory->card_item_id = $cart->card_item_id;
+        $cardItemHistory->save();
+        $cart->card->sum += $sum;
+        $cart->card->save();
     }
     return $cart;
-  }
+    }
 
-  public function bonusTrigger($event) {
+    public function bonusTrigger($event) {
     $cart = $event['eventObject'];
     foreach ($cart->cartItems as $cartItem) {
-      foreach ($cartItem->price->offer->bonuses as $bonus) {
+        foreach ($cartItem->price->offer->bonuses as $bonus) {
         if ($bonus->limited && $bonus->left <= 0) {
-          continue;
+            continue;
         } elseif ($bonus->limited && $bonus->left > 0) {
-          $bonus->left -= 1;
-          $bonus->save();
+            $bonus->left -= 1;
+            $bonus->save();
         }
         switch ($bonus->type) {
-          case'currency':
+            case'currency':
             $currency = \Money\Currency::get($bonus->value);
             $wallets = App::$cur->money->getUserWallets($cart->user->id);
             $wallets[$currency->id]->diff($bonus->count, 'Бонус за покупку');
             break;
         }
-      }
+        }
     }
     return $cart;
-  }
+    }
 
-  function sitemap() {
+    function sitemap() {
     $map = [];
     $zeroItems = \Ecommerce\Item::getList(['where' => ['category_id', 0]]);
     foreach ($zeroItems as $item) {
-      $map[] = [
-          'name' => $item->name,
-          'url' => [
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
-          ],
-      ];
+        $map[] = [
+            'name' => $item->name,
+            'url' => [
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+            ],
+        ];
     }
 
     $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
     $scan = function($category, $scan) {
-      $map = [];
+        $map = [];
 
-      foreach ($category->items as $item) {
+        foreach ($category->items as $item) {
         $map[] = [
             'name' => $item->name,
             'url' => [
                 'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
             ],
         ];
-      }
-      foreach ($category->catalogs as $child) {
+        }
+        foreach ($category->catalogs as $child) {
         $map = array_merge($map, $scan($child, $scan));
-      }
-      return $map;
+        }
+        return $map;
     };
     foreach ($categorys as $category) {
-      $map = array_merge($map, $scan($category, $scan));
+        $map = array_merge($map, $scan($category, $scan));
     }
     return $map;
-  }
+    }
 
 }

system/modules/Ui/widgets/DataManager/DataManager.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
     'id' => $dataManager->managerId,
     'class' => 'dataManager',
     'data-params' => $params,
-    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName) . ($model && $model->pk() ? ':' . $model->pk() : ''),
+    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName).($model && $model->pk() ? ':'.$model->pk() : ''),
     'data-managername' => $dataManager->managerName,
     'data-cols' => $dataManager->cols,
     'data-options' => array_merge($dataManager->managerOptions, ['actions'=>$dataManager->getActions()])
@@ -22,7 +22,7 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-  $mainCol['style'].='margin-left:260px;';
+  $mainCol['style'] .= 'margin-left:260px;';
   echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
   $this->widget('Ui\DataManager/categorys', compact('dataManager'));
   echo '</div>';

Indentation +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
         ], '', true);
 $buttons = $dataManager->getButtons($params, $model);
 if ($buttons) {
-  ?>
+    ?>
   <h3 class="dataManager-title"><?= $dataManager->name; ?> 
     <div class ='pull-right dataManager-managerButtons'>
       <div class="btn-group">
@@ -26,13 +26,13 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-  $mainCol['style'].='margin-left:260px;';
-  echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
-  $this->widget('Ui\DataManager/categorys', compact('dataManager'));
-  echo '</div>';
+    $mainCol['style'].='margin-left:260px;';
+    echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
+    $this->widget('Ui\DataManager/categorys', compact('dataManager'));
+    echo '</div>';
 }
 if (!empty($dataManager->managerOptions['filters'])) {
-  ?>
+    ?>
   <div class="modal fade" id = "<?= $dataManager->managerId; ?>_filters" >
     <div class="modal-dialog modal-lg">
       <div class="modal-content">

system/modules/Ui/objects/ActiveForm/Input/Select.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     if (!empty($modelName)) {
       $inputOptions['createBtn'] = [
           'text' => 'Создать элемент',
-          'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+          'onclick' => 'inji.Ui.forms.popUp(\''.addslashes($modelName).'\',{},function(elem){'
           . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this))'
       ];
     }

Indentation +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 
 class Select extends \Ui\ActiveForm\Input {
 
-  public function draw() {
+    public function draw() {
     $inputName = $this->colName();
     $inputLabel = $this->colLabel();
     $inputParams = $this->colParams;
@@ -25,41 +25,41 @@ 
     ];
     $modelName = '';
     switch ($inputParams['source']) {
-      case 'model':
+        case 'model':
         $modelName = $inputParams['model'];
         break;
-      case 'relation':
+        case 'relation':
         if ($this->activeForm->modelName) {
-          $itemModelName = $this->activeForm->modelName;
-          $relation = $itemModelName::getRelation($inputParams['relation']);
-          if ($relation['model'] && class_exists($relation['model'])) {
+            $itemModelName = $this->activeForm->modelName;
+            $relation = $itemModelName::getRelation($inputParams['relation']);
+            if ($relation['model'] && class_exists($relation['model'])) {
             $modelName = $relation['model'];
-          }
+            }
         }
     }
     if (!empty($modelName)) {
-      $inputOptions['createBtn'] = [
-          'text' => 'Создать',
-          'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
-          . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;'
-      ];
+        $inputOptions['createBtn'] = [
+            'text' => 'Создать',
+            'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+            . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;'
+        ];
     }
     if (!empty($inputOptions['values'][$this->activeForm->model->{$this->colName}]) &&
             is_array($inputOptions['values'][$this->activeForm->model->{$this->colName}]) &&
             !empty($inputOptions['values'][$this->activeForm->model->{$this->colName}]['input'])) {
-      $aditionalCol = $inputOptions['values'][$this->activeForm->model->{$this->colName}]['input']['name'];
-      $inputOptions['aditionalValue'] = $this->activeForm->model->$aditionalCol;
+        $aditionalCol = $inputOptions['values'][$this->activeForm->model->{$this->colName}]['input']['name'];
+        $inputOptions['aditionalValue'] = $this->activeForm->model->$aditionalCol;
     }
 
     $preset = $this->preset();
 
     if ($preset !== null) {
-      $inputOptions['disabled'] = true;
-      $this->form->input('hidden', $inputName, '', $inputOptions);
-      return true;
+        $inputOptions['disabled'] = true;
+        $this->form->input('hidden', $inputName, '', $inputOptions);
+        return true;
     }
     $this->form->input('select', $inputName, $inputLabel, $inputOptions);
     return true;
-  }
+    }
 
 }

system/modules/Users/appControllers/content/registration.php

Indentation +5 added lines, -5 removed lines

@@ -6,12 +6,12 @@ 
         <?php
         $socials = Users\Social::getList(['where' => ['active', 1]]);
         if ($socials) {
-          ?>
+            ?>
           <div class="form-group">
             <label>Регистрация через соц.сети</label><br />
             <?php
             foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-              echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> ";
+                echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> ";
             }
             ?>
           </div>
@@ -41,15 +41,15 @@ 
           <div class ='row'>
             <div class="col-sm-6">
               <?php
-              if (!empty(App::$cur->users->config['invites'])) {
+                if (!empty(App::$cur->users->config['invites'])) {
                 ?>
                 <div class ='form-group'>
                   <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label>
                   <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" />
                 </div>   
                 <?php
-              }
-              ?>
+                }
+                ?>
             </div>
           </div>
           <div class ='form-group'>

system/modules/Ecommerce/widgets/filters.php

Indentation +14 added lines, -14 removed lines

@@ -4,7 +4,7 @@ 
     $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()) {
-      ?>
+        ?>
       <h4>Фильтр по цене</h4>
       <div class="form-group">      
         <div class="row">
@@ -15,28 +15,28 @@ 
       <?php
     }
     foreach ($options as $option) {
-      ?>
+        ?>
       <div class="filter">  
 
         <?php
         switch ($option->type) {
-          case 'radio':
+            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,
-                  ]
-              ]);
+                $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':
+            case 'select':
             echo "<label>{$option->name}</label>";
             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' : ''; ?>>
@@ -46,7 +46,7 @@ 
               <?php
             }
             break;
-          default:
+            default:
             $this->widget('Ui\Form/' . ($option->type ? $option->type : 'text'), [
                 'label' => $option->name,
                 'name' => "filters[options][{$option->id}]",

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
           case 'radio':
             echo "<label>{$option->name}</label>";
             foreach ($option->items as $item) {
-              $this->widget('Ui\Form/' . $option->type, [
+              $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,
@@ -47,7 +47,7 @@ 
             }
             break;
           default:
-            $this->widget('Ui\Form/' . ($option->type ? $option->type : 'text'), [
+            $this->widget('Ui\Form/'.($option->type ? $option->type : 'text'), [
                 'label' => $option->name,
                 'name' => "filters[options][{$option->id}]",
                 'options' => [

system/modules/Money/objects/Sums.php

Indentation +28 added lines, -28 removed lines

@@ -13,65 +13,65 @@
 
 class Sums extends \Object {
 
-  public $sums = [];
+    public $sums = [];
 
-  public function __construct($sums) {
+    public function __construct($sums) {
     $this->sums = $sums;
-  }
+    }
 
-  function plus(Sums $sums) {
+    function plus(Sums $sums) {
     $newSums = $this->sums;
     foreach ($sums->sums as $currency_id => $sum) {
-      $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] + $sum : $sum;
+        $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] + $sum : $sum;
     }
     return new Sums($newSums);
-  }
+    }
 
-  function minus(Sums $sums) {
+    function minus(Sums $sums) {
     $newSums = $this->sums;
     foreach ($sums->sums as $currency_id => $sum) {
-      $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] - $sum : -$sum;
+        $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] - $sum : -$sum;
     }
     return new Sums($newSums);
-  }
+    }
 
 //Equal, Less and Greater
-  public function greater(Sums $sums) {
+    public function greater(Sums $sums) {
     if (count($this->sums) == count($sums->sums) && isset($sums->sums[key($this->sums)])) {
-      return current($this->sums) > current($sums->sums);
+        return current($this->sums) > current($sums->sums);
+    }
     }
-  }
 
-  public function equal(Sums $sums) {
+    public function equal(Sums $sums) {
     if (count($this->sums) == count($sums->sums) && isset($sums->sums[key($this->sums)])) {
-      return current($this->sums) == current($sums->sums);
+        return current($this->sums) == current($sums->sums);
+    }
     }
-  }
 
-  function __toString() {
+    function __toString() {
     $string = '';
     $first = true;
     foreach ($this->sums as $currency_id => $sum) {
-      if ($first) {
+        if ($first) {
         $first = false;
-      } else {
+        } else {
         $string.= '<br />';
-      }
-      $string.= '<span style="white-space:nowrap;">';
-      $string.= number_format($sum, 2, '.', ' ');
-      if (\App::$cur->money) {
+        }
+        $string.= '<span style="white-space:nowrap;">';
+        $string.= number_format($sum, 2, '.', ' ');
+        if (\App::$cur->money) {
         $currency = \Money\Currency::get($currency_id);
         if ($currency) {
-          $string.= ' ' . $currency->acronym();
+            $string.= ' ' . $currency->acronym();
         } else {
-          $string.= ' руб.';
+            $string.= ' руб.';
         }
-      } else {
+        } else {
         $string.= ' руб.';
-      }
-      $string.= '</span>';
+        }
+        $string.= '</span>';
     }
     return $string;
-  }
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -55,21 +55,21 @@
       if ($first) {
         $first = false;
       } else {
-        $string.= '<br />';
+        $string .= '<br />';
       }
-      $string.= '<span style="white-space:nowrap;">';
-      $string.= number_format($sum, 2, '.', ' ');
+      $string .= '<span style="white-space:nowrap;">';
+      $string .= number_format($sum, 2, '.', ' ');
       if (\App::$cur->money) {
         $currency = \Money\Currency::get($currency_id);
         if ($currency) {
-          $string.= ' ' . $currency->acronym();
+          $string .= ' '.$currency->acronym();
         } else {
-          $string.= ' руб.';
+          $string .= ' руб.';
         }
       } else {
-        $string.= ' руб.';
+        $string .= ' руб.';
       }
-      $string.= '</span>';
+      $string .= '</span>';
     }
     return $string;
   }

system/modules/Ecommerce/appControllers/CartController.php

Braces +5 added lines, -4 removed lines

@@ -271,10 +271,11 @@
     $item->sales ++;
     $item->save();
 
-    if (empty($_GET['count']))
-      $count = 1;
-    else
-      $count = (float) $_GET['count'];
+    if (empty($_GET['count'])) {
+          $count = 1;
+    } else {
+          $count = (float) $_GET['count'];
+    }
 
     $cart = $this->ecommerce->getCurCart();
     $stages = Ecommerce\Cart\Stage::getList();

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
               $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+              Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
             }
           }
         }
@@ -73,7 +73,7 @@ 
           foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
               $error = 1;
-              Msg::add('Вы не указали: ' . $field->name, 'danger');
+              Msg::add('Вы не указали: '.$field->name, 'danger');
             }
           }
         }
@@ -89,7 +89,7 @@ 
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
           if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
-            Msg::add('Вы не указали: ' . $field->name, 'danger');
+            Msg::add('Вы не указали: '.$field->name, 'danger');
           }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
@@ -126,13 +126,13 @@ 
           }
           $cart = \Ecommerce\Cart::get($cart->id);
           if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
-            $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
-            $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-            \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
+            $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/admin/ecommerce/Cart">Админ панель</a>';
+            $title = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+            \Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
           }
           if ($this->notifications) {
             $notification = new Notifications\Notification();
-            $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+            $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
@@ -177,10 +177,10 @@ 
         'href' => '/ecommerce/cart'
     ];
     $bread[] = [
-        'text' => 'Заказ: №' . $cart->id,
-        'href' => '/ecommerce/cart/orderDetail/' . $cart->id
+        'text' => 'Заказ: №'.$cart->id,
+        'href' => '/ecommerce/cart/orderDetail/'.$cart->id
     ];
-    $this->view->setTitle('Заказ №' . $cart->id);
+    $this->view->setTitle('Заказ №'.$cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
   }
 
@@ -268,7 +268,7 @@ 
       $result->send();
     }
 
-    $item->sales ++;
+    $item->sales++;
     $item->save();
 
     if (empty($_GET['count']))
@@ -280,7 +280,7 @@ 
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
       $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+      $result->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
       $result->send();
     }
 
@@ -298,7 +298,7 @@ 
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
-    $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
+    $result->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
   }
 

Indentation +107 added lines, -107 removed lines

@@ -10,146 +10,146 @@ 
  */
 class CartController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     $cart = '';
     $deliverys = \Ecommerce\Delivery::getList(['order' => ['weight', 'ASC']]);
     $payTypes = \Ecommerce\PayType::getList(['order' => ['weight', 'ASC']]);
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
-      if (!empty($_POST)) {
+        $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
+        if (!empty($_POST)) {
         $error = false;
         if (!Users\User::$cur->id) {
-          $user_id = $this->Users->registration($_POST, true);
-          if (!$user_id) {
+            $user_id = $this->Users->registration($_POST, true);
+            if (!$user_id) {
             $error = true;
-          } else {
+            } else {
             $user = Users\User::get($user_id);
-          }
+            }
         } else {
-          $user = Users\User::$cur;
+            $user = Users\User::$cur;
         }
         $ids = [];
         if (!empty($_POST['cartItems'])) {
-          foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
+            foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
             $cartItem = \Ecommerce\Cart\Item::get((int) $cartItemId);
             if (!$cartItem) {
-              continue;
+                continue;
             }
             if ($cartItem->cart_id != $cart->id) {
-              continue;
+                continue;
             }
             $count = (float) $cartItemCont;
             if ($count < 0.001) {
-              $count = 1;
+                $count = 1;
             }
             $cartItem->count = $count;
             $cartItem->save();
             $ids[] = $cartItemId;
-          }
+            }
         }
         foreach ($cart->cartItems as $cartItem) {
-          if (!in_array($cartItem->id, $ids)) {
+            if (!in_array($cartItem->id, $ids)) {
             $cartItem->delete();
-          }
+            }
         }
         $cart = Ecommerce\Cart::get($cart->id);
         if (!$cart->cartItems) {
-          $error = true;
-          //Tools::redirect('/ecommerce', 'Ваша корзина пуста');
+            $error = true;
+            //Tools::redirect('/ecommerce', 'Ваша корзина пуста');
         }
         if (empty($this->module->config['sell_over_warehouse'])) {
-          foreach ($cart->cartItems as $cartitem) {
+            foreach ($cart->cartItems as $cartitem) {
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
-              $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+                $error = true;
+                Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+            }
             }
-          }
         }
         if ($deliverys && empty($deliverys[$_POST['delivery']])) {
-          $error = 1;
-          Msg::add('Выберите способ доставки', 'danger');
+            $error = 1;
+            Msg::add('Выберите способ доставки', 'danger');
         } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
-          $cart->delivery_id = $_POST['delivery'];
-          foreach ($deliverys[$cart->delivery_id]->fields as $field) {
+            $cart->delivery_id = $_POST['delivery'];
+            foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
-              $error = 1;
-              Msg::add('Вы не указали: ' . $field->name, 'danger');
+                $error = 1;
+                Msg::add('Вы не указали: ' . $field->name, 'danger');
+            }
             }
-          }
         }
         if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) {
-          $error = 1;
-          Msg::add('Выберите способ оплаты', 'danger');
+            $error = 1;
+            Msg::add('Выберите способ оплаты', 'danger');
         } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
-          $payType = $payTypes[$_POST['payType']];
-          $cart->paytype_id = $payType->id;
+            $payType = $payTypes[$_POST['payType']];
+            $cart->paytype_id = $payType->id;
         } else {
-          $payType = null;
+            $payType = null;
         }
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
-          if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
+            if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
             Msg::add('Вы не указали: ' . $field->name, 'danger');
-          }
+            }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
-          $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
-          if (!$userCard) {
+            $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
+            if (!$userCard) {
             $error = true;
             Msg::add('Такой карты не существует', 'danger');
-          } elseif ($userCard->user_id != $user->id) {
+            } elseif ($userCard->user_id != $user->id) {
             $error = true;
             Msg::add('Это не ваша карта', 'danger');
-          } else {
+            } else {
             $cart->card_item_id = $userCard->id;
-          }
+            }
         }
         $cart->save();
         if (!$error && !empty($_POST['action']) && $_POST['action'] = 'order') {
-          $cart->user_id = $user->user_id;
-          $this->module->parseFields($_POST['userAdds']['fields'], $cart);
-          if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
+            $cart->user_id = $user->user_id;
+            $this->module->parseFields($_POST['userAdds']['fields'], $cart);
+            if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
             $this->module->parseDeliveryFields($_POST['deliveryFields'], $cart, $deliverys[$cart->delivery_id]->fields);
-          }
-          $cart->cart_status_id = 2;
-          $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
-          $cart->date_status = date('Y-m-d H:i:s');
-          $cart->complete_data = date('Y-m-d H:i:s');
-          $cart->warehouse_block = 1;
-          $cart->save();
+            }
+            $cart->cart_status_id = 2;
+            $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
+            $cart->date_status = date('Y-m-d H:i:s');
+            $cart->complete_data = date('Y-m-d H:i:s');
+            $cart->warehouse_block = 1;
+            $cart->save();
 
-          $cart = \Ecommerce\Cart::get($cart->id);
-          foreach ($cart->cartItems as $cartItem) {
+            $cart = \Ecommerce\Cart::get($cart->id);
+            foreach ($cart->cartItems as $cartItem) {
             $cartItem->discount = $cartItem->discount();
             $cartItem->final_price = $cartItem->price->price - $cartItem->discount;
             $cartItem->save();
-          }
-          $cart = \Ecommerce\Cart::get($cart->id);
-          if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
+            }
+            $cart = \Ecommerce\Cart::get($cart->id);
+            if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
             $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
             $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
-          }
-          if ($this->notifications) {
+            }
+            if ($this->notifications) {
             $notification = new Notifications\Notification();
             $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
-          }
-          $handlers = $this->ecommerce->getSnippets('payTypeHandler');
-          $redirect = ['/ecommerce/cart/success'];
-          if ($payType && !empty($handlers[$payType->handler]['handler'])) {
+            }
+            $handlers = $this->ecommerce->getSnippets('payTypeHandler');
+            $redirect = ['/ecommerce/cart/success'];
+            if ($payType && !empty($handlers[$payType->handler]['handler'])) {
             $newRedirect = $handlers[$payType->handler]['handler']($cart);
             if (!empty($newRedirect)) {
-              $redirect = $newRedirect;
+                $redirect = $newRedirect;
+            }
             }
-          }
-          unset($_SESSION['cart']['cart_id']);
-          call_user_func_array(['Tools', 'redirect'], $redirect);
+            unset($_SESSION['cart']['cart_id']);
+            call_user_func_array(['Tools', 'redirect'], $redirect);
+        }
         }
-      }
     }
     $this->view->setTitle('Корзина');
     $bread = [];
@@ -162,12 +162,12 @@ 
         'href' => '/ecommerce/cart'
     ];
     $this->view->page(['data' => compact('cart', 'items', 'deliverys', 'payTypes', 'packItem', 'bread')]);
-  }
+    }
 
-  public function orderDetailAction($id = 0) {
+    public function orderDetailAction($id = 0) {
     $cart = Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      $this->url->redirect('/', 'Это не ваша корзина');
+        $this->url->redirect('/', 'Это не ваша корзина');
     }
     $bread[] = [
         'text' => 'Каталог',
@@ -183,54 +183,54 @@ 
     ];
     $this->view->setTitle('Заказ №' . $cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
-  }
+    }
 
-  public function continueAction($id = 0) {
+    public function continueAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     $_SESSION['cart']['cart_id'] = $cart->id;
     Tools::redirect('/ecommerce/cart');
-  }
+    }
 
-  public function deleteAction($id = 0) {
+    public function deleteAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     if (!empty($_SESSION['cart']['cart_id']) && $_SESSION['cart']['cart_id'] == $cart->id) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $cart->delete();
     Tools::redirect('/users/cabinet/ecommerceOrdersHistory', 'Корзина была удалена', 'success');
-  }
+    }
 
-  public function refillAction($id = 0) {
+    public function refillAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if (!empty($_SESSION['cart']['cart_id'])) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $newCart = $this->ecommerce->getCurCart();
     foreach ($cart->cartItems as $cartitem) {
-      $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
+        $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
     }
 
     $newCart->save();
 
     Tools::redirect('/ecommerce/cart/');
-  }
+    }
 
-  public function successAction() {
+    public function successAction() {
     $bread = [];
     $bread[] = [
         'text' => 'Каталог',
@@ -246,70 +246,70 @@ 
     ];
     $this->view->setTitle('Заказ принят');
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function addAction() {
+    public function addAction() {
     $result = new Server\Result();
     if (empty($_GET['itemOfferPriceId'])) {
-      $result->success = false;
-      $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
+        $result->send();
     }
     $price = \Ecommerce\Item\Offer\Price::get((int) $_GET['itemOfferPriceId']);
     if (!$price) {
-      $result->success = false;
-      $result->content = 'Такой цены не найдено';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такой цены не найдено';
+        $result->send();
     }
     $item = $price->offer->item;
 
     if (!$item) {
-      $result->success = false;
-      $result->content = 'Такого товара не существует';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такого товара не существует';
+        $result->send();
     }
 
     $item->sales ++;
     $item->save();
 
     if (empty($_GET['count']))
-      $count = 1;
+        $count = 1;
     else
-      $count = (float) $_GET['count'];
+        $count = (float) $_GET['count'];
 
     $cart = $this->ecommerce->getCurCart();
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
-      $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
-      $result->send();
+        $result->success = false;
+        $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+        $result->send();
     }
 
     $isset = false;
     foreach ($cart->cartItems as $cartItem) {
-      if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
+        if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
         $cartItem->count += $count;
         $cartItem->save();
         $isset = true;
         break;
-      }
+        }
     }
     if (!$isset) {
-      $cart->addItem($price->id, $count);
+        $cart->addItem($price->id, $count);
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
     $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
-  }
+    }
 
-  public function getcartAction() {
+    public function getcartAction() {
     $result = new Server\Result();
     ob_start();
     $this->view->widget('Ecommerce\cart');
     $result->content = ob_get_contents();
     ob_end_clean();
     $result->send();
-  }
+    }
 
 }