injitools / cms-Inji

system/modules/Ecommerce/models/Delivery.php

Indentation +59 added lines, -59 removed lines

@@ -13,65 +13,65 @@ 
 
 class Delivery extends \Model {
 
-  public static $objectName = 'Доставка';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'price' => ['type' => 'decimal'],
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
-      'price_text' => ['type' => 'textarea'],
-      'max_cart_price' => ['type' => 'decimal'],
-      'icon_file_id' => ['type' => 'image'],
-      'info' => ['type' => 'html'],
-      'disabled' => ['type' => 'bool'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'field' => ['type' => 'dataManager', 'relation' => 'fields'],
-      'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'price' => 'Стоимость',
-      'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
-      'max_cart_price' => 'Басплатно при',
-      'icon_file_id' => 'Иконка',
-      'currency_id' => 'Валюта',
-      'info' => 'Дополнительная информация',
-      'priceChanger' => 'Градация стоимости',
-      'field' => 'Поля',
-      'disabled' => 'Отключено',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Варианты доставки',
-          'cols' => [
-              'name',
-              'price',
-              'currency_id',
-              'max_cart_price',
-              'disabled',
-              'field',
-              'priceChanger',
-          ],
-          'sortMode' => true
-      ],
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'disabled'],
-              ['max_cart_price', 'icon_file_id'],
-              ['price', 'currency_id'],
-              ['price_text'],
-              ['info'],
-              ['priceChanger'],
-              ['field']
-          ]
-  ]];
+    public static $objectName = 'Доставка';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'price' => ['type' => 'decimal'],
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
+        'price_text' => ['type' => 'textarea'],
+        'max_cart_price' => ['type' => 'decimal'],
+        'icon_file_id' => ['type' => 'image'],
+        'info' => ['type' => 'html'],
+        'disabled' => ['type' => 'bool'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'field' => ['type' => 'dataManager', 'relation' => 'fields'],
+        'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'price' => 'Стоимость',
+        'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
+        'max_cart_price' => 'Басплатно при',
+        'icon_file_id' => 'Иконка',
+        'currency_id' => 'Валюта',
+        'info' => 'Дополнительная информация',
+        'priceChanger' => 'Градация стоимости',
+        'field' => 'Поля',
+        'disabled' => 'Отключено',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Варианты доставки',
+            'cols' => [
+                'name',
+                'price',
+                'currency_id',
+                'max_cart_price',
+                'disabled',
+                'field',
+                'priceChanger',
+            ],
+            'sortMode' => true
+        ],
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'disabled'],
+                ['max_cart_price', 'icon_file_id'],
+                ['price', 'currency_id'],
+                ['price_text'],
+                ['info'],
+                ['priceChanger'],
+                ['field']
+            ]
+    ]];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'icon' => [
             'model' => 'Files\File',
@@ -92,6 +92,6 @@ 
             'col' => 'delivery_id'
         ]
     ];
-  }
+    }
 
 }

system/modules/Dashboard/appAdminControllers/DashboardController.php

Indentation +19 added lines, -19 removed lines

@@ -10,38 +10,38 @@
  */
 class DashboardController extends adminController {
 
-  public function indexAction() {
+    public function indexAction() {
     $sections = $this->module->getSnippets('adminDashboardWidget');
     $this->view->setTitle('Панель управления');
     $this->view->page(['data' => compact('sections')]);
-  }
+    }
 
-  public function siteConfigAction() {
+    public function siteConfigAction() {
     if (isset($_POST['site_name'])) {
-      $config = \App::$primary->config;
-      $config['site']['name'] = $_POST['site_name'];
-      $config['site']['company_name'] = $_POST['company_name'];
-      $config['site']['email'] = $_POST['site_email'];
-      $config['site']['keywords'] = $_POST['site_keywords'];
-      $config['site']['description'] = $_POST['site_description'];
-      $config['site']['domain'] = $_POST['site_domain'];
-      if (isset($_POST['metatags'])) {
+        $config = \App::$primary->config;
+        $config['site']['name'] = $_POST['site_name'];
+        $config['site']['company_name'] = $_POST['company_name'];
+        $config['site']['email'] = $_POST['site_email'];
+        $config['site']['keywords'] = $_POST['site_keywords'];
+        $config['site']['description'] = $_POST['site_description'];
+        $config['site']['domain'] = $_POST['site_domain'];
+        if (isset($_POST['metatags'])) {
         $config['site']['metatags'] = $_POST['metatags'];
-      }
-      if (!empty($_FILES['site_logo']['tmp_name'])) {
+        }
+        if (!empty($_FILES['site_logo']['tmp_name'])) {
         $fileId = $this->Files->upload($_FILES['site_logo'], array('file_code' => 'site_logo'));
         $config['site']['site_logo'] = Files\File::get($fileId)->path;
-      }
-      Config::save('app', $config);
-      Tools::redirect('/admin/dashboard/siteConfig', 'Изменения сохранены', 'success');
+        }
+        Config::save('app', $config);
+        Tools::redirect('/admin/dashboard/siteConfig', 'Изменения сохранены', 'success');
     }
 
     $this->view->setTitle('Общие настройки сайта');
     $this->view->page();
-  }
+    }
 
-  public function phpInfoAction() {
+    public function phpInfoAction() {
     $this->view->page();
-  }
+    }
 
 }

system/modules/Exchange1c/objects/Parser/Item/Options.php

Indentation +34 added lines, -34 removed lines

@@ -13,75 +13,75 @@
 
 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 ($optionId && !isset(Options::$options[$optionId])) {
+        $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
+        if ($optionId && !isset(Options::$options[$optionId])) {
         Options::$options = \Ecommerce\Item\Option::getList();
-      }
-      if (isset(Options::$options[$optionId]) && Options::$options[$optionId]->type == 'select') {
+        }
+        if (isset(Options::$options[$optionId]) && 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();
-          }
+            }
         }
         if ($opt['Значение'] && isset(\App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']])) {
-          $options[$optionId][] = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']]->object_id;
+            $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 ($itemParam->item_option_id && !isset(Options::$options[$itemParam->item_option_id])) {
+        if ($itemParam->item_option_id && !isset(Options::$options[$itemParam->item_option_id])) {
         Options::$options = \Ecommerce\Item\Option::getList();
-      }
-      if (isset(Options::$options[$itemParam->item_option_id]) && Options::$options[$itemParam->item_option_id]->type == 'select') {
+        }
+        if (isset(Options::$options[$itemParam->item_option_id]) && 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/Migrations/Migrations.php

Indentation +27 added lines, -27 removed lines

@@ -12,10 +12,10 @@ 
  */
 class Migrations extends \Module {
 
-  public $ids = [];
-  public $migrationObjects = [];
+    public $ids = [];
+    public $migrationObjects = [];
 
-  public function startMigration($migrationId, $mapId, $filePath) {
+    public function startMigration($migrationId, $mapId, $filePath) {
     $log = new \Migrations\Log();
     $log->migration_id = $migrationId;
     $log->migration_map_id = $mapId;
@@ -24,11 +24,11 @@ 
 
     $reader = new Migrations\Reader\Xml();
     if (!$reader->loadData($filePath)) {
-      $event = new Migrations\Log\Event();
-      $event->log_id = $log->id;
-      $event->type = 'load_data_error';
-      $event->save();
-      return false;
+        $event = new Migrations\Log\Event();
+        $event->log_id = $log->id;
+        $event->type = 'load_data_error';
+        $event->save();
+        return false;
     }
     $walker = new \Migrations\Walker();
     $walker->migration = Migrations\Migration::get($migrationId);
@@ -38,43 +38,43 @@ 
     $walker->walk();
     $log->result = 'success';
     $log->save();
-  }
+    }
 
-  public function loadParseIds($type) {
+    public function loadParseIds($type) {
     $this->ids['parseIds'][$type] = \Migrations\Id::getList(['where' => ['type', $type], 'key' => 'parse_id']);
-  }
+    }
 
-  public function loadObjectIds($type) {
+    public function loadObjectIds($type) {
     $this->ids['objectIds'][$type] = \Migrations\Id::getList(['where' => ['type', $type], 'key' => 'object_id']);
-  }
+    }
 
-  public function findObject($parseId, $type) {
+    public function findObject($parseId, $type) {
     if (empty($this->ids['parseIds'][$type])) {
-      $this->loadParseIds($type);
-      ksort($this->ids['parseIds'][$type]);
+        $this->loadParseIds($type);
+        ksort($this->ids['parseIds'][$type]);
     }
     if (!empty($this->ids['parseIds'][$type][$parseId])) {
-      return $this->ids['parseIds'][$type][$parseId];
+        return $this->ids['parseIds'][$type][$parseId];
+    }
     }
-  }
 
-  public function findParse($objectId, $type) {
+    public function findParse($objectId, $type) {
     if (empty($this->ids['objectIds'][$type])) {
-      $this->loadObjectIds($type);
-      ksort($this->ids['objectIds'][$type]);
+        $this->loadObjectIds($type);
+        ksort($this->ids['objectIds'][$type]);
     }
     if (!empty($this->ids['objectIds'][$type][$objectId])) {
-      return $this->ids['objectIds'][$type][$objectId];
+        return $this->ids['objectIds'][$type][$objectId];
+    }
     }
-  }
 
-  public function getMigrationObject($objectId) {
+    public function getMigrationObject($objectId) {
     if (empty($this->migrationObjects)) {
-      $this->migrationObjects = \Migrations\Migration\Object::getList();
+        $this->migrationObjects = \Migrations\Migration\Object::getList();
     }
     if (!empty($this->migrationObjects[$objectId])) {
-      return $this->migrationObjects[$objectId];
+        return $this->migrationObjects[$objectId];
+    }
     }
-  }
 
 }

system/modules/Migrations/objects/Walker.php

Indentation +53 added lines, -53 removed lines

@@ -13,61 +13,61 @@ 
 
 class Walker {
 
-  public $migration = null;
-  public $map = null;
-  public $data = null;
-  public $mapPath = null;
-  public $mapPathParent = null;
-  public $curPath = '/';
-  public $migtarionLog = null;
+    public $migration = null;
+    public $map = null;
+    public $data = null;
+    public $mapPath = null;
+    public $mapPathParent = null;
+    public $curPath = '/';
+    public $migtarionLog = null;
 
-  //walk map pathes on cur path
-  public function walk() {
+    //walk map pathes on cur path
+    public function walk() {
     $walked = [];
     //walk know pathes
     foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) {
-      if (isset($this->data[$path->item])) {
+        if (isset($this->data[$path->item])) {
         if ($path->type == 'container') { //create walker for container
-          $walker = new Walker();
-          $walker->migration = $this->migration;
-          $walker->map = $this->map;
-          $walker->data = &$this->data[$path->item];
-          $walker->curPath = $this->curPath . $path->item . '/';
-          $walker->mapPath = $path;
-          $walker->mapPathParent = $this->mapPath;
-          $walker->migtarionLog = $this->migtarionLog;
-          $walker->walk();
+            $walker = new Walker();
+            $walker->migration = $this->migration;
+            $walker->map = $this->map;
+            $walker->data = &$this->data[$path->item];
+            $walker->curPath = $this->curPath . $path->item . '/';
+            $walker->mapPath = $path;
+            $walker->mapPathParent = $this->mapPath;
+            $walker->migtarionLog = $this->migtarionLog;
+            $walker->walk();
         } elseif ($path->type == 'object') { //start parse path data
-          $this->startObjectParse($path->object_id, $this->data[$path->item]);
+            $this->startObjectParse($path->object_id, $this->data[$path->item]);
         }
-      }
-      $walked[$path->item] = true;
+        }
+        $walked[$path->item] = true;
     }
     //check unparsed paths
     foreach ($this->data as $key => &$data) {
-      //skip parsed and attribtes
-      if ($key == '@attributes' || !empty($walked[$key])) {
+        //skip parsed and attribtes
+        if ($key == '@attributes' || !empty($walked[$key])) {
         continue;
-      }
-      //search object for parse
-      $object = Migration\Object::get([
-                  ['code', $key],
-                  ['migration_id', $this->migration->id]
-      ]);
-      if ($object) { //parse as object
+        }
+        //search object for parse
+        $object = Migration\Object::get([
+                    ['code', $key],
+                    ['migration_id', $this->migration->id]
+        ]);
+        if ($object) { //parse as object
         $this->startObjectParse($object, $data);
-      } else { //create new map path for configure unknown path
+        } else { //create new map path for configure unknown path
         $this->mapPath = new Migration\Map\Path();
         $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0;
         $this->mapPath->path = $this->curPath;
         $this->mapPath->item = $key;
         $this->mapPath->migration_map_id = $this->map->id;
         $this->mapPath->save();
-      }
+        }
+    }
     }
-  }
 
-  private function startObjectParse($object_id, &$data) {
+    private function startObjectParse($object_id, &$data) {
     $objectParser = new Parser\Object();
     $objectParser->object = is_object($object_id) ? $object_id : \App::$cur->migrations->getMigrationObject($object_id);
     $objectParser->data = $data;
@@ -76,33 +76,33 @@ 
 
     if ($objectParser->object->clear && json_decode($objectParser->object->clear, true)) {
 
-      $where = json_decode($objectParser->object->clear, true);
-      if (!$where) {
+        $where = json_decode($objectParser->object->clear, true);
+        if (!$where) {
         $where = [];
-      } else {
+        } else {
         $where = [[$where]];
-      }
-      if ($ids) {
+        }
+        if ($ids) {
         $where[] = ['id', implode(',', $ids), 'NOT IN'];
-      }
-      if (empty(\App::$cur->migrations->ids['objectIds'])) {
+        }
+        if (empty(\App::$cur->migrations->ids['objectIds'])) {
         \App::$cur->migrations->loadObjectIds($objectParser->object->model);
-      }
-      if (!empty(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model])) {
+        }
+        if (!empty(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model])) {
         $where[] = ['id', implode(',', array_keys(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model])), 'IN'];
-      }
-      $modelName = $objectParser->object->model;
-      $objects = $modelName::getList(['where' => $where]);
-      foreach ($objects as $object) {
+        }
+        $modelName = $objectParser->object->model;
+        $objects = $modelName::getList(['where' => $where]);
+        foreach ($objects as $object) {
         $objectId = \App::$cur->migrations->findParse($object->id, $objectParser->object->model);
         if ($objectId) {
-          $objectId->delete();
-          unset(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model][$object->id]);
-          unset(\App::$cur->migrations->ids['parseIds'][$objectParser->object->model][$objectId->parse_id]);
+            $objectId->delete();
+            unset(\App::$cur->migrations->ids['objectIds'][$objectParser->object->model][$object->id]);
+            unset(\App::$cur->migrations->ids['parseIds'][$objectParser->object->model][$objectId->parse_id]);
         }
         $object->delete();
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Ui/widgets/Form/select.php

Indentation +22 added lines, -22 removed lines

@@ -4,36 +4,36 @@ 
 $optionsHtml = '';
 
 foreach ($options['values'] as $key => $value) {
-  $selected = '';
+    $selected = '';
 
-  $primaryValue = isset($options['value']) ? $options['value'] : null;
-  $primaryValue = is_array($primaryValue) && isset($primaryValue['primary']) ? $primaryValue['primary'] : $primaryValue;
-  if (is_numeric($key) && !is_array($primaryValue) && $primaryValue !== '') {
+    $primaryValue = isset($options['value']) ? $options['value'] : null;
+    $primaryValue = is_array($primaryValue) && isset($primaryValue['primary']) ? $primaryValue['primary'] : $primaryValue;
+    if (is_numeric($key) && !is_array($primaryValue) && $primaryValue !== '') {
     $primaryValue = (int) $primaryValue;
-  }
-  if (
-          (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
+    }
+    if (
+            (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
           (is_array($primaryValue) && (in_array($key, $primaryValue) || (isset($form->userDataTree[$name]) && in_array($key, $form->userDataTree[$name]))))
-  ) {
+    ) {
     $selected = ' selected="selected"';
-  }
-  if (is_array($value)) {
+    }
+    if (is_array($value)) {
     $aditionalInputs[] = $value['input'];
     if ($selected) {
-      $showedInput = count($aditionalInputs) - 1;
-      $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
+        $showedInput = count($aditionalInputs) - 1;
+        $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
     }
     $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
-  } else {
+    } else {
     $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
-  }
+    }
 }
 ?>
 <?= empty($options['noContainer']) ? '<div class="form-group">' : ''; ?>
 <?= $label !== false ? "<label>{$label}" : ''; ?>
 <?php
 if ($label !== false && !empty($options['createBtn'])) {
-  echo ' (<a href="" onclick="' . $options['createBtn']['onclick'] . ';this.disabled=true;return false;">' . $options['createBtn']['text'] . '</a>)';
+    echo ' (<a href="" onclick="' . $options['createBtn']['onclick'] . ';this.disabled=true;return false;">' . $options['createBtn']['text'] . '</a>)';
 }
 ?>
 <?= $label !== false ? "</label>" : ''; ?>
@@ -42,18 +42,18 @@ 
 </select>
 <?php
 foreach ($aditionalInputs as $key => $input) {
-  $input['options']['noContainer'] = true;
+    $input['options']['noContainer'] = true;
 
-  if ($key !== $showedInput) {
+    if ($key !== $showedInput) {
     $input['options']['disabled'] = true;
     $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
-  } else {
+    } else {
     $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
-  }
-  if ($input['type'] == 'select') {
+    }
+    if ($input['type'] == 'select') {
     $input['options']['values'] = \Ui\ActiveForm::getOptionsList($input);
-  }
-  $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
+    }
+    $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
 }
 ?>
 <?= empty($options['noContainer']) ? '</div>' : ''; ?>
\ No newline at end of file

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

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/Ui/objects/ActiveForm/Input.php

Indentation +44 added lines, -44 removed lines

@@ -13,15 +13,15 @@ 
 
 class Input extends \Object {
 
-  public $form = null;
-  public $activeForm = null;
-  public $activeFormParams = [];
-  public $modelName = '';
-  public $colName = '';
-  public $colParams = [];
-  public $options = [];
+    public $form = null;
+    public $activeForm = null;
+    public $activeFormParams = [];
+    public $modelName = '';
+    public $colName = '';
+    public $colParams = [];
+    public $options = [];
 
-  public function draw() {
+    public function draw() {
     $inputName = $this->colName();
     $inputLabel = $this->colLabel();
 
@@ -31,78 +31,78 @@ 
 
     $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;
     }
     $classPath = explode('\\', get_called_class());
     $inputType = lcfirst(array_pop($classPath));
     $this->form->input($inputType, $inputName, $inputLabel, $inputOptions);
     return true;
-  }
+    }
 
-  public function parseRequest($request) {
+    public function parseRequest($request) {
     $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
     if (isset($request[$this->colName])) {
-      $this->activeForm->model->{$colName} = $request[$this->colName];
+        $this->activeForm->model->{$colName} = $request[$this->colName];
     } else {
-      $this->activeForm->model->{$colName} = 0;
-      $this->activeForm->model->{$colName} = '';
+        $this->activeForm->model->{$colName} = 0;
+        $this->activeForm->model->{$colName} = '';
+    }
     }
-  }
 
-  public function value() {
+    public function value() {
     $value = isset($this->colParams['default']) ? $this->colParams['default'] : '';
     if ($this->activeForm) {
-      $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
-      $value = ($this->activeForm && $this->activeForm->model && isset($this->activeForm->model->{$colName})) ? $this->activeForm->model->{$colName} : $value;
+        $colName = empty($this->colParams['col']) ? $this->colName : $this->colParams['col'];
+        $value = ($this->activeForm && $this->activeForm->model && isset($this->activeForm->model->{$colName})) ? $this->activeForm->model->{$colName} : $value;
     }
     return $value;
-  }
+    }
 
-  public function preset() {
+    public function preset() {
     $preset = !empty($this->activeForm->form['preset'][$this->colName]) ? $this->activeForm->form['preset'][$this->colName] : [];
     if (!empty($this->activeForm->form['userGroupPreset'][\Users\User::$cur->group_id][$this->colName])) {
-      $preset = array_merge($preset, $this->activeForm->form['userGroupPreset'][\Users\User::$cur->group_id][$this->colName]);
+        $preset = array_merge($preset, $this->activeForm->form['userGroupPreset'][\Users\User::$cur->group_id][$this->colName]);
     }
     if ($preset) {
-      $value = '';
-      if (!empty($preset['value'])) {
+        $value = '';
+        if (!empty($preset['value'])) {
         $value = $preset['value'];
-      } elseif (!empty($preset['userCol'])) {
+        } elseif (!empty($preset['userCol'])) {
         if (strpos($preset['userCol'], ':')) {
-          $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
-          $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
-          $value = \Users\User::$cur->$rel->$param;
+            $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
+            $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
+            $value = \Users\User::$cur->$rel->$param;
         }
-      }
-      return $value;
+        }
+        return $value;
     }
     return null;
-  }
+    }
 
-  public function colName() {
+    public function colName() {
     return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}]".(stristr($this->colName, '[')?$this->colName:"[{$this->colName}]");
-  }
+    }
 
-  public function colLabel() {
+    public function colLabel() {
     $modelName = $this->modelName;
     return isset($this->colParams['label']) ? $this->colParams['label'] : (($this->activeForm->model && !empty($modelName::$labels[$this->colName])) ? $modelName::$labels[$this->colName] : $this->colName);
-  }
+    }
 
-  public function readOnly() {
+    public function readOnly() {
     return !empty($this->activeForm->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($this->colName, $this->activeForm->form['userGroupReadonly'][\Users\User::$cur->group_id]);
-  }
+    }
 
-  public function validate(&$request) {
+    public function validate(&$request) {
     if (empty($request[$this->colName]) && !empty($this->colParams['required'])) {
-      throw new \Exception('Вы не заполнили: ' . $this->colLabel());
+        throw new \Exception('Вы не заполнили: ' . $this->colLabel());
     }
     if (!empty($this->colParams['validator'])) {
-      $modelName = $this->modelName;
-      $validator = $modelName::validator($this->colParams['validator']);
-      $validator($this->activeForm, $request);
+        $modelName = $this->modelName;
+        $validator = $modelName::validator($this->colParams['validator']);
+        $validator($this->activeForm, $request);
+    }
     }
-  }
 
 }

system/modules/Ecommerce/appAdminControllers/EcommerceController.php

Indentation +36 added lines, -36 removed lines

@@ -10,28 +10,28 @@ 
  */
 class EcommerceController extends adminController {
 
-  public function dashboardAction() {
+    public function dashboardAction() {
     $this->view->setTitle('Онлайн магазин');
     $forms = \Ecommerce\Item::$magicForms;
     \Ecommerce\Item::$forms['simpleItem']['handler']();
     $this->view->page();
-  }
+    }
 
-  public function configureAction() {
+    public function configureAction() {
     if (!empty($_POST['config'])) {
-      $config = App::$cur->ecommerce->config;
-      $config['view_empty_warehouse'] = empty($_POST['config']['view_empty_warehouse']) ? false : true;
-      $config['view_empty_image'] = empty($_POST['config']['view_empty_image']) ? false : true;
-      $config['sell_empty_warehouse'] = empty($_POST['config']['sell_empty_warehouse']) ? false : true;
-      $config['sell_over_warehouse'] = empty($_POST['config']['sell_over_warehouse']) ? false : true;
-      $config['notify_mail'] = $_POST['config']['notify_mail'];
-      $config['defaultCategoryView'] = $_POST['config']['defaultCategoryView'];
-      $config['defaultCurrency'] = $_POST['config']['defaultCurrency'];
-      $config['orderPrefix'] = $_POST['config']['orderPrefix'];
-      $config['show_zero_price'] = empty($_POST['config']['show_zero_price']) ? false : true;
-      $config['show_without_price'] = empty($_POST['config']['show_without_price']) ? false : true;
-      Config::save('module', $config, 'Ecommerce');
-      Tools::redirect('/admin/ecommerce/configure', 'Настройки были изменены', 'success');
+        $config = App::$cur->ecommerce->config;
+        $config['view_empty_warehouse'] = empty($_POST['config']['view_empty_warehouse']) ? false : true;
+        $config['view_empty_image'] = empty($_POST['config']['view_empty_image']) ? false : true;
+        $config['sell_empty_warehouse'] = empty($_POST['config']['sell_empty_warehouse']) ? false : true;
+        $config['sell_over_warehouse'] = empty($_POST['config']['sell_over_warehouse']) ? false : true;
+        $config['notify_mail'] = $_POST['config']['notify_mail'];
+        $config['defaultCategoryView'] = $_POST['config']['defaultCategoryView'];
+        $config['defaultCurrency'] = $_POST['config']['defaultCurrency'];
+        $config['orderPrefix'] = $_POST['config']['orderPrefix'];
+        $config['show_zero_price'] = empty($_POST['config']['show_zero_price']) ? false : true;
+        $config['show_without_price'] = empty($_POST['config']['show_without_price']) ? false : true;
+        Config::save('module', $config, 'Ecommerce');
+        Tools::redirect('/admin/ecommerce/configure', 'Настройки были изменены', 'success');
     }
     $managers = [
         'Ecommerce\Delivery',
@@ -51,51 +51,51 @@ 
     ];
     $this->view->setTitle('Настройки магазина');
     $this->view->page(['data' => compact('managers')]);
-  }
+    }
 
-  public function reBlockIndexAction() {
+    public function reBlockIndexAction() {
     set_time_limit(0);
     $carts = Cart::getList();
     foreach ($carts as $cart) {
-      $cart->save();
+        $cart->save();
     }
     Tools::redirect('/admin/ecommerce/configure', 'Данные о блокировках обновлены');
-  }
+    }
 
-  public function reSearchIndexAction($i = 0) {
+    public function reSearchIndexAction($i = 0) {
     set_time_limit(0);
     $count = 100;
     $items = Ecommerce\Item::getList(['start' => $i * $count, 'limit' => $count]);
     if (!$items) {
-      Tools::redirect('/admin/ecommerce/configure', 'Поисковый индекс обновлен');
+        Tools::redirect('/admin/ecommerce/configure', 'Поисковый индекс обновлен');
     } else {
-      $i++;
-      foreach ($items as $key => $item) {
+        $i++;
+        foreach ($items as $key => $item) {
         $item->save();
         unset($items[$key]);
         unset($item);
-      }
-      echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
-      Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+        }
+        echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
+        Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+    }
     }
-  }
 
-  public function newOrdersSubscribeAction() {
+    public function newOrdersSubscribeAction() {
     $this->Notifications->subscribe('Ecommerce-orders');
-  }
+    }
 
-  public function closeCartAction($cartId = 0) {
+    public function closeCartAction($cartId = 0) {
     $cart = Ecommerce\Cart::get((int) $cartId);
     $result = new Server\Result();
     if ($cart && $cart->cart_status_id != 5) {
-      $cart->cart_status_id = 5;
-      $cart->save();
-      $result->successMsg = 'Заказ был завершен';
-      $result->send();
+        $cart->cart_status_id = 5;
+        $cart->save();
+        $result->successMsg = 'Заказ был завершен';
+        $result->send();
     }
     $result->success = false;
     $result->content = 'Такая корзина не найдена';
     $result->send();
-  }
+    }
 
 }