injitools / cms-Inji

system/modules/Ecommerce/models/Cart.php

Indentation +205 added lines, -205 removed lines

@@ -13,9 +13,9 @@ 
 
 class Cart extends \Model {
 
-  public static $objectName = 'Корзины';
+    public static $objectName = 'Корзины';
 
-  public static function indexes() {
+    public static function indexes() {
     return [
         'ecommerce_cartStatusBlock' => [
             'type' => 'INDEX',
@@ -37,9 +37,9 @@ 
             ]
         ],
     ];
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'user' => [
             'model' => 'Users\User',
@@ -97,279 +97,279 @@ 
             'model' => 'Ecommerce\Discount',
         ]
     ];
-  }
+    }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     foreach ($this->cartItems as $cartItem) {
-      $cartItem->delete();
+        $cartItem->delete();
     }
     foreach ($this->infos as $info) {
-      $info->delete();
+        $info->delete();
     }
     foreach ($this->extras as $extra) {
-      $extra->delete();
+        $extra->delete();
     }
     foreach ($this->events as $event) {
-      $event->delete();
+        $event->delete();
+    }
     }
-  }
 
-  public static $labels = [
-      'user_id' => 'Пользователь',
-      'cart_status_id' => 'Статус',
-      'delivery_id' => 'Доставка',
-      'comment' => 'Комментарий',
-      'bonus_used' => 'Выгодные рубли',
-      'complete_data' => 'Время заказа',
-      'info' => 'Информация',
-      'items' => 'Товары',
-      'paytype_id' => 'Способ оплаты',
-      'payed' => 'Оплачен',
-      'exported' => 'Выгружено',
-      'warehouse_block' => 'Блокировка товаров',
-      'extra' => 'Доп.',
-      'card_item_id' => 'Дисконтная карта',
-      'info' => 'Информация',
-      'contacts' => 'Информация',
-      'pay' => 'Счета',
-      'sums' => 'Суммы',
-      'deliveryInfo' => 'Для доставки',
-      'discount' => 'Скидки',
-  ];
-  public static $cols = [
-      //Основные параметры
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'cart_status_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'status'],
-      'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
-      'paytype_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'payType'],
-      'card_item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'card'],
-      'warehouse_block' => ['type' => 'bool'],
-      'payed' => ['type' => 'bool'],
-      'comment' => ['type' => 'textarea'],
-      //Системные
-      'exported' => ['type' => 'bool'],
-      'complete_data' => ['type' => 'dateTime'],
-      'date_status' => ['type' => 'dateTime'],
-      'date_last_activ' => ['type' => 'dateTime'],
-      'date_create' => ['type' => 'dateTime'],
-      //Виджеты
-      'sums' => [
-          'type' => 'void',
-          'view' => [
-              'type' => 'widget',
-              'widget' => 'Ecommerce\adminSums',
-          ],
-      ],
-      'contacts' => [
-          'type' => 'void',
-          'view' => [
-              'type' => 'widget',
-              'widget' => 'Ecommerce\admin/contacts',
-          ],
-      ],
-      //Менеджеры
-      'extra' => ['type' => 'dataManager', 'relation' => 'extras'],
-      'pay' => ['type' => 'dataManager', 'relation' => 'pays'],
-      'items' => ['type' => 'dataManager', 'relation' => 'cartItems'],
-      'info' => ['type' => 'dataManager', 'relation' => 'infos'],
-      'deliveryInfo' => ['type' => 'dataManager', 'relation' => 'deliveryInfos'],
-      'discount' => ['type' => 'dataManager', 'relation' => 'discounts'],
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'contacts',
-              'items',
-              'extra',
-              'discount',
-              'sums',
-              'cart_status_id',
-              'delivery_id',
-              'deliveryInfo',
-              'payed',
-              'pay',
-              'complete_data',
-          ],
-          'sortable' => [
-              'cart_status_id',
-              'delivery_id',
-              'payed',
-              'complete_data',
-          ],
-          'filters' => [
-              'cart_status_id',
-              'delivery_id',
-              'payed',
-              'complete_data',
-          ],
-          'preSort' => [
-              'complete_data' => 'desc'
-          ],
-          'actions' => [
-              'Ecommerce\CloseCartBtn', 'Open', 'Edit', 'Delete'
-          ]
-      ]
-  ];
+    public static $labels = [
+        'user_id' => 'Пользователь',
+        'cart_status_id' => 'Статус',
+        'delivery_id' => 'Доставка',
+        'comment' => 'Комментарий',
+        'bonus_used' => 'Выгодные рубли',
+        'complete_data' => 'Время заказа',
+        'info' => 'Информация',
+        'items' => 'Товары',
+        'paytype_id' => 'Способ оплаты',
+        'payed' => 'Оплачен',
+        'exported' => 'Выгружено',
+        'warehouse_block' => 'Блокировка товаров',
+        'extra' => 'Доп.',
+        'card_item_id' => 'Дисконтная карта',
+        'info' => 'Информация',
+        'contacts' => 'Информация',
+        'pay' => 'Счета',
+        'sums' => 'Суммы',
+        'deliveryInfo' => 'Для доставки',
+        'discount' => 'Скидки',
+    ];
+    public static $cols = [
+        //Основные параметры
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'cart_status_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'status'],
+        'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
+        'paytype_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'payType'],
+        'card_item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'card'],
+        'warehouse_block' => ['type' => 'bool'],
+        'payed' => ['type' => 'bool'],
+        'comment' => ['type' => 'textarea'],
+        //Системные
+        'exported' => ['type' => 'bool'],
+        'complete_data' => ['type' => 'dateTime'],
+        'date_status' => ['type' => 'dateTime'],
+        'date_last_activ' => ['type' => 'dateTime'],
+        'date_create' => ['type' => 'dateTime'],
+        //Виджеты
+        'sums' => [
+            'type' => 'void',
+            'view' => [
+                'type' => 'widget',
+                'widget' => 'Ecommerce\adminSums',
+            ],
+        ],
+        'contacts' => [
+            'type' => 'void',
+            'view' => [
+                'type' => 'widget',
+                'widget' => 'Ecommerce\admin/contacts',
+            ],
+        ],
+        //Менеджеры
+        'extra' => ['type' => 'dataManager', 'relation' => 'extras'],
+        'pay' => ['type' => 'dataManager', 'relation' => 'pays'],
+        'items' => ['type' => 'dataManager', 'relation' => 'cartItems'],
+        'info' => ['type' => 'dataManager', 'relation' => 'infos'],
+        'deliveryInfo' => ['type' => 'dataManager', 'relation' => 'deliveryInfos'],
+        'discount' => ['type' => 'dataManager', 'relation' => 'discounts'],
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'contacts',
+                'items',
+                'extra',
+                'discount',
+                'sums',
+                'cart_status_id',
+                'delivery_id',
+                'deliveryInfo',
+                'payed',
+                'pay',
+                'complete_data',
+            ],
+            'sortable' => [
+                'cart_status_id',
+                'delivery_id',
+                'payed',
+                'complete_data',
+            ],
+            'filters' => [
+                'cart_status_id',
+                'delivery_id',
+                'payed',
+                'complete_data',
+            ],
+            'preSort' => [
+                'complete_data' => 'desc'
+            ],
+            'actions' => [
+                'Ecommerce\CloseCartBtn', 'Open', 'Edit', 'Delete'
+            ]
+        ]
+    ];
 
-  public static function itemName($item) {
+    public static function itemName($item) {
     return $item->pk() . '. ' . $item->name();
-  }
+    }
 
-  public static $forms = [
-      'manager' => [
-          'inputs' => [
-              'userSearch' => [
-                  'type' => 'search',
-                  'source' => 'relation',
-                  'relation' => 'user',
-                  'label' => 'Покупатель',
-                  'cols' => [
-                      'info:first_name',
-                      'info:last_name',
-                      'info:middle_name',
-                      'mail'
-                  ],
-                  'col' => 'user_id',
-                  'required' => true,
-                  'showCol' => [
-                      'type' => 'staticMethod',
-                      'class' => 'Ecommerce\Cart',
-                      'method' => 'itemName',
-                  ],
-              ],
-              'cardSearch' => [
-                  'type' => 'search',
-                  'source' => 'relation',
-                  'relation' => 'card',
-                  'label' => 'Дисконтная карта',
-                  'cols' => [
-                      'code',
-                      'user:info:first_name',
-                      'user:info:last_name',
-                      'user:info:middle_name',
-                      'user:mail'
-                  ],
-                  'col' => 'card_item_id',
-              ],
-          ],
-          'map' => [
-              ['userSearch', 'cart_status_id'],
-              ['paytype_id', 'delivery_id'],
-              ['cardSearch', 'comment'],
-              ['warehouse_block', 'complete_data'],
-              ['payed'],
-              ['items'],
-              ['extra'],
-              ['pay'],
-              ['info'],
-              ['deliveryInfo']
-          ]
-      ],
-  ];
+    public static $forms = [
+        'manager' => [
+            'inputs' => [
+                'userSearch' => [
+                    'type' => 'search',
+                    'source' => 'relation',
+                    'relation' => 'user',
+                    'label' => 'Покупатель',
+                    'cols' => [
+                        'info:first_name',
+                        'info:last_name',
+                        'info:middle_name',
+                        'mail'
+                    ],
+                    'col' => 'user_id',
+                    'required' => true,
+                    'showCol' => [
+                        'type' => 'staticMethod',
+                        'class' => 'Ecommerce\Cart',
+                        'method' => 'itemName',
+                    ],
+                ],
+                'cardSearch' => [
+                    'type' => 'search',
+                    'source' => 'relation',
+                    'relation' => 'card',
+                    'label' => 'Дисконтная карта',
+                    'cols' => [
+                        'code',
+                        'user:info:first_name',
+                        'user:info:last_name',
+                        'user:info:middle_name',
+                        'user:mail'
+                    ],
+                    'col' => 'card_item_id',
+                ],
+            ],
+            'map' => [
+                ['userSearch', 'cart_status_id'],
+                ['paytype_id', 'delivery_id'],
+                ['cardSearch', 'comment'],
+                ['warehouse_block', 'complete_data'],
+                ['payed'],
+                ['items'],
+                ['extra'],
+                ['pay'],
+                ['info'],
+                ['deliveryInfo']
+            ]
+        ],
+    ];
 
-  public function checkStage() {
+    public function checkStage() {
     $sum = $this->itemsSum();
     $stages = Cart\Stage::getList(['order' => ['sum', 'asc']]);
     $groups = [];
     foreach ($stages as $stage) {
-      if ($sum->greater(new \Money\Sums([$stage->currency_id => $stage->sum])) || $sum->equal(new \Money\Sums([$stage->currency_id => $stage->sum]))) {
+        if ($sum->greater(new \Money\Sums([$stage->currency_id => $stage->sum])) || $sum->equal(new \Money\Sums([$stage->currency_id => $stage->sum]))) {
         $groups[$stage->group] = $stage;
-      }
+        }
     }
     $discounts = Cart\Discount::getList(['where' => ['cart_id', $this->id]]);
     foreach ($discounts as $discount) {
-      if (!isset($groups[$discount->group]) && $discount->auto) {
+        if (!isset($groups[$discount->group]) && $discount->auto) {
         $discount->delete();
-      }
-      if (isset($groups[$discount->group]) && $groups[$discount->group]->type == 'discount') {
+        }
+        if (isset($groups[$discount->group]) && $groups[$discount->group]->type == 'discount') {
         $discount->discount_id = $groups[$discount->group]->value;
         $discount->save();
         unset($groups[$discount->group]);
-      }
+        }
     }
     foreach ($groups as $group) {
-      if ($group && $group->type == 'discount') {
+        if ($group && $group->type == 'discount') {
         $rel = $this->addRelation('discounts', $group->value);
         $rel->auto = true;
         $rel->group = 'discount';
         $rel->save();
-      }
+        }
+    }
     }
-  }
 
-  public function needDelivery() {
+    public function needDelivery() {
     foreach ($this->cartItems as $cartItem) {
-      if ($cartItem->item->type && $cartItem->item->type->delivery) {
+        if ($cartItem->item->type && $cartItem->item->type->delivery) {
         return true;
-      }
+        }
     }
     return false;
-  }
+    }
 
-  public function deliverySum() {
+    public function deliverySum() {
     $sum = new \Money\Sums([]);
     if ($this->delivery && $this->needDelivery()) {
-      $sums = $this->itemsSum();
-      $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]);
-      if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
+        $sums = $this->itemsSum();
+        $deliveryPrice = new \Money\Sums([$this->delivery->currency_id => $this->delivery->max_cart_price]);
+        if ($this->delivery->max_cart_price && $sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
         $sum->sums = [$this->delivery->currency_id => 0];
-      } else if ($this->delivery->prices) {
+        } else if ($this->delivery->prices) {
         foreach ($this->delivery->prices(['order' => ['cart_price', 'asc']]) as $delPrice) {
-          $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]);
-          if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
+            $deliveryPrice = new \Money\Sums([$delPrice->currency_id => $delPrice->cart_price]);
+            if ($sums->greater($deliveryPrice) || $sums->equal($deliveryPrice)) {
             $sum->sums = [$delPrice->currency_id => $delPrice->price];
-          }
+            }
         }
         if (!$sum->sums) {
-          $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
+            $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
         }
-      } else {
+        } else {
         $sum->sums = [$this->delivery->currency_id => $this->delivery->price];
-      }
+        }
     }
     return $sum;
-  }
+    }
 
-  public function hasDiscount() {
+    public function hasDiscount() {
     return (bool) $this->card || $this->discounts;
-  }
+    }
 
-  public function discountSum() {
+    public function discountSum() {
     $sums = [];
     foreach ($this->cartItems as $cartItem) {
-      $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->discount() * $cartItem->count : $cartItem->discount() * $cartItem->count;
+        $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->discount() * $cartItem->count : $cartItem->discount() * $cartItem->count;
     }
     return new \Money\Sums($sums);
-  }
+    }
 
-  public function finalSum() {
+    public function finalSum() {
     $sums = $this->itemsSum();
     $sums = $sums->minus($this->discountSum());
     $sums = $sums->plus($this->deliverySum());
     return $sums;
-  }
+    }
 
-  public function itemsSum() {
+    public function itemsSum() {
     $cart = Cart::get($this->id);
     $sums = [];
     foreach ($cart->cartItems as $cartItem) {
-      if (!$cartItem->price) {
+        if (!$cartItem->price) {
         continue;
-      }
-      $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->price->price * $cartItem->count : $cartItem->price->price * $cartItem->count;
+        }
+        $sums[$cartItem->price->currency_id] = isset($sums[$cartItem->price->currency_id]) ? $sums[$cartItem->price->currency_id] + $cartItem->price->price * $cartItem->count : $cartItem->price->price * $cartItem->count;
     }
     return new \Money\Sums($sums);
-  }
+    }
 
-  public function addItem($offer_price_id, $count = 1, $final_price = 0) {
+    public function addItem($offer_price_id, $count = 1, $final_price = 0) {
     $price = Item\Offer\Price::get((int) $offer_price_id);
 
     if (!$price) {
-      return false;
+        return false;
     }
 
     if ($count <= 0) {
-      $count = 1;
+        $count = 1;
     }
 
     $cartItem = new Cart\Item();
@@ -380,12 +380,12 @@ 
     $cartItem->final_price = $final_price ? $final_price : $price->price;
     $cartItem->save();
     return true;
-  }
+    }
 
-  public function calc($save = true) {
+    public function calc($save = true) {
     if ($save) {
-      $this->save();
+        $this->save();
+    }
     }
-  }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
   ];
 
   public static function itemName($item) {
-    return $item->pk() . '. ' . $item->name();
+    return $item->pk().'. '.$item->name();
   }
 
   public static $forms = [

system/modules/Ecommerce/models/Delivery/Field.php

Indentation +38 added lines, -38 removed lines

@@ -13,44 +13,44 @@ 
 
 class Field extends \Model {
 
-  public static $objectName = 'Поле доставки';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'type' => ['type' => 'text'],
-      'userfield' => ['type' => 'text'],
-      'required' => ['type' => 'bool'],
-      'save' => ['type' => 'bool'],
-      'fieldItem'=>['type'=>'dataManager','relation'=>'fieldItems'],
-      //Системные
-      'date_create' => ['type' => 'dateTime'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'type' => 'Тип',
-      'userfield' => 'Связь с данными пользователя',
-      'required' => 'Обязательно',
-      'save' => 'Сохраняется',
-      'fieldItem' => 'Значения для списка',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'name', 'type', 'userfield', 'required','fieldItem',  'save'
-          ],
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'type'],
-              ['required', 'save'],
-              [ 'userfield']
-          ]
-      ]
-  ];
+    public static $objectName = 'Поле доставки';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'type' => ['type' => 'text'],
+        'userfield' => ['type' => 'text'],
+        'required' => ['type' => 'bool'],
+        'save' => ['type' => 'bool'],
+        'fieldItem'=>['type'=>'dataManager','relation'=>'fieldItems'],
+        //Системные
+        'date_create' => ['type' => 'dateTime'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'type' => 'Тип',
+        'userfield' => 'Связь с данными пользователя',
+        'required' => 'Обязательно',
+        'save' => 'Сохраняется',
+        'fieldItem' => 'Значения для списка',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'name', 'type', 'userfield', 'required','fieldItem',  'save'
+            ],
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'type'],
+                ['required', 'save'],
+                [ 'userfield']
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'fieldItems' => [
             'model' => 'Ecommerce\Delivery\Field\Item',
@@ -58,6 +58,6 @@ 
             'type' => 'many'
         ],
     ];
-  }
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
       'userfield' => ['type' => 'text'],
       'required' => ['type' => 'bool'],
       'save' => ['type' => 'bool'],
-      'fieldItem'=>['type'=>'dataManager','relation'=>'fieldItems'],
+      'fieldItem'=>['type'=>'dataManager', 'relation'=>'fieldItems'],
       //Системные
       'date_create' => ['type' => 'dateTime'],
   ];
@@ -36,7 +36,7 @@ 
   public static $dataManagers = [
       'manager' => [
           'cols' => [
-              'name', 'type', 'userfield', 'required','fieldItem',  'save'
+              'name', 'type', 'userfield', 'required', 'fieldItem', 'save'
           ],
       ]
   ];
@@ -45,7 +45,7 @@ 
           'map' => [
               ['name', 'type'],
               ['required', 'save'],
-              [ 'userfield']
+              ['userfield']
           ]
       ]
   ];

system/modules/Ecommerce/models/Delivery/DeliveryFieldLink.php

Indentation +25 added lines, -25 removed lines

@@ -13,31 +13,31 @@ 
 
 class DeliveryFieldLink extends \Model {
 
-  public static $labels = [
-      'delivery_id' => 'Тип доставки',
-      'delivery_field_id' => 'Поле доставки'
-  ];
-  public static $cols = [
-      'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
-      'delivery_field_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'field'],
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime']
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Поля для доставки',
-          'cols' => ['delivery_id', 'delivery_field_id', 'date_create'],
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['delivery_id', 'delivery_field_id'],
-          ]
-      ]
-  ];
+    public static $labels = [
+        'delivery_id' => 'Тип доставки',
+        'delivery_field_id' => 'Поле доставки'
+    ];
+    public static $cols = [
+        'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
+        'delivery_field_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'field'],
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime']
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Поля для доставки',
+            'cols' => ['delivery_id', 'delivery_field_id', 'date_create'],
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['delivery_id', 'delivery_field_id'],
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'field' => [
             'model' => 'Ecommerce\Delivery\Field',
@@ -48,6 +48,6 @@ 
             'col' => 'delivery_id'
         ],
     ];
-  }
+    }
 
 }

system/modules/Ecommerce/models/Delivery/Price.php

Indentation +29 added lines, -29 removed lines

@@ -13,35 +13,35 @@ 
 
 class Price extends \Model {
 
-  public static $labels = [
-      'delivery_id' => 'Тип доставки',
-      'cart_price' => 'Сумма корзины',
-      'price' => 'Стоимость доставки',
-      'currency_id' => 'Валюта',
-  ];
-  public static $cols = [
-      'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
-      'cart_price' => ['type' => 'number'],
-      'price' => ['type' => 'number'],
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
-      'date_create' => ['type' => 'dateTime']
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Цены для стоимости корзин',
-          'cols' => ['delivery_id', 'cart_price', 'price', 'currency_id'],
-      ]
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['delivery_id', 'currency_id'],
-              ['cart_price', 'price'],
-          ]
-      ]
-  ];
+    public static $labels = [
+        'delivery_id' => 'Тип доставки',
+        'cart_price' => 'Сумма корзины',
+        'price' => 'Стоимость доставки',
+        'currency_id' => 'Валюта',
+    ];
+    public static $cols = [
+        'delivery_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'delivery'],
+        'cart_price' => ['type' => 'number'],
+        'price' => ['type' => 'number'],
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
+        'date_create' => ['type' => 'dateTime']
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Цены для стоимости корзин',
+            'cols' => ['delivery_id', 'cart_price', 'price', 'currency_id'],
+        ]
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['delivery_id', 'currency_id'],
+                ['cart_price', 'price'],
+            ]
+        ]
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'delivery' => [
             'model' => 'Ecommerce\Delivery',
@@ -52,6 +52,6 @@ 
             'col' => 'currency_id'
         ],
     ];
-  }
+    }
 
 }

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

Spacing +3 added lines, -3 removed lines

@@ -25,11 +25,11 @@ 
     $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
     $this->model->image_file_id = 0;
     foreach ($value as $key => $imagePath) {
-      if (!$imagePath || !file_exists($dir . '/' . $imagePath)) {
+      if (!$imagePath || !file_exists($dir.'/'.$imagePath)) {
         continue;
       }
       $notEq = true;
-      $md5Cur = md5_file($dir . '/' . $imagePath);
+      $md5Cur = md5_file($dir.'/'.$imagePath);
       foreach ($this->model->images as $imageId => $image) {
         $file = $image->file;
         $md5File = '';
@@ -47,7 +47,7 @@ 
         }
       }
       if ($notEq) {
-        $file_id = \App::$primary->files->uploadFromUrl($dir . '/' . $imagePath, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+        $file_id = \App::$primary->files->uploadFromUrl($dir.'/'.$imagePath, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         $image = new \Ecommerce\Item\Image([
             'item_id' => $this->model->pk(),
             'file_id' => $file_id

Indentation +31 added lines, -31 removed lines

@@ -13,65 +13,65 @@
 
 class Images extends \Migrations\Parser {
 
-  public function parse() {
+    public function parse() {
     if (is_null($this->data)) {
-      return;
+        return;
     }
     $value = $this->data;
     if (!is_array($value)) {
-      $value = [$value];
+        $value = [$value];
     }
     $ids = [];
     $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
     $this->model->image_file_id = 0;
     foreach ($value as $key => $imagePath) {
-      if (!$imagePath || !file_exists($dir . '/' . $imagePath)) {
+        if (!$imagePath || !file_exists($dir . '/' . $imagePath)) {
         continue;
-      }
-      $notEq = true;
-      $md5Cur = md5_file($dir . '/' . $imagePath);
-      foreach ($this->model->images as $imageId => $image) {
+        }
+        $notEq = true;
+        $md5Cur = md5_file($dir . '/' . $imagePath);
+        foreach ($this->model->images as $imageId => $image) {
         if (!$image->file) {
-          $image->delete();
-          continue;
+            $image->delete();
+            continue;
         }
         $file = $image->file;
         $md5File = '';
         if ($file->md5) {
-          $md5File = $file->md5;
+            $md5File = $file->md5;
         } elseif (file_exists($file->getRealPath())) {
-          $md5File = $file->md5 = md5_file($file->getRealPath());
-          $file->save();
+            $md5File = $file->md5 = md5_file($file->getRealPath());
+            $file->save();
         }
 
         if ($file && file_exists($file->getRealPath()) && $md5Cur == $md5File) {
-          $notEq = false;
-          $ids[] = $imageId;
-          break;
+            $notEq = false;
+            $ids[] = $imageId;
+            break;
+        }
         }
-      }
-      if ($notEq) {
+        if ($notEq) {
         $file_id = \App::$primary->files->uploadFromUrl($dir . '/' . $imagePath, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         if ($file_id) {
-          $image = new \Ecommerce\Item\Image([
-              'item_id' => $this->model->pk(),
-              'file_id' => $file_id
-          ]);
-          $image->save();
-          $ids[] = $image->id;
+            $image = new \Ecommerce\Item\Image([
+                'item_id' => $this->model->pk(),
+                'file_id' => $file_id
+            ]);
+            $image->save();
+            $ids[] = $image->id;
         }
-      } else {
+        } else {
         $image->weight = $key;
-      }
-      if ($image && !$this->model->image_file_id) {
+        }
+        if ($image && !$this->model->image_file_id) {
         $this->model->image_file_id = $image->file_id;
-      }
+        }
     }
     foreach ($this->model->images as $imageId => $image) {
-      if (!in_array($imageId, $ids)) {
+        if (!in_array($imageId, $ids)) {
         $image->delete();
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Ecommerce/appControllers/EcommerceController.php

Indentation +80 added lines, -80 removed lines

@@ -10,42 +10,42 @@ 
  */
 class ecommerceController extends Controller {
 
-  public function buyCardAction() {
+    public function buyCardAction() {
     $this->view->setTitle('Покупка карты');
     $bread = [];
     $bread[] = ['text' => 'Покупка карты'];
     $user = Users\User::$cur;
     if (!empty($_POST) && !empty($_POST['card_id'])) {
-      $error = false;
-      $card = \Ecommerce\Card::get((int) $_POST['card_id']);
-      if (!$card) {
+        $error = false;
+        $card = \Ecommerce\Card::get((int) $_POST['card_id']);
+        if (!$card) {
         $error = true;
         Msg::add('Такой карты не существует', 'danger');
-      }
+        }
 
-      if (!Users\User::$cur->id) {
+        if (!Users\User::$cur->id) {
         $user_id = $this->Users->registration($_POST, true);
         if (!$user_id) {
-          $error = true;
-          $user = null;
+            $error = true;
+            $user = null;
         } else {
-          $user = Users\User::get($user_id);
+            $user = Users\User::get($user_id);
+        }
         }
-      }
-      $userCard = \Ecommerce\Card\Item::get([['card_id', $card->id], ['user_id', $user->id]]);
-      if ($userCard) {
+        $userCard = \Ecommerce\Card\Item::get([['card_id', $card->id], ['user_id', $user->id]]);
+        if ($userCard) {
         $error = true;
         Msg::add('У вас уже есть такая карта', 'danger');
-      }
+        }
 
-      $fields = \Ecommerce\UserAdds\Field::getList();
-      foreach ($fields as $field) {
+        $fields = \Ecommerce\UserAdds\Field::getList();
+        foreach ($fields as $field) {
         if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
-          $error = 1;
-          Msg::add('Вы не указали: ' . $field->name);
+            $error = 1;
+            Msg::add('Вы не указали: ' . $field->name);
+        }
         }
-      }
-      if (!$error) {
+        if (!$error) {
         $cardItem = new \Ecommerce\Card\Item();
         $cardItem->card_id = $card->id;
         $cardItem->user_id = $user->id;
@@ -58,7 +58,7 @@ 
         $cart->date_status = date('Y-m-d H:i:s');
         $cart->complete_data = date('Y-m-d H:i:s');
         if (!empty($_SESSION['cart']['cart_id'])) {
-          $cart->card_item_id = $cardItem->id;
+            $cart->card_item_id = $cardItem->id;
         }
         $cart->save();
 
@@ -73,69 +73,69 @@ 
         $extra->info = 'card:' . $card->id . '|cardItem:' . $cardItem->id;
         $extra->save();
         Tools::redirect('/ecommerce/cart/success');
-      }
+        }
     }
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function autoCompleteAction() {
+    public function autoCompleteAction() {
     $return = Cache::get('itemsAutocomplete');
     if (!$return) {
-      $items = $this->ecommerce->getItems();
-      $return = [];
-      foreach ($items as $item) {
+        $items = $this->ecommerce->getItems();
+        $return = [];
+        foreach ($items as $item) {
         $return[] = ['name' => $item->name(), 'search' => $item->search_index . ' ' . $item->name];
-      }
-      $return = json_encode($return);
-      Cache::set('itemsAutocomplete', [], $return);
+        }
+        $return = json_encode($return);
+        Cache::set('itemsAutocomplete', [], $return);
     }
     echo $return;
-  }
+    }
 
-  public function indexAction() {
+    public function indexAction() {
     if (empty($this->module->config['catalogPresentPage'])) {
-      Tools::redirect('/ecommerce/itemList');
+        Tools::redirect('/ecommerce/itemList');
     }
     //$this->view->setTitle('Каталог');
     $this->view->page();
-  }
+    }
 
-  public function itemListAction($category_id = 0) {
+    public function itemListAction($category_id = 0) {
     //search
     if (!empty($_GET['search'])) {
-      if (!empty($_GET['inCatalog'])) {
+        if (!empty($_GET['inCatalog'])) {
         $category_id = (int) $_GET['inCatalog'];
-      }
-      $search = $_GET['search'];
+        }
+        $search = $_GET['search'];
     } else {
-      $search = '';
+        $search = '';
     }
 
     //sort
     if (!empty($_GET['sort'])) {
-      $sort = $_GET['sort'];
+        $sort = $_GET['sort'];
     } elseif (!empty($this->ecommerce->config['defaultSort'])) {
-      $sort = $this->ecommerce->config['defaultSort'];
+        $sort = $this->ecommerce->config['defaultSort'];
     } else {
-      $sort = ['name' => 'asc'];
+        $sort = ['name' => 'asc'];
     }
 
     //category
     $category = null;
     if ($category_id) {
-      if (is_numeric($category_id)) {
+        if (is_numeric($category_id)) {
         $category = \Ecommerce\Category::get($category_id);
-      }
-      if (!$category) {
+        }
+        if (!$category) {
         $category = \Ecommerce\Category::get($category_id, 'alias');
-      }
-      if ($category) {
+        }
+        if ($category) {
         $category_id = $category->id;
-      } else {
+        } else {
         $category_id = 0;
-      }
+        }
     } else {
-      $category_id = 0;
+        $category_id = 0;
     }
     $active = $category_id;
 
@@ -151,17 +151,17 @@ 
     //bread
     $bread = [];
     if (!$category || !$category->name) {
-      $bread[] = array('text' => 'Каталог');
-      $this->view->setTitle('Каталог');
+        $bread[] = array('text' => 'Каталог');
+        $this->view->setTitle('Каталог');
     } else {
-      $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
-      $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
-      foreach ($categoryIds as $id) {
+        $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
+        $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
+        foreach ($categoryIds as $id) {
         $cat = Ecommerce\Category::get($id);
         $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id);
-      }
-      $bread[] = array('text' => $category->name);
-      $this->view->setTitle($category->name);
+        }
+        $bread[] = array('text' => $category->name);
+        $this->view->setTitle($category->name);
     }
 
     //items
@@ -176,30 +176,30 @@ 
 
     //params 
     if (empty(App::$cur->ecommerce->config['filtersInLast'])) {
-      $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1]]);
+        $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1]]);
     } else {
-      $params = $this->ecommerce->getItemsParams([
-          'parent' => $category_id,
-          'search' => trim($search),
-          'filters' => !empty($_GET['filters']) ? $_GET['filters'] : []
-      ]);
-      $ids = [];
-      foreach ($params as $param) {
+        $params = $this->ecommerce->getItemsParams([
+            'parent' => $category_id,
+            'search' => trim($search),
+            'filters' => !empty($_GET['filters']) ? $_GET['filters'] : []
+        ]);
+        $ids = [];
+        foreach ($params as $param) {
         $ids[] = $param->item_option_id;
-      }
-      if ($ids) {
+        }
+        if ($ids) {
         $options = \Ecommerce\Item\Option::getList(['where' => ['id', $ids, 'IN']]);
-      } else {
+        } else {
         $options = [];
-      }
+        }
     }
 
 
     //child categorys
     if ($category) {
-      $categorys = $category->catalogs;
+        $categorys = $category->catalogs;
     } else {
-      $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
+        $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
     }
 
     //view content
@@ -207,12 +207,12 @@ 
         'page' => $category ? $category->resolveTemplate() : (!empty(App::$cur->ecommerce->config['defaultCategoryTemplate']) ? App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current'),
         'content' => $category ? $category->resolveViewer() : (!empty(App::$cur->ecommerce->config['defaultCategoryView']) ? App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList'),
         'data' => compact('active', 'category', 'sort', 'search', 'pages', 'items', 'categorys', 'bread', 'options')]);
-  }
+    }
 
-  public function viewAction($id = '') {
+    public function viewAction($id = '') {
     $item = \Ecommerce\Item::get((int) $id);
     if (!$item) {
-      Tools::redirect('/ecommerce/', 'Такой товар не найден');
+        Tools::redirect('/ecommerce/', 'Такой товар не найден');
     }
     $active = $item->category_id;
     $catalog = $item->category;
@@ -221,10 +221,10 @@ 
 
     $catalogIds = array_values(array_filter(explode('/', $item->tree_path)));
     foreach ($catalogIds as $id) {
-      $cat = Ecommerce\Category::get($id);
-      if ($cat) {
+        $cat = Ecommerce\Category::get($id);
+        if ($cat) {
         $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id];
-      }
+        }
     }
     $bread[] = ['text' => $item->name()];
     $this->view->setTitle($item->name());
@@ -233,17 +233,17 @@ 
         'content' => $item->view ? $item->view : 'view'
     ];
     if (isset($_GET['quickview'])) {
-      $options['page'] = 'blank';
+        $options['page'] = 'blank';
     }
 
     $this->view->addMetaTag(['property' => 'og:title', 'content' => $item->name]);
     $this->view->addMetaTag(['property' => 'og:description', 'content' => $item->description]);
     if ($item->image) {
-      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
+        $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
     }
     $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . INJI_DOMAIN_NAME . '/view/' . $item->id]);
 
     $this->view->page($options);
-  }
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
       foreach ($fields as $field) {
         if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
           $error = 1;
-          Msg::add('Вы не указали: ' . $field->name);
+          Msg::add('Вы не указали: '.$field->name);
         }
       }
       if (!$error) {
@@ -70,7 +70,7 @@ 
         $extra->price = $card->price;
         $extra->count = 1;
         $extra->cart_id = $cart->id;
-        $extra->info = 'card:' . $card->id . '|cardItem:' . $cardItem->id;
+        $extra->info = 'card:'.$card->id.'|cardItem:'.$cardItem->id;
         $extra->save();
         Tools::redirect('/ecommerce/cart/success');
       }
@@ -84,7 +84,7 @@ 
       $items = $this->ecommerce->getItems();
       $return = [];
       foreach ($items as $item) {
-        $return[] = ['name' => $item->name(), 'search' => $item->search_index . ' ' . $item->name];
+        $return[] = ['name' => $item->name(), 'search' => $item->search_index.' '.$item->name];
       }
       $return = json_encode($return);
       Cache::set('itemsAutocomplete', [], $return);
@@ -158,7 +158,7 @@ 
       $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
       foreach ($categoryIds as $id) {
         $cat = Ecommerce\Category::get($id);
-        $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id);
+        $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/'.$cat->id);
       }
       $bread[] = array('text' => $category->name);
       $this->view->setTitle($category->name);
@@ -223,7 +223,7 @@ 
     foreach ($catalogIds as $id) {
       $cat = Ecommerce\Category::get($id);
       if ($cat) {
-        $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id];
+        $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/'.$cat->id];
       }
     }
     $bread[] = ['text' => $item->name()];
@@ -239,9 +239,9 @@ 
     $this->view->addMetaTag(['property' => 'og:title', 'content' => $item->name]);
     $this->view->addMetaTag(['property' => 'og:description', 'content' => $item->description]);
     if ($item->image) {
-      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
+      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.INJI_DOMAIN_NAME.$item->image->path]);
     }
-    $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . INJI_DOMAIN_NAME . '/view/' . $item->id]);
+    $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.INJI_DOMAIN_NAME.'/view/'.$item->id]);
 
     $this->view->page($options);
   }

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 (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
+        return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : '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/Ecommerce/models/Item/Image.php

Indentation +36 added lines, -36 removed lines

@@ -13,22 +13,22 @@ 
 
 class Image extends \Model {
 
-  static $objectName = 'Фото товара';
-  static $labels = [
-      'file_id' => 'Изображение',
-      'item_id' => 'Товар',
-      'name' => 'Название',
-      'description' => 'Описание',
-  ];
-  static $cols = [
-      'file_id' => ['type' => 'image'],
-      'item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'item'],
-      'name' => ['type' => 'text'],
-      'description' => ['type' => 'html'],
-      'weight' => ['type' => 'number'],
-  ];
+    static $objectName = 'Фото товара';
+    static $labels = [
+        'file_id' => 'Изображение',
+        'item_id' => 'Товар',
+        'name' => 'Название',
+        'description' => 'Описание',
+    ];
+    static $cols = [
+        'file_id' => ['type' => 'image'],
+        'item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'item'],
+        'name' => ['type' => 'text'],
+        'description' => ['type' => 'html'],
+        'weight' => ['type' => 'number'],
+    ];
 
-  static function relations() {
+    static function relations() {
     return [
         'item' => [
             'col' => 'item_id',
@@ -39,30 +39,30 @@ 
             'model' => 'Files\File'
         ]
     ];
-  }
+    }
 
-  static $dataManagers = [
-      'manager' => [
-          'name' => 'Фото товара',
-          'cols' => [
-              'file_id', 'name'
-          ]
-      ]
-  ];
-  static $forms = [
-      'manager' => [
-          'map' => [
-              ['name'],
-              ['item_id', 'file_id'],
-              ['description']
-          ]
-      ]
-  ];
+    static $dataManagers = [
+        'manager' => [
+            'name' => 'Фото товара',
+            'cols' => [
+                'file_id', 'name'
+            ]
+        ]
+    ];
+    static $forms = [
+        'manager' => [
+            'map' => [
+                ['name'],
+                ['item_id', 'file_id'],
+                ['description']
+            ]
+        ]
+    ];
 
-  function beforeDelete() {
+    function beforeDelete() {
     if ($this->file) {
-      $this->file->delete();
+        $this->file->delete();
+    }
     }
-  }
 
 }

system/modules/Ecommerce/models/Delivery/Save.php

Indentation +6 added lines, -6 removed lines

@@ -13,12 +13,12 @@ 
 
 class Save extends \Model {
 
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user']
-  ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user']
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'values' => [
             'type' => 'many',
@@ -31,6 +31,6 @@ 
             'col' => 'user_id'
         ]
     ];
-  }
+    }
 
 }