Completed
Push — master ( 5bbc33...8440a4 )
by Alexey
07:26
created
system/modules/Ecommerce/models/Delivery.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -13,65 +13,65 @@  discard block
 block discarded – undo
13 13
 
14 14
 class Delivery extends \Model {
15 15
 
16
-  public static $objectName = 'Доставка';
17
-  public static $cols = [
18
-      //Основные параметры
19
-      'name' => ['type' => 'text'],
20
-      'price' => ['type' => 'decimal'],
21
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
22
-      'price_text' => ['type' => 'textarea'],
23
-      'max_cart_price' => ['type' => 'decimal'],
24
-      'icon_file_id' => ['type' => 'image'],
25
-      'info' => ['type' => 'html'],
26
-      'disabled' => ['type' => 'bool'],
27
-      //Системные
28
-      'weight' => ['type' => 'number'],
29
-      'date_create' => ['type' => 'dateTime'],
30
-      //Менеджеры
31
-      'field' => ['type' => 'dataManager', 'relation' => 'fields'],
32
-      'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
33
-  ];
34
-  public static $labels = [
35
-      'name' => 'Название',
36
-      'price' => 'Стоимость',
37
-      'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
38
-      'max_cart_price' => 'Басплатно при',
39
-      'icon_file_id' => 'Иконка',
40
-      'currency_id' => 'Валюта',
41
-      'info' => 'Дополнительная информация',
42
-      'priceChanger' => 'Градация стоимости',
43
-      'field' => 'Поля',
44
-      'disabled' => 'Отключено',
45
-  ];
46
-  public static $dataManagers = [
47
-      'manager' => [
48
-          'name' => 'Варианты доставки',
49
-          'cols' => [
50
-              'name',
51
-              'price',
52
-              'currency_id',
53
-              'max_cart_price',
54
-              'disabled',
55
-              'field',
56
-              'priceChanger',
57
-          ],
58
-          'sortMode' => true
59
-      ],
60
-  ];
61
-  public static $forms = [
62
-      'manager' => [
63
-          'map' => [
64
-              ['name', 'disabled'],
65
-              ['max_cart_price', 'icon_file_id'],
66
-              ['price', 'currency_id'],
67
-              ['price_text'],
68
-              ['info'],
69
-              ['priceChanger'],
70
-              ['field']
71
-          ]
72
-  ]];
16
+    public static $objectName = 'Доставка';
17
+    public static $cols = [
18
+        //Основные параметры
19
+        'name' => ['type' => 'text'],
20
+        'price' => ['type' => 'decimal'],
21
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
22
+        'price_text' => ['type' => 'textarea'],
23
+        'max_cart_price' => ['type' => 'decimal'],
24
+        'icon_file_id' => ['type' => 'image'],
25
+        'info' => ['type' => 'html'],
26
+        'disabled' => ['type' => 'bool'],
27
+        //Системные
28
+        'weight' => ['type' => 'number'],
29
+        'date_create' => ['type' => 'dateTime'],
30
+        //Менеджеры
31
+        'field' => ['type' => 'dataManager', 'relation' => 'fields'],
32
+        'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
33
+    ];
34
+    public static $labels = [
35
+        'name' => 'Название',
36
+        'price' => 'Стоимость',
37
+        'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
38
+        'max_cart_price' => 'Басплатно при',
39
+        'icon_file_id' => 'Иконка',
40
+        'currency_id' => 'Валюта',
41
+        'info' => 'Дополнительная информация',
42
+        'priceChanger' => 'Градация стоимости',
43
+        'field' => 'Поля',
44
+        'disabled' => 'Отключено',
45
+    ];
46
+    public static $dataManagers = [
47
+        'manager' => [
48
+            'name' => 'Варианты доставки',
49
+            'cols' => [
50
+                'name',
51
+                'price',
52
+                'currency_id',
53
+                'max_cart_price',
54
+                'disabled',
55
+                'field',
56
+                'priceChanger',
57
+            ],
58
+            'sortMode' => true
59
+        ],
60
+    ];
61
+    public static $forms = [
62
+        'manager' => [
63
+            'map' => [
64
+                ['name', 'disabled'],
65
+                ['max_cart_price', 'icon_file_id'],
66
+                ['price', 'currency_id'],
67
+                ['price_text'],
68
+                ['info'],
69
+                ['priceChanger'],
70
+                ['field']
71
+            ]
72
+    ]];
73 73
 
74
-  public static function relations() {
74
+    public static function relations() {
75 75
     return [
76 76
         'icon' => [
77 77
             'model' => 'Files\File',
@@ -92,6 +92,6 @@  discard block
 block discarded – undo
92 92
             'col' => 'delivery_id'
93 93
         ]
94 94
     ];
95
-  }
95
+    }
96 96
 
97 97
 }
Please login to merge, or discard this patch.
system/modules/Dashboard/appAdminControllers/DashboardController.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -10,38 +10,38 @@
 block discarded – undo
10 10
  */
11 11
 class DashboardController extends adminController {
12 12
 
13
-  public function indexAction() {
13
+    public function indexAction() {
14 14
     $sections = $this->module->getSnippets('adminDashboardWidget');
15 15
     $this->view->setTitle('Панель управления');
16 16
     $this->view->page(['data' => compact('sections')]);
17
-  }
17
+    }
18 18
 
19
-  public function siteConfigAction() {
19
+    public function siteConfigAction() {
20 20
     if (isset($_POST['site_name'])) {
21
-      $config = \App::$primary->config;
22
-      $config['site']['name'] = $_POST['site_name'];
23
-      $config['site']['company_name'] = $_POST['company_name'];
24
-      $config['site']['email'] = $_POST['site_email'];
25
-      $config['site']['keywords'] = $_POST['site_keywords'];
26
-      $config['site']['description'] = $_POST['site_description'];
27
-      $config['site']['domain'] = $_POST['site_domain'];
28
-      if (isset($_POST['metatags'])) {
21
+        $config = \App::$primary->config;
22
+        $config['site']['name'] = $_POST['site_name'];
23
+        $config['site']['company_name'] = $_POST['company_name'];
24
+        $config['site']['email'] = $_POST['site_email'];
25
+        $config['site']['keywords'] = $_POST['site_keywords'];
26
+        $config['site']['description'] = $_POST['site_description'];
27
+        $config['site']['domain'] = $_POST['site_domain'];
28
+        if (isset($_POST['metatags'])) {
29 29
         $config['site']['metatags'] = $_POST['metatags'];
30
-      }
31
-      if (!empty($_FILES['site_logo']['tmp_name'])) {
30
+        }
31
+        if (!empty($_FILES['site_logo']['tmp_name'])) {
32 32
         $fileId = $this->Files->upload($_FILES['site_logo'], array('file_code' => 'site_logo'));
33 33
         $config['site']['site_logo'] = Files\File::get($fileId)->path;
34
-      }
35
-      Config::save('app', $config);
36
-      Tools::redirect('/admin/dashboard/siteConfig', 'Изменения сохранены', 'success');
34
+        }
35
+        Config::save('app', $config);
36
+        Tools::redirect('/admin/dashboard/siteConfig', 'Изменения сохранены', 'success');
37 37
     }
38 38
 
39 39
     $this->view->setTitle('Общие настройки сайта');
40 40
     $this->view->page();
41
-  }
41
+    }
42 42
 
43
-  public function phpInfoAction() {
43
+    public function phpInfoAction() {
44 44
     $this->view->page();
45
-  }
45
+    }
46 46
 
47 47
 }
Please login to merge, or discard this patch.