Completed
Push — master ( 85b626...d4133d )
by Alexey
04:53
created
system/modules/Ecommerce/models/Item/Option.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -13,63 +13,63 @@  discard block
 block discarded – undo
13 13
 
14 14
 class Option extends \Model {
15 15
 
16
-  public static $objectName = 'Свойство';
17
-  public static $cols = [
18
-      //Основные параметры
19
-      'name' => ['type' => 'text'],
20
-      'filter_name' => ['type' => 'text'],
21
-      'image_file_id' => ['type' => 'image'],
22
-      'code' => ['type' => 'text'],
23
-      'type' => ['type' => 'text'],
24
-      'postfix' => ['type' => 'text'],
25
-      'default_val' => ['type' => 'text'],
26
-      'view' => ['type' => 'bool'],
27
-      'searchable' => ['type' => 'bool'],
28
-      //Системные
29
-      'weight' => ['type' => 'number'],
30
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
31
-      'advance' => ['type' => 'text'],
32
-      'date_create' => ['type' => 'dateTime'],
33
-      //Менеджеры
34
-      'item' => ['type' => 'dataManager', 'relation' => 'items'],
35
-  ];
36
-  public static $labels = [
37
-      'name' => 'Название',
38
-      'filter_name' => 'Название в фильтре',
39
-      'image_file_id' => 'Иконка',
40
-      'code' => 'Код',
41
-      'type' => 'Тип',
42
-      'postfix' => 'Постфикс',
43
-      'default_val' => 'Значение по умолчанию',
44
-      'view' => 'Отображается',
45
-      'searchable' => 'Используется при поиске',
46
-      'weight' => 'Вес сортировки',
47
-      'advance' => 'Дополнительные параметры',
48
-      'user_id' => 'Создатель',
49
-      'date_create' => 'Дата создания',
50
-      'item' => 'Значения для списка'
51
-  ];
52
-  public static $dataManagers = [
53
-      'manager' => [
54
-          'name' => 'Свойства товаров',
55
-          'cols' => [
56
-              'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
57
-          ]
58
-      ]
59
-  ];
60
-  public static $forms = [
61
-      'manager' => [
62
-          'map' => [
63
-              ['name', 'filter_name'],
64
-              ['code', 'type', 'image_file_id'],
65
-              ['default_val', 'postfix'],
66
-              ['view', 'searchable'],
67
-              ['item']
68
-          ]
69
-      ]
70
-  ];
16
+    public static $objectName = 'Свойство';
17
+    public static $cols = [
18
+        //Основные параметры
19
+        'name' => ['type' => 'text'],
20
+        'filter_name' => ['type' => 'text'],
21
+        'image_file_id' => ['type' => 'image'],
22
+        'code' => ['type' => 'text'],
23
+        'type' => ['type' => 'text'],
24
+        'postfix' => ['type' => 'text'],
25
+        'default_val' => ['type' => 'text'],
26
+        'view' => ['type' => 'bool'],
27
+        'searchable' => ['type' => 'bool'],
28
+        //Системные
29
+        'weight' => ['type' => 'number'],
30
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
31
+        'advance' => ['type' => 'text'],
32
+        'date_create' => ['type' => 'dateTime'],
33
+        //Менеджеры
34
+        'item' => ['type' => 'dataManager', 'relation' => 'items'],
35
+    ];
36
+    public static $labels = [
37
+        'name' => 'Название',
38
+        'filter_name' => 'Название в фильтре',
39
+        'image_file_id' => 'Иконка',
40
+        'code' => 'Код',
41
+        'type' => 'Тип',
42
+        'postfix' => 'Постфикс',
43
+        'default_val' => 'Значение по умолчанию',
44
+        'view' => 'Отображается',
45
+        'searchable' => 'Используется при поиске',
46
+        'weight' => 'Вес сортировки',
47
+        'advance' => 'Дополнительные параметры',
48
+        'user_id' => 'Создатель',
49
+        'date_create' => 'Дата создания',
50
+        'item' => 'Значения для списка'
51
+    ];
52
+    public static $dataManagers = [
53
+        'manager' => [
54
+            'name' => 'Свойства товаров',
55
+            'cols' => [
56
+                'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
57
+            ]
58
+        ]
59
+    ];
60
+    public static $forms = [
61
+        'manager' => [
62
+            'map' => [
63
+                ['name', 'filter_name'],
64
+                ['code', 'type', 'image_file_id'],
65
+                ['default_val', 'postfix'],
66
+                ['view', 'searchable'],
67
+                ['item']
68
+            ]
69
+        ]
70
+    ];
71 71
 
72
-  public static function relations() {
72
+    public static function relations() {
73 73
     return [
74 74
         'user' => [
75 75
             'model' => 'Users\User',
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
             'col' => 'image_file_id'
86 86
         ],
87 87
     ];
88
-  }
88
+    }
89 89
 
90
-  public function beforeSave() {
90
+    public function beforeSave() {
91 91
     if (!isset($this->id)) {
92
-      $this->user_id = \Users\User::$cur->id;
92
+        $this->user_id = \Users\User::$cur->id;
93 93
     }
94 94
     if ($this->advance && is_array($this->advance)) {
95
-      $this->advance = json_encode($this->advance);
95
+        $this->advance = json_encode($this->advance);
96
+    }
96 97
     }
97
-  }
98 98
 
99 99
 }
Please login to merge, or discard this patch.
system/modules/Exchange1c/objects/Parser/Item/Options.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -13,67 +13,67 @@
 block discarded – undo
13 13
 
14 14
 class Options extends \Migrations\Parser {
15 15
 
16
-  static $options;
16
+    static $options;
17 17
 
18
-  public function parse() {
18
+    public function parse() {
19 19
     if (!Options::$options) {
20
-      Options::$options = \Ecommerce\Item\Option::getList();
20
+        Options::$options = \Ecommerce\Item\Option::getList();
21 21
     }
22 22
     $options = [];
23 23
     $modelName = 'Ecommerce\Item\Option';
24 24
     foreach ($this->data['ЗначенияСвойства'] as $opt) {
25
-      $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
26
-      if (Options::$options[$optionId]->type == 'select') {
25
+        $optionId = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option'][$opt['Ид']]->object_id;
26
+        if (Options::$options[$optionId]->type == 'select') {
27 27
         if (empty($options[$optionId])) {
28
-          $options[$optionId] = [];
28
+            $options[$optionId] = [];
29 29
         } else {
30
-          if (!Options::$options[$optionId]->advance) {
30
+            if (!Options::$options[$optionId]->advance) {
31 31
             Options::$options[$optionId]->advance = ['multi' => true];
32 32
             Options::$options[$optionId]->save();
33
-          }
33
+            }
34 34
         }
35 35
         $options[$optionId][] = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']]->object_id;
36
-      } else {
36
+        } else {
37 37
         $options[$optionId] = $opt['Значение'];
38
-      }
38
+        }
39 39
     }
40 40
     $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id]]);
41 41
     foreach ($itemParams as $itemParam) {
42
-      if (Options::$options[$itemParam->item_option_id]->type == 'select') {
42
+        if (Options::$options[$itemParam->item_option_id]->type == 'select') {
43 43
         if (empty($options[$itemParam->item_option_id]) || !in_array($itemParam->value, $options[$itemParam->item_option_id])) {
44
-          $itemParam->delete();
44
+            $itemParam->delete();
45 45
         } else {
46
-          unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
46
+            unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
47 47
         }
48
-      } else {
48
+        } else {
49 49
         if (empty($options[$itemParam->item_option_id])) {
50
-          $itemParam->delete();
50
+            $itemParam->delete();
51 51
         } else {
52
-          $itemParam->value = $options[$itemParam->item_option_id];
53
-          $itemParam->save();
54
-          unset($options[$itemParam->item_option_id]);
52
+            $itemParam->value = $options[$itemParam->item_option_id];
53
+            $itemParam->save();
54
+            unset($options[$itemParam->item_option_id]);
55
+        }
55 56
         }
56
-      }
57 57
     }
58 58
     foreach ($options as $optionId => $values) {
59
-      if (is_array($values)) {
59
+        if (is_array($values)) {
60 60
         foreach ($values as $value) {
61
-          $itemParam = new \Ecommerce\Item\Param([
62
-              'item_option_id' => $optionId,
63
-              'item_id' => $this->model->id,
64
-              'value' => $value
65
-          ]);
66
-          $itemParam->save();
61
+            $itemParam = new \Ecommerce\Item\Param([
62
+                'item_option_id' => $optionId,
63
+                'item_id' => $this->model->id,
64
+                'value' => $value
65
+            ]);
66
+            $itemParam->save();
67 67
         }
68
-      } else {
68
+        } else {
69 69
         $itemParam = new \Ecommerce\Item\Param([
70 70
             'item_option_id' => $optionId,
71 71
             'item_id' => $this->model->id,
72 72
             'value' => $values
73 73
         ]);
74 74
         $itemParam->save();
75
-      }
75
+        }
76
+    }
76 77
     }
77
-  }
78 78
 
79 79
 }
Please login to merge, or discard this patch.