injitools / cms-Inji

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