injitools / cms-Inji

system/modules/Sliders/widgets/slider.php

Indentation +12 added lines, -12 removed lines

@@ -32,19 +32,19 @@ 
         ?>
         <div class="item <?= !$i ? 'active' : ''; ?>">
           <?php
-          if ($item->link) {
-              echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
-          }
-          ?>
+            if ($item->link) {
+                echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
+            }
+            ?>
           <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
           <div class="carousel-caption">
             <?= $item->description; ?>
           </div>
           <?php
-          if ($item->link) {
-              echo "</a>";
-          }
-          ?>
+            if ($item->link) {
+                echo "</a>";
+            }
+            ?>
         </div>
         <?php
         $i++;
@@ -53,8 +53,8 @@ 
   </div>
 
   <?php
-  if (!isset($arrows) || $arrows) {
-      ?>
+    if (!isset($arrows) || $arrows) {
+        ?>
       <!-- Controls -->
       <a class="left carousel-control" href="#sliderWidget-<?= $slider->id; ?>" role="button" data-slide="prev">
         <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
@@ -65,6 +65,6 @@ 
         <span class="sr-only">Next</span>
       </a>
       <?php
-  }
-  ?>
+    }
+    ?>
 </div>
\ No newline at end of file

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

Indentation +2 added lines, -2 removed lines

@@ -9,6 +9,6 @@
 <a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='<?= $model::index(); ?>' data-path ='/' data-id='0'> Корень</a>
 <div class="categoryTree">
   <?php
-  $dataManager->drawCategorys();
-  ?>
+    $dataManager->drawCategorys();
+    ?>
 </div>
\ No newline at end of file

system/modules/Widgets/appAdminControllers/content/widgetChooser.php

Indentation +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
 <select class ='form-control' id = 'widgetChooser' onchange="selectChange(this);">
   <option value = ''>Выберите виджет</option>
   <?php
-  foreach ($widgets as $code => $options) {
-      $name = is_string($options) ? $options : $options['name'];
-      echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
-  }
-  ?>
+    foreach ($widgets as $code => $options) {
+        $name = is_string($options) ? $options : $options['name'];
+        echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
+    }
+    ?>
 </select>
 <?php
 foreach ($widgets as $code => $options) {

system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php

Indentation +87 added lines, -87 removed lines

@@ -8,11 +8,11 @@ 
         </tr>
       </thead>
       <?php
-      $orderDeatilCols = [
-          'id' => '№ Заказа',
-          'complete_data' => 'Дата заказа'
-      ];
-      ?>
+        $orderDeatilCols = [
+            'id' => '№ Заказа',
+            'complete_data' => 'Дата заказа'
+        ];
+        ?>
       <tbody>
         <tr>
           <td class="text-left" style="width: 50%;">              
@@ -65,91 +65,91 @@ 
         </thead>
         <tbody>
           <?php
-          $sums = [];
-          foreach ($cart->cartItems as $cartItem) {
-              $item = $cartItem->item;
-              $itemName = $item->name();
-              if (!isset($sums[$cartItem->price->currency_id])) {
-                  $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-              } else {
-                  $sums[$cartItem->price->currency_id] += $cartItem->price->price;
-              }
-              ?>
+            $sums = [];
+            foreach ($cart->cartItems as $cartItem) {
+                $item = $cartItem->item;
+                $itemName = $item->name();
+                if (!isset($sums[$cartItem->price->currency_id])) {
+                    $sums[$cartItem->price->currency_id] = $cartItem->price->price;
+                } else {
+                    $sums[$cartItem->price->currency_id] += $cartItem->price->price;
+                }
+                ?>
               <tr>
                 <td class="text-left"><?= $itemName; ?></td>
                 <td class="text-right"><?= $cartItem->count; ?></td>
                 <td class="text-right"><?= $cartItem->price->price; ?> 
                   <?php
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($cartItem->price->currency_id);
-                      if ($currency) {
-                          echo $currency->acronym();
-                      } else {
-                          echo 'руб.';
-                      }
-                  } else {
-                      echo 'руб.';
-                  }
-                  ?></td>
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($cartItem->price->currency_id);
+                        if ($currency) {
+                            echo $currency->acronym();
+                        } else {
+                            echo 'руб.';
+                        }
+                    } else {
+                        echo 'руб.';
+                    }
+                    ?></td>
                 <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
                   <?php
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($cartItem->price->currency_id);
-                      if ($currency) {
-                          echo $currency->acronym();
-                      } else {
-                          echo 'руб.';
-                      }
-                  } else {
-                      echo 'руб.';
-                  }
-                  ?></td>
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($cartItem->price->currency_id);
+                        if ($currency) {
+                            echo $currency->acronym();
+                        } else {
+                            echo 'руб.';
+                        }
+                    } else {
+                        echo 'руб.';
+                    }
+                    ?></td>
                 <td class="text-right" style="white-space: nowrap;">
                   <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
                           return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
               </tr>
               <?php
-          }
-          ?>
+            }
+            ?>
         </tbody>
         <tfoot>
           <tr>
             <td colspan="2"></td>
             <td class="text-right"><b>Сумма</b></td>
             <td class="text-right"><?php
-              foreach ($sums as $currency_id => $sum) {
-                  if (!$sum) {
-                      continue;
-                  }
-                  echo number_format($sum, 2, '.', ' ');
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($currency_id);
-                      if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
-                      } else {
-                          echo '&nbsp;руб.';
-                      }
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-                  echo '<br />';
-              }
-              ?></td>
+                foreach ($sums as $currency_id => $sum) {
+                    if (!$sum) {
+                        continue;
+                    }
+                    echo number_format($sum, 2, '.', ' ');
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($currency_id);
+                        if ($currency) {
+                            echo '&nbsp;' . $currency->acronym();
+                        } else {
+                            echo '&nbsp;руб.';
+                        }
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                    echo '<br />';
+                }
+                ?></td>
             <td></td>
           </tr>
           <?php
-          $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
-          $deliveryPrice = $cart->delivery->price;
-          if (!isset($sums[$deliveryCurrency])) {
-              $sums[$deliveryCurrency] = $deliveryPrice;
-          } else {
-              $sums[$deliveryCurrency] += $deliveryPrice;
-          }
-          $delCurrency = false;
-          if (App::$cur->money) {
-              $delCurrency = Money\Currency::get($deliveryPrice);
-          }
-          ?>
+            $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
+            $deliveryPrice = $cart->delivery->price;
+            if (!isset($sums[$deliveryCurrency])) {
+                $sums[$deliveryCurrency] = $deliveryPrice;
+            } else {
+                $sums[$deliveryCurrency] += $deliveryPrice;
+            }
+            $delCurrency = false;
+            if (App::$cur->money) {
+                $delCurrency = Money\Currency::get($deliveryPrice);
+            }
+            ?>
           <tr>
             <td colspan="2"></td>
             <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -160,24 +160,24 @@ 
             <td colspan="2"></td>
             <td class="text-right"><b>Итого</b></td>
             <td class="text-right"><?php
-              foreach ($sums as $currency_id => $sum) {
-                  if (!$sum) {
-                      continue;
-                  }
-                  echo number_format($sum, 2, '.', ' ');
-                  if (App::$cur->money) {
-                      $currency = Money\Currency::get($currency_id);
-                      if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
-                      } else {
-                          echo '&nbsp;руб.';
-                      }
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-                  echo '<br />';
-              }
-              ?></td>
+                foreach ($sums as $currency_id => $sum) {
+                    if (!$sum) {
+                        continue;
+                    }
+                    echo number_format($sum, 2, '.', ' ');
+                    if (App::$cur->money) {
+                        $currency = Money\Currency::get($currency_id);
+                        if ($currency) {
+                            echo '&nbsp;' . $currency->acronym();
+                        } else {
+                            echo '&nbsp;руб.';
+                        }
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                    echo '<br />';
+                }
+                ?></td>
             <td></td>
           </tr>
         </tfoot>

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;
     }
-  }
+    }
 
 }

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/Exchange1c/objects/Parser/Item/Options.php

Indentation +29 added lines, -29 removed lines

@@ -13,67 +13,67 @@
 
 class Options extends \Migrations\Parser {
 
-  static $options;
+    static $options;
 
-  public function parse() {
+    public function parse() {
     if (!Options::$options) {
-      Options::$options = \Ecommerce\Item\Option::getList();
+        Options::$options = \Ecommerce\Item\Option::getList();
     }
     $options = [];
     $modelName = 'Ecommerce\Item\Option';
     foreach ($this->data['ЗначенияСвойства'] as $opt) {
-      $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
-      if (Options::$options[$optionId]->type == 'select') {
+        $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
+        if (Options::$options[$optionId]->type == 'select') {
         if (empty($options[$optionId])) {
-          $options[$optionId] = [];
+            $options[$optionId] = [];
         } else {
-          if (!Options::$options[$optionId]->advance) {
+            if (!Options::$options[$optionId]->advance) {
             Options::$options[$optionId]->advance = ['multi' => true];
             Options::$options[$optionId]->save();
-          }
+            }
         }
         $options[$optionId][] = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']]->object_id;
-      } else {
+        } else {
         $options[$optionId] = $opt['Значение'];
-      }
+        }
     }
     $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id]]);
     foreach ($itemParams as $itemParam) {
-      if (Options::$options[$itemParam->item_option_id]->type == 'select') {
+        if (Options::$options[$itemParam->item_option_id]->type == 'select') {
         if (empty($options[$itemParam->item_option_id]) || !in_array($itemParam->value, $options[$itemParam->item_option_id])) {
-          $itemParam->delete();
+            $itemParam->delete();
         } else {
-          unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
+            unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
         }
-      } else {
+        } else {
         if (empty($options[$itemParam->item_option_id])) {
-          $itemParam->delete();
+            $itemParam->delete();
         } else {
-          $itemParam->value = $options[$itemParam->item_option_id];
-          $itemParam->save();
-          unset($options[$itemParam->item_option_id]);
+            $itemParam->value = $options[$itemParam->item_option_id];
+            $itemParam->save();
+            unset($options[$itemParam->item_option_id]);
+        }
         }
-      }
     }
     foreach ($options as $optionId => $values) {
-      if (is_array($values)) {
+        if (is_array($values)) {
         foreach ($values as $value) {
-          $itemParam = new \Ecommerce\Item\Param([
-              'item_option_id' => $optionId,
-              'item_id' => $this->model->id,
-              'value' => $value
-          ]);
-          $itemParam->save();
+            $itemParam = new \Ecommerce\Item\Param([
+                'item_option_id' => $optionId,
+                'item_id' => $this->model->id,
+                'value' => $value
+            ]);
+            $itemParam->save();
         }
-      } else {
+        } else {
         $itemParam = new \Ecommerce\Item\Param([
             'item_option_id' => $optionId,
             'item_id' => $this->model->id,
             'value' => $values
         ]);
         $itemParam->save();
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Ecommerce/models/Category.php

Indentation +73 added lines, -73 removed lines

@@ -13,50 +13,50 @@ 
 
 class Category extends \Model {
 
-  public static $objectName = 'Категория магазина';
-  public static $treeCategory = 'Ecommerce\Item';
-  public static $cols = [
-      //Основные параметры
-      'parent_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'parent'],
-      'name' => ['type' => 'text'],
-      'alias' => ['type' => 'text'],
-      'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsCategoryList', 'module' => 'Ecommerce'],
-      'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesCategoryList', 'module' => 'Ecommerce'],
-      'description' => ['type' => 'html'],
-      'image_file_id' => ['type' => 'image'],
-      'options_inherit' => ['type' => 'bool'],
-      //Системные
-      'imported' => ['type' => 'bool'],
-      'weight' => ['type' => 'number'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'tree_path' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'options' => ['type' => 'dataManager', 'relation' => 'options'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'alias' => 'Алиас',
-      'parent_id' => 'Родительская категория',
-      'image_file_id' => 'Изображение',
-      'description' => 'Описание',
-      'options_inherit' => 'Наследовать набор свойств',
-      'options' => 'Свойства товаров',
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'alias'],
-              ['parent_id', 'image_file_id'],
-              ['viewer', 'template'],
-              ['options_inherit'],
-              ['options'],
-              ['description']
-          ]
-      ]
-  ];
+    public static $objectName = 'Категория магазина';
+    public static $treeCategory = 'Ecommerce\Item';
+    public static $cols = [
+        //Основные параметры
+        'parent_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'parent'],
+        'name' => ['type' => 'text'],
+        'alias' => ['type' => 'text'],
+        'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsCategoryList', 'module' => 'Ecommerce'],
+        'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesCategoryList', 'module' => 'Ecommerce'],
+        'description' => ['type' => 'html'],
+        'image_file_id' => ['type' => 'image'],
+        'options_inherit' => ['type' => 'bool'],
+        //Системные
+        'imported' => ['type' => 'bool'],
+        'weight' => ['type' => 'number'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'tree_path' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'options' => ['type' => 'dataManager', 'relation' => 'options'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'alias' => 'Алиас',
+        'parent_id' => 'Родительская категория',
+        'image_file_id' => 'Изображение',
+        'description' => 'Описание',
+        'options_inherit' => 'Наследовать набор свойств',
+        'options' => 'Свойства товаров',
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'alias'],
+                ['parent_id', 'image_file_id'],
+                ['viewer', 'template'],
+                ['options_inherit'],
+                ['options'],
+                ['description']
+            ]
+        ]
+    ];
 
-  public static function indexes() {
+    public static function indexes() {
     return [
         'ecommerce_category_category_parent_id' => [
             'type' => 'INDEX',
@@ -71,9 +71,9 @@ 
             ]
         ],
     ];
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'items' => [
             'type' => 'many',
@@ -103,50 +103,50 @@ 
             'col' => 'parent_id',
         ]
     ];
-  }
+    }
 
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Категории товаров',
-          'cols' => [
-              'name',
-              'parent_id',
-          ],
-          'sortMode' => true
-      ]
-  ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Категории товаров',
+            'cols' => [
+                'name',
+                'parent_id',
+            ],
+            'sortMode' => true
+        ]
+    ];
 
-  public function beforeSave() {
+    public function beforeSave() {
     if ($this->id && $this->id == $this->parent_id) {
-      $this->parent_id = 0;
-      \Msg::add('Категория не может быть сама себе родителем');
+        $this->parent_id = 0;
+        \Msg::add('Категория не может быть сама себе родителем');
+    }
     }
-  }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     foreach ($this->catalogs as $category) {
-      $category->delete();
+        $category->delete();
+    }
     }
-  }
 
-  public function resolveTemplate() {
+    public function resolveTemplate() {
     if ($this->template !== 'inherit') {
-      return $this->template;
+        return $this->template;
     } elseif ($this->template == 'inherit' && $this->category) {
-      return $this->category->resolveTemplate(true);
+        return $this->category->resolveTemplate(true);
     } else {
-      return 'current';
+        return 'current';
+    }
     }
-  }
 
-  public function resolveViewer() {
+    public function resolveViewer() {
     if ($this->viewer !== 'inherit') {
-      return $this->viewer;
+        return $this->viewer;
     } elseif ($this->viewer == 'inherit' && $this->category) {
-      return $this->category->resolveViewer(true);
+        return $this->category->resolveViewer(true);
     } else {
-      return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
+        return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
+    }
     }
-  }
 
 }

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

Indentation +5 added lines, -5 removed lines

@@ -22,13 +22,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">