From 1cd0fb0f4f88d3e333308ff082cde1d180af7130 Mon Sep 17 00:00:00 2001
From: yarik <yarik.nechyporuk@gmail.com>
Date: Sun, 6 Nov 2016 21:34:58 +0200
Subject: [PATCH] Testing

---
 Module.php                                            |  6 ++++++
 behaviors/NotifyBehavior.php                          |  2 +-
 behaviors/RatingBehavior.php                          |  2 +-
 components/artboxtree/treegrid/TreeGridWidget.php     |  2 +-
 console/controllers/GenerateController.php            | 12 ++++++------
 console/controllers/ImportController.php              |  2 +-
 console/controllers/SiteMapController.php             |  4 ++--
 controllers/BrandController.php                       |  4 ++--
 controllers/CategoryController.php                    |  4 ++--
 controllers/OrderController.php                       |  2 +-
 models/Basket.php                                     |  4 ++--
 models/Order.php                                      |  2 +-
 models/OrderProduct.php                               |  2 +-
 models/ProductToRating.php                            |  2 +-
 models/private/OrderProduct.php                       |  2 +-
 models/private/OrderProducts.php                      |  2 +-
 modules/blog/controllers/BlogArticleController.php    |  2 +-
 modules/blog/models/BlogArticle.php                   |  2 +-
 modules/catalog/Module.php                            |  2 +-
 modules/catalog/behaviors/FilterBehavior.php          |  6 +++---
 modules/catalog/controllers/ManageController.php      | 12 ++++++------
 modules/catalog/controllers/ProductUnitController.php |  6 +++---
 modules/catalog/controllers/TaxGroupController.php    |  4 ++--
 modules/catalog/controllers/TaxOptionController.php   |  8 ++++----
 modules/catalog/controllers/VariantController.php     | 16 ++++++++--------
 modules/catalog/helpers/FilterHelper.php              | 16 ++++++++--------
 modules/catalog/helpers/ProductHelper.php             |  6 +++---
 modules/catalog/models/Brand.php                      |  2 +-
 modules/catalog/models/BrandLang.php                  |  2 +-
 modules/catalog/models/BrandSearch.php                |  4 ++--
 modules/catalog/models/Category.php                   |  4 ++--
 modules/catalog/models/CategoryLang.php               |  2 +-
 modules/catalog/models/CategoryQuery.php              |  2 +-
 modules/catalog/models/CategorySearch.php             |  4 ++--
 modules/catalog/models/Export.php                     |  4 ++--
 modules/catalog/models/Import.php                     |  8 ++++----
 modules/catalog/models/Product.php                    |  8 ++++----
 modules/catalog/models/ProductCategory.php            |  2 +-
 modules/catalog/models/ProductImage.php               |  2 +-
 modules/catalog/models/ProductLang.php                |  2 +-
 modules/catalog/models/ProductOption.php              |  4 ++--
 modules/catalog/models/ProductSearch.php              |  4 ++--
 modules/catalog/models/ProductStock.php               |  2 +-
 modules/catalog/models/ProductUnit.php                |  2 +-
 modules/catalog/models/ProductUnitLang.php            |  2 +-
 modules/catalog/models/ProductUnitSearch.php          |  4 ++--
 modules/catalog/models/ProductVariant.php             |  6 +++---
 modules/catalog/models/ProductVariantLang.php         |  2 +-
 modules/catalog/models/ProductVariantOption.php       |  4 ++--
 modules/catalog/models/ProductVariantSearch.php       |  4 ++--
 modules/catalog/models/Stock.php                      |  2 +-
 modules/catalog/models/StockLang.php                  |  2 +-
 modules/catalog/models/TaxGroup.php                   |  4 ++--
 modules/catalog/models/TaxGroupLang.php               |  2 +-
 modules/catalog/models/TaxGroupToCategory.php         |  4 ++--
 modules/catalog/models/TaxOption.php                  |  6 +++---
 modules/catalog/models/TaxOptionLang.php              |  2 +-
 modules/catalog/models/TaxOptionSearch.php            |  4 ++--
 modules/catalog/views/manage/_form.php                | 10 +++++-----
 modules/catalog/views/manage/_form_language.php       |  2 +-
 modules/catalog/views/manage/create.php               |  4 ++--
 modules/catalog/views/manage/export.php               |  2 +-
 modules/catalog/views/manage/import.php               |  2 +-
 modules/catalog/views/manage/index.php                | 10 +++++-----
 modules/catalog/views/manage/update.php               |  4 ++--
 modules/catalog/views/manage/view.php                 |  8 ++++----
 modules/catalog/views/product-unit/_form.php          |  4 ++--
 modules/catalog/views/product-unit/_form_language.php |  2 +-
 modules/catalog/views/product-unit/create.php         |  4 ++--
 modules/catalog/views/product-unit/index.php          |  2 +-
 modules/catalog/views/product-unit/update.php         |  4 ++--
 modules/catalog/views/product-unit/view.php           |  2 +-
 modules/catalog/views/tax-group/_form.php             |  6 +++---
 modules/catalog/views/tax-group/_form_language.php    |  2 +-
 modules/catalog/views/tax-group/create.php            |  4 ++--
 modules/catalog/views/tax-group/index.php             |  2 +-
 modules/catalog/views/tax-group/update.php            |  4 ++--
 modules/catalog/views/tax-group/view.php              |  2 +-
 modules/catalog/views/tax-option/_form.php            |  8 ++++----
 modules/catalog/views/tax-option/_form_language.php   |  2 +-
 modules/catalog/views/tax-option/create.php           |  6 +++---
 modules/catalog/views/tax-option/index.php            |  6 +++---
 modules/catalog/views/tax-option/update.php           |  6 +++---
 modules/catalog/views/tax-option/view.php             |  4 ++--
 modules/catalog/views/variant/_form.php               | 12 ++++++------
 modules/catalog/views/variant/_form_language.php      |  2 +-
 modules/catalog/views/variant/create.php              |  8 ++++----
 modules/catalog/views/variant/index.php               |  4 ++--
 modules/catalog/views/variant/update.php              |  8 ++++----
 modules/catalog/views/variant/view.php                |  4 ++--
 modules/catalog/widgets/brandsCarouselWidget.php      |  4 ++--
 modules/catalog/widgets/lastProducts.php              |  4 ++--
 modules/catalog/widgets/similarProducts.php           |  4 ++--
 modules/catalog/widgets/specialProducts.php           |  4 ++--
 modules/catalog/widgets/views/brandsCarousel.php      |  2 +-
 modules/catalog/widgets/views/product_smart.php       |  2 +-
 modules/catalog/widgets/views/products_block.php      |  2 +-
 modules/catalog/widgets/views/submenu.php             |  2 +-
 views/brand/_form.php                                 |  4 ++--
 views/brand/_form_language.php                        |  2 +-
 views/brand/create.php                                |  4 ++--
 views/brand/index.php                                 |  4 ++--
 views/brand/update.php                                |  4 ++--
 views/brand/view.php                                  |  2 +-
 views/category/_form.php                              |  4 ++--
 views/category/_form_language.php                     |  2 +-
 views/category/create.php                             |  4 ++--
 views/category/index.php                              |  4 ++--
 views/category/update.php                             |  4 ++--
 views/category/view.php                               |  2 +-
 110 files changed, 230 insertions(+), 224 deletions(-)

diff --git a/Module.php b/Module.php
index be4b68e..59dea67 100644
--- a/Module.php
+++ b/Module.php
@@ -7,6 +7,12 @@
         public function init()
         {
             parent::init();
+            
+            $this->modules = [
+                'catalog' => [
+                    'class' => '\artweb\artbox\modules\catalog\Module',
+                ],
+            ];
         }
     }
     
\ No newline at end of file
diff --git a/behaviors/NotifyBehavior.php b/behaviors/NotifyBehavior.php
index 173cb73..cce64f0 100755
--- a/behaviors/NotifyBehavior.php
+++ b/behaviors/NotifyBehavior.php
@@ -4,7 +4,7 @@
     
     use artweb\artbox\models\Article;
     use artweb\artbox\modules\comment\models\CommentModel;
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use artweb\artbox\widgets\Mailer;
     use yii\base\Behavior;
     use yii\base\Event;
diff --git a/behaviors/RatingBehavior.php b/behaviors/RatingBehavior.php
index 8579095..77eca89 100755
--- a/behaviors/RatingBehavior.php
+++ b/behaviors/RatingBehavior.php
@@ -4,7 +4,7 @@
     
     use artweb\artbox\models\Article;
     use artweb\artbox\modules\comment\models\CommentModel;
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use yii\base\Behavior;
     use yii\base\Event;
     use yii\db\ActiveRecord;
diff --git a/components/artboxtree/treegrid/TreeGridWidget.php b/components/artboxtree/treegrid/TreeGridWidget.php
index d54d708..cae4ffa 100755
--- a/components/artboxtree/treegrid/TreeGridWidget.php
+++ b/components/artboxtree/treegrid/TreeGridWidget.php
@@ -2,7 +2,7 @@
 
 namespace artweb\artbox\components\artboxtree\treegrid;
 
-use artweb\artbox\modules\rubrication\models\TaxOption;
+use artweb\artbox\modules\catalog\models\TaxOption;
 use Yii;
 use yii\helpers\Html;
 use yii\helpers\ArrayHelper;
diff --git a/console/controllers/GenerateController.php b/console/controllers/GenerateController.php
index 9086a52..ce6a055 100644
--- a/console/controllers/GenerateController.php
+++ b/console/controllers/GenerateController.php
@@ -2,12 +2,12 @@
     
     namespace console\controllers;
     
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use Faker\Factory;
     use Faker\Generator;
     use yii\console\Controller;
diff --git a/console/controllers/ImportController.php b/console/controllers/ImportController.php
index 76275da..a8b36ac 100755
--- a/console/controllers/ImportController.php
+++ b/console/controllers/ImportController.php
@@ -2,7 +2,7 @@
 
 namespace console\controllers;
 
-use artweb\artbox\modules\product\models\Import;
+use artweb\artbox\modules\catalog\models\Import;
 use Yii;
 use yii\console\Controller;
 
diff --git a/console/controllers/SiteMapController.php b/console/controllers/SiteMapController.php
index 9c37cf7..1597284 100755
--- a/console/controllers/SiteMapController.php
+++ b/console/controllers/SiteMapController.php
@@ -4,8 +4,8 @@ namespace console\controllers;
 
 use artweb\artbox\models\Article;
 use artweb\artbox\models\Seo;
-use artweb\artbox\modules\product\models\Category;
-use artweb\artbox\modules\product\models\Product;
+use artweb\artbox\modules\catalog\models\Category;
+use artweb\artbox\modules\catalog\models\Product;
 use frontend\models\ProductFrontendSearch;
 use Yii;
 use artweb\artbox\models\Page;
diff --git a/controllers/BrandController.php b/controllers/BrandController.php
index 9d062a7..af2d01a 100755
--- a/controllers/BrandController.php
+++ b/controllers/BrandController.php
@@ -3,8 +3,8 @@
     namespace artweb\artbox\controllers;
     
     use Yii;
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\BrandSearch;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\BrandSearch;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
     use yii\filters\VerbFilter;
diff --git a/controllers/CategoryController.php b/controllers/CategoryController.php
index 57b4fd1..2f5860b 100755
--- a/controllers/CategoryController.php
+++ b/controllers/CategoryController.php
@@ -5,8 +5,8 @@
     use developeruz\db_rbac\behaviors\AccessBehavior;
     use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
     use Yii;
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\CategorySearch;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\CategorySearch;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
     use yii\filters\VerbFilter;
diff --git a/controllers/OrderController.php b/controllers/OrderController.php
index ab04036..6d0008e 100755
--- a/controllers/OrderController.php
+++ b/controllers/OrderController.php
@@ -10,7 +10,7 @@
     use yii\web\HttpException;
     use artweb\artbox\models\Order;
     use artweb\artbox\models\OrderProduct;
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     use yii\web\NotFoundHttpException;
     use developeruz\db_rbac\behaviors\AccessBehavior;
     
diff --git a/models/Basket.php b/models/Basket.php
index 5bd1a11..e33b7d0 100755
--- a/models/Basket.php
+++ b/models/Basket.php
@@ -2,7 +2,7 @@
     
     namespace artweb\artbox\models;
     
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     use yii\base\Component;
     use yii\web\NotFoundHttpException;
     
@@ -146,7 +146,7 @@
          *
          * @param int $product_variant_id
          *
-         * @return \artweb\artbox\modules\product\models\ProductVariant
+         * @return \artweb\artbox\modules\catalog\models\ProductVariant
          * @throws \yii\web\NotFoundHttpException
          */
         public function findModel(int $product_variant_id): ProductVariant
diff --git a/models/Order.php b/models/Order.php
index ab3e963..0023157 100755
--- a/models/Order.php
+++ b/models/Order.php
@@ -5,7 +5,7 @@
     use yii\db\ActiveRecord;
     use yii\db\Expression;
     use yii\web\Session;
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     
     /**
      * Class Order
diff --git a/models/OrderProduct.php b/models/OrderProduct.php
index 7a9dd85..2e8c018 100755
--- a/models/OrderProduct.php
+++ b/models/OrderProduct.php
@@ -2,7 +2,7 @@
     
     namespace artweb\artbox\models;
     
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     use Yii;
     use yii\db\ActiveRecord;
     
diff --git a/models/ProductToRating.php b/models/ProductToRating.php
index 90b2a2b..9eee048 100755
--- a/models/ProductToRating.php
+++ b/models/ProductToRating.php
@@ -2,7 +2,7 @@
     
     namespace artweb\artbox\models;
     
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use Yii;
     use yii\db\ActiveRecord;
     
diff --git a/models/private/OrderProduct.php b/models/private/OrderProduct.php
index e291593..5072f73 100644
--- a/models/private/OrderProduct.php
+++ b/models/private/OrderProduct.php
@@ -2,7 +2,7 @@
     
     namespace artweb\artbox\models;
     
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     use yii\db\ActiveRecord;
     
     /**
diff --git a/models/private/OrderProducts.php b/models/private/OrderProducts.php
index 52b08a4..4f6ea96 100755
--- a/models/private/OrderProducts.php
+++ b/models/private/OrderProducts.php
@@ -2,7 +2,7 @@
     
     namespace artweb\artbox\models;
     
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     use yii\db\ActiveRecord;
     
     class orderProduct extends ActiveRecord
diff --git a/modules/blog/controllers/BlogArticleController.php b/modules/blog/controllers/BlogArticleController.php
index 8f5978d..ccf4fff 100644
--- a/modules/blog/controllers/BlogArticleController.php
+++ b/modules/blog/controllers/BlogArticleController.php
@@ -4,7 +4,7 @@
     
     use artweb\artbox\modules\blog\models\BlogCategory;
     use artweb\artbox\modules\blog\models\BlogTag;
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use Yii;
     use artweb\artbox\modules\blog\models\BlogArticle;
     use artweb\artbox\modules\blog\models\BlogArticleSearch;
diff --git a/modules/blog/models/BlogArticle.php b/modules/blog/models/BlogArticle.php
index 4699b13..7153e31 100644
--- a/modules/blog/models/BlogArticle.php
+++ b/modules/blog/models/BlogArticle.php
@@ -7,7 +7,7 @@
     use yii\db\ActiveRecord;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use yii\db\ActiveQuery;
     use yii\web\Request;
     
diff --git a/modules/catalog/Module.php b/modules/catalog/Module.php
index f505a43..7491c44 100755
--- a/modules/catalog/Module.php
+++ b/modules/catalog/Module.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product;
+    namespace artweb\artbox\modules\catalog;
     
     /**
      * product module definition class
diff --git a/modules/catalog/behaviors/FilterBehavior.php b/modules/catalog/behaviors/FilterBehavior.php
index 00959c0..e3ebe90 100755
--- a/modules/catalog/behaviors/FilterBehavior.php
+++ b/modules/catalog/behaviors/FilterBehavior.php
@@ -1,9 +1,9 @@
 <?php
     
-    namespace artweb\artbox\modules\product\behaviors;
+    namespace artweb\artbox\modules\catalog\behaviors;
     
-    use artweb\artbox\modules\product\models\ProductOption;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\ProductOption;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use yii\base\Behavior;
     use yii\db\ActiveRecord;
     
diff --git a/modules/catalog/controllers/ManageController.php b/modules/catalog/controllers/ManageController.php
index 5ec0c38..d0d1263 100755
--- a/modules/catalog/controllers/ManageController.php
+++ b/modules/catalog/controllers/ManageController.php
@@ -1,14 +1,14 @@
 <?php
     
-    namespace artweb\artbox\modules\product\controllers;
+    namespace artweb\artbox\modules\catalog\controllers;
     
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\Export;
-    use artweb\artbox\modules\product\models\Import;
-    use artweb\artbox\modules\product\models\ProductImage;
+    use artweb\artbox\modules\catalog\models\Export;
+    use artweb\artbox\modules\catalog\models\Import;
+    use artweb\artbox\modules\catalog\models\ProductImage;
     use Yii;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductSearch;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductSearch;
     use yii\db\ActiveQuery;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
diff --git a/modules/catalog/controllers/ProductUnitController.php b/modules/catalog/controllers/ProductUnitController.php
index fe0579a..bab8699 100755
--- a/modules/catalog/controllers/ProductUnitController.php
+++ b/modules/catalog/controllers/ProductUnitController.php
@@ -1,10 +1,10 @@
 <?php
     
-    namespace artweb\artbox\modules\product\controllers;
+    namespace artweb\artbox\modules\catalog\controllers;
     
     use Yii;
-    use artweb\artbox\modules\product\models\ProductUnit;
-    use artweb\artbox\modules\product\models\ProductUnitSearch;
+    use artweb\artbox\modules\catalog\models\ProductUnit;
+    use artweb\artbox\modules\catalog\models\ProductUnitSearch;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
     use yii\filters\VerbFilter;
diff --git a/modules/catalog/controllers/TaxGroupController.php b/modules/catalog/controllers/TaxGroupController.php
index fe6440c..111717b 100755
--- a/modules/catalog/controllers/TaxGroupController.php
+++ b/modules/catalog/controllers/TaxGroupController.php
@@ -1,9 +1,9 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\controllers;
+    namespace artweb\artbox\modules\catalog\controllers;
     
     use Yii;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\data\ActiveDataProvider;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
diff --git a/modules/catalog/controllers/TaxOptionController.php b/modules/catalog/controllers/TaxOptionController.php
index 903a19e..6b0cb90 100755
--- a/modules/catalog/controllers/TaxOptionController.php
+++ b/modules/catalog/controllers/TaxOptionController.php
@@ -1,11 +1,11 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\controllers;
+    namespace artweb\artbox\modules\catalog\controllers;
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use Yii;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
-    use artweb\artbox\modules\rubrication\models\TaxOptionSearch;
+    use artweb\artbox\modules\catalog\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxOptionSearch;
     use yii\db\ActiveQuery;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
diff --git a/modules/catalog/controllers/VariantController.php b/modules/catalog/controllers/VariantController.php
index 5ac0611..8e21ac3 100755
--- a/modules/catalog/controllers/VariantController.php
+++ b/modules/catalog/controllers/VariantController.php
@@ -1,13 +1,13 @@
 <?php
     
-    namespace artweb\artbox\modules\product\controllers;
+    namespace artweb\artbox\modules\catalog\controllers;
     
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductImage;
-    use artweb\artbox\modules\product\models\ProductStock;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\product\models\ProductVariantSearch;
-    use artweb\artbox\modules\product\models\Stock;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductImage;
+    use artweb\artbox\modules\catalog\models\ProductStock;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariantSearch;
+    use artweb\artbox\modules\catalog\models\Stock;
     use Yii;
     use yii\db\ActiveQuery;
     use yii\web\Controller;
@@ -209,7 +209,7 @@
         /**
          * Save ProductStocks for ProductVariant and return total count of products.
          *
-         * @param \artweb\artbox\modules\product\models\ProductVariant $productVariant
+         * @param \artweb\artbox\modules\catalog\models\ProductVariant $productVariant
          * @param array|null                                    $productStocks
          *
          * @return int
diff --git a/modules/catalog/helpers/FilterHelper.php b/modules/catalog/helpers/FilterHelper.php
index c49f34a..62cd363 100755
--- a/modules/catalog/helpers/FilterHelper.php
+++ b/modules/catalog/helpers/FilterHelper.php
@@ -1,14 +1,14 @@
 <?php
     
-    namespace artweb\artbox\modules\product\helpers;
+    namespace artweb\artbox\modules\catalog\helpers;
     
-    use artweb\artbox\modules\product\models\BrandLang;
-    use artweb\artbox\modules\product\models\CategoryLang;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductLang;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\product\models\ProductVariantLang;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\BrandLang;
+    use artweb\artbox\modules\catalog\models\CategoryLang;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductLang;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariantLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\base\Object;
     use yii\db\ActiveQuery;
     use yii\db\Query;
diff --git a/modules/catalog/helpers/ProductHelper.php b/modules/catalog/helpers/ProductHelper.php
index edfd9be..39ab59a 100755
--- a/modules/catalog/helpers/ProductHelper.php
+++ b/modules/catalog/helpers/ProductHelper.php
@@ -1,9 +1,9 @@
 <?php
     
-    namespace artweb\artbox\modules\product\helpers;
+    namespace artweb\artbox\modules\catalog\helpers;
     
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\Product;
     use yii\base\Object;
     use Yii;
     use yii\db\ActiveQuery;
diff --git a/modules/catalog/models/Brand.php b/modules/catalog/models/Brand.php
index 4c341e2..c685a09 100755
--- a/modules/catalog/models/Brand.php
+++ b/modules/catalog/models/Brand.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\behaviors\SaveImgBehavior;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
diff --git a/modules/catalog/models/BrandLang.php b/modules/catalog/models/BrandLang.php
index 35a2bf7..21f7301 100755
--- a/modules/catalog/models/BrandLang.php
+++ b/modules/catalog/models/BrandLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/BrandSearch.php b/modules/catalog/models/BrandSearch.php
index ba43d75..0ffeda5 100755
--- a/modules/catalog/models/BrandSearch.php
+++ b/modules/catalog/models/BrandSearch.php
@@ -1,13 +1,13 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
     
     /**
      * BrandSearch represents the model behind the search form about
-     * `artweb\artbox\modules\product\models\Brand`.
+     * `artweb\artbox\modules\catalog\models\Brand`.
      */
     class BrandSearch extends Brand
     {
diff --git a/modules/catalog/models/Category.php b/modules/catalog/models/Category.php
index c2f2e45..473f1aa 100755
--- a/modules/catalog/models/Category.php
+++ b/modules/catalog/models/Category.php
@@ -1,12 +1,12 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\behaviors\SaveImgBehavior;
     use artweb\artbox\components\artboxtree\ArtboxTreeBehavior;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use Yii;
     use yii\base\InvalidParamException;
     use yii\db\ActiveQuery;
diff --git a/modules/catalog/models/CategoryLang.php b/modules/catalog/models/CategoryLang.php
index 9c3e5e0..de9173f 100755
--- a/modules/catalog/models/CategoryLang.php
+++ b/modules/catalog/models/CategoryLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/CategoryQuery.php b/modules/catalog/models/CategoryQuery.php
index 387e460..4444f5c 100755
--- a/modules/catalog/models/CategoryQuery.php
+++ b/modules/catalog/models/CategoryQuery.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\components\artboxtree\ArtboxTreeQueryTrait;
     use yii\db\ActiveQuery;
diff --git a/modules/catalog/models/CategorySearch.php b/modules/catalog/models/CategorySearch.php
index 1af63ae..c7dc3cc 100755
--- a/modules/catalog/models/CategorySearch.php
+++ b/modules/catalog/models/CategorySearch.php
@@ -1,13 +1,13 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
     
     /**
      * CategorySearch represents the model behind the search form about
-     * `artweb\artbox\modules\product\models\Category`.
+     * `artweb\artbox\modules\catalog\models\Category`.
      */
     class CategorySearch extends Category
     {
diff --git a/modules/catalog/models/Export.php b/modules/catalog/models/Export.php
index df9da8f..bb03902 100755
--- a/modules/catalog/models/Export.php
+++ b/modules/catalog/models/Export.php
@@ -1,9 +1,9 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use yii\base\Model;
     
     class Export extends Model
diff --git a/modules/catalog/models/Import.php b/modules/catalog/models/Import.php
index 435e820..36e8e93 100755
--- a/modules/catalog/models/Import.php
+++ b/modules/catalog/models/Import.php
@@ -1,10 +1,10 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use Yii;
     use yii\base\Model;
     use yii\helpers\ArrayHelper;
@@ -12,7 +12,7 @@
     /**
      * Class Import
      *
-     * @package artweb\artbox\modules\product\models
+     * @package artweb\artbox\modules\catalog\models
      */
     class Import extends Model
     {
diff --git a/modules/catalog/models/Product.php b/modules/catalog/models/Product.php
index 3285c1d..1bb947d 100755
--- a/modules/catalog/models/Product.php
+++ b/modules/catalog/models/Product.php
@@ -1,15 +1,15 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\behaviors\MultipleImgBehavior;
     use artweb\artbox\behaviors\SaveMultipleFileBehavior;
     use artweb\artbox\models\ProductToRating;
     use artweb\artbox\modules\comment\models\CommentModel;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxGroupToCategory;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroupToCategory;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use Yii;
     use yii\base\InvalidParamException;
     use yii\db\ActiveQuery;
diff --git a/modules/catalog/models/ProductCategory.php b/modules/catalog/models/ProductCategory.php
index f22f0e6..8a392d6 100755
--- a/modules/catalog/models/ProductCategory.php
+++ b/modules/catalog/models/ProductCategory.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use Yii;
     use yii\db\ActiveRecord;
diff --git a/modules/catalog/models/ProductImage.php b/modules/catalog/models/ProductImage.php
index 2763aaa..a7a0098 100755
--- a/modules/catalog/models/ProductImage.php
+++ b/modules/catalog/models/ProductImage.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\behaviors\ImageBehavior;
     use Yii;
diff --git a/modules/catalog/models/ProductLang.php b/modules/catalog/models/ProductLang.php
index 8292ce0..f040f73 100755
--- a/modules/catalog/models/ProductLang.php
+++ b/modules/catalog/models/ProductLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/ProductOption.php b/modules/catalog/models/ProductOption.php
index a7a58d1..f348690 100755
--- a/modules/catalog/models/ProductOption.php
+++ b/modules/catalog/models/ProductOption.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use Yii;
     use yii\db\ActiveRecord;
     
diff --git a/modules/catalog/models/ProductSearch.php b/modules/catalog/models/ProductSearch.php
index 568e871..eaa1c8b 100755
--- a/modules/catalog/models/ProductSearch.php
+++ b/modules/catalog/models/ProductSearch.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
@@ -8,7 +8,7 @@
     
     /**
      * ProductSearch represents the model behind the search form about
-     * `artweb\artbox\modules\product\models\Product`.
+     * `artweb\artbox\modules\catalog\models\Product`.
      */
     class ProductSearch extends Product
     {
diff --git a/modules/catalog/models/ProductStock.php b/modules/catalog/models/ProductStock.php
index dd17d3c..4d41544 100755
--- a/modules/catalog/models/ProductStock.php
+++ b/modules/catalog/models/ProductStock.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\db\ActiveRecord;
     
diff --git a/modules/catalog/models/ProductUnit.php b/modules/catalog/models/ProductUnit.php
index 6340adc..c687c8f 100755
--- a/modules/catalog/models/ProductUnit.php
+++ b/modules/catalog/models/ProductUnit.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use Yii;
diff --git a/modules/catalog/models/ProductUnitLang.php b/modules/catalog/models/ProductUnitLang.php
index 38cb4e7..0c28970 100755
--- a/modules/catalog/models/ProductUnitLang.php
+++ b/modules/catalog/models/ProductUnitLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/ProductUnitSearch.php b/modules/catalog/models/ProductUnitSearch.php
index b7f3df2..1c6db32 100755
--- a/modules/catalog/models/ProductUnitSearch.php
+++ b/modules/catalog/models/ProductUnitSearch.php
@@ -1,13 +1,13 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
     
     /**
      * ProductUnitSearch represents the model behind the search form about
-     * `artweb\artbox\modules\product\models\ProductUnit`.
+     * `artweb\artbox\modules\catalog\models\ProductUnit`.
      */
     class ProductUnitSearch extends ProductUnit
     {
diff --git a/modules/catalog/models/ProductVariant.php b/modules/catalog/models/ProductVariant.php
index 94824c3..9b1c683 100755
--- a/modules/catalog/models/ProductVariant.php
+++ b/modules/catalog/models/ProductVariant.php
@@ -1,12 +1,12 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\behaviors\MultipleImgBehavior;
     use artweb\artbox\behaviors\SaveMultipleFileBehavior;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use Yii;
     use yii\base\InvalidParamException;
     use yii\db\ActiveQuery;
diff --git a/modules/catalog/models/ProductVariantLang.php b/modules/catalog/models/ProductVariantLang.php
index f13abc5..e3dd92c 100755
--- a/modules/catalog/models/ProductVariantLang.php
+++ b/modules/catalog/models/ProductVariantLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/ProductVariantOption.php b/modules/catalog/models/ProductVariantOption.php
index 294c393..25e280f 100755
--- a/modules/catalog/models/ProductVariantOption.php
+++ b/modules/catalog/models/ProductVariantOption.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use yii\db\ActiveRecord;
     
     /**
diff --git a/modules/catalog/models/ProductVariantSearch.php b/modules/catalog/models/ProductVariantSearch.php
index f3bb0d8..551ad9b 100755
--- a/modules/catalog/models/ProductVariantSearch.php
+++ b/modules/catalog/models/ProductVariantSearch.php
@@ -1,13 +1,13 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
     
     /**
      * ProductVariantSearch represents the model behind the search form about
-     * `artweb\artbox\modules\product\models\ProductVariant`.
+     * `artweb\artbox\modules\catalog\models\ProductVariant`.
      */
     class ProductVariantSearch extends ProductVariant
     {
diff --git a/modules/catalog/models/Stock.php b/modules/catalog/models/Stock.php
index 400a34d..4f580a4 100755
--- a/modules/catalog/models/Stock.php
+++ b/modules/catalog/models/Stock.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use Yii;
diff --git a/modules/catalog/models/StockLang.php b/modules/catalog/models/StockLang.php
index 1e1e7ea..1447142 100644
--- a/modules/catalog/models/StockLang.php
+++ b/modules/catalog/models/StockLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/TaxGroup.php b/modules/catalog/models/TaxGroup.php
index c35a132..8645614 100755
--- a/modules/catalog/models/TaxGroup.php
+++ b/modules/catalog/models/TaxGroup.php
@@ -1,10 +1,10 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\Category;
+    use artweb\artbox\modules\catalog\models\Category;
     use yii\base\InvalidValueException;
     use yii\db\ActiveQuery;
     use yii\db\ActiveRecord;
diff --git a/modules/catalog/models/TaxGroupLang.php b/modules/catalog/models/TaxGroupLang.php
index 3ccaa75..ac7ffa8 100755
--- a/modules/catalog/models/TaxGroupLang.php
+++ b/modules/catalog/models/TaxGroupLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/TaxGroupToCategory.php b/modules/catalog/models/TaxGroupToCategory.php
index 176fb47..0730afb 100755
--- a/modules/catalog/models/TaxGroupToCategory.php
+++ b/modules/catalog/models/TaxGroupToCategory.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     
-    use artweb\artbox\modules\product\models\Category;
+    use artweb\artbox\modules\catalog\models\Category;
     use yii\db\ActiveRecord;
     
     /**
diff --git a/modules/catalog/models/TaxOption.php b/modules/catalog/models/TaxOption.php
index 28ff9ee..6b42eff 100755
--- a/modules/catalog/models/TaxOption.php
+++ b/modules/catalog/models/TaxOption.php
@@ -1,11 +1,11 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\behaviors\SaveImgBehavior;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
     use Yii;
     use yii\db\ActiveQuery;
     use yii\db\ActiveRecord;
diff --git a/modules/catalog/models/TaxOptionLang.php b/modules/catalog/models/TaxOptionLang.php
index 21bffb1..bd27c49 100755
--- a/modules/catalog/models/TaxOptionLang.php
+++ b/modules/catalog/models/TaxOptionLang.php
@@ -1,6 +1,6 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use artweb\artbox\modules\language\models\Language;
     use Yii;
diff --git a/modules/catalog/models/TaxOptionSearch.php b/modules/catalog/models/TaxOptionSearch.php
index 4050d71..0ffde6b 100755
--- a/modules/catalog/models/TaxOptionSearch.php
+++ b/modules/catalog/models/TaxOptionSearch.php
@@ -1,13 +1,13 @@
 <?php
     
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     
     use yii\base\Model;
     use yii\data\ActiveDataProvider;
     
     /**
      * TaxOptionSearch represents the model behind the search form about
-     * `artweb\artbox\modules\rubrication\models\TaxOption`.
+     * `artweb\artbox\modules\catalog\models\TaxOption`.
      */
     class TaxOptionSearch extends TaxOption
     {
diff --git a/modules/catalog/views/manage/_form.php b/modules/catalog/views/manage/_form.php
index b3547a9..1fae5ba 100755
--- a/modules/catalog/views/manage/_form.php
+++ b/modules/catalog/views/manage/_form.php
@@ -1,20 +1,20 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\ProductLang;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\ProductLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
     use yii\helpers\ArrayHelper;
     use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
-    use artweb\artbox\modules\product\helpers\ProductHelper;
+    use artweb\artbox\modules\catalog\helpers\ProductHelper;
     use kartik\select2\Select2;
     
     /**
      * @var yii\web\View                          $this
-     * @var artweb\artbox\modules\product\models\Product $model
+     * @var artweb\artbox\modules\catalog\models\Product $model
      * @var ProductLang[]                         $modelLangs
      * @var yii\widgets\ActiveForm                $form
      * @var ActiveQuery                           $groups
diff --git a/modules/catalog/views/manage/_form_language.php b/modules/catalog/views/manage/_form_language.php
index 494ac79..1645801 100755
--- a/modules/catalog/views/manage/_form_language.php
+++ b/modules/catalog/views/manage/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\ProductLang;
+    use artweb\artbox\modules\catalog\models\ProductLang;
     use mihaildev\ckeditor\CKEditor;
     use mihaildev\elfinder\ElFinder;
     use yii\web\View;
diff --git a/modules/catalog/views/manage/create.php b/modules/catalog/views/manage/create.php
index 5b7dac3..cc7214e 100755
--- a/modules/catalog/views/manage/create.php
+++ b/modules/catalog/views/manage/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductLang;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/modules/catalog/views/manage/export.php b/modules/catalog/views/manage/export.php
index 66052e3..deaaa9e 100755
--- a/modules/catalog/views/manage/export.php
+++ b/modules/catalog/views/manage/export.php
@@ -1,7 +1,7 @@
 <?php
     
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\Export;
+    use artweb\artbox\modules\catalog\models\Export;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
diff --git a/modules/catalog/views/manage/import.php b/modules/catalog/views/manage/import.php
index 9016c55..ea61fc9 100755
--- a/modules/catalog/views/manage/import.php
+++ b/modules/catalog/views/manage/import.php
@@ -5,7 +5,7 @@
      * @var array  $languages
      */
     
-    use artweb\artbox\modules\product\models\Import;
+    use artweb\artbox\modules\catalog\models\Import;
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
 
diff --git a/modules/catalog/views/manage/index.php b/modules/catalog/views/manage/index.php
index ffb9fc7..a76116d 100755
--- a/modules/catalog/views/manage/index.php
+++ b/modules/catalog/views/manage/index.php
@@ -1,15 +1,15 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductSearch;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductSearch;
     use yii\data\ActiveDataProvider;
     use yii\helpers\Html;
     use yii\grid\GridView;
     use kartik\select2\Select2;
     use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
-    use artweb\artbox\modules\product\helpers\ProductHelper;
+    use artweb\artbox\modules\catalog\helpers\ProductHelper;
     use yii\web\View;
     
     /**
diff --git a/modules/catalog/views/manage/update.php b/modules/catalog/views/manage/update.php
index 6e8e193..1748bac 100755
--- a/modules/catalog/views/manage/update.php
+++ b/modules/catalog/views/manage/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductLang;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductLang;
     use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use yii\web\View;
diff --git a/modules/catalog/views/manage/view.php b/modules/catalog/views/manage/view.php
index d61cdb2..b6adf95 100755
--- a/modules/catalog/views/manage/view.php
+++ b/modules/catalog/views/manage/view.php
@@ -1,9 +1,9 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
     use yii\web\View;
diff --git a/modules/catalog/views/product-unit/_form.php b/modules/catalog/views/product-unit/_form.php
index 0d840a1..6446700 100755
--- a/modules/catalog/views/product-unit/_form.php
+++ b/modules/catalog/views/product-unit/_form.php
@@ -1,8 +1,8 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\product\models\ProductUnit;
-    use artweb\artbox\modules\product\models\ProductUnitLang;
+    use artweb\artbox\modules\catalog\models\ProductUnit;
+    use artweb\artbox\modules\catalog\models\ProductUnitLang;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
diff --git a/modules/catalog/views/product-unit/_form_language.php b/modules/catalog/views/product-unit/_form_language.php
index 7805a49..4ef0e47 100755
--- a/modules/catalog/views/product-unit/_form_language.php
+++ b/modules/catalog/views/product-unit/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\ProductUnitLang;
+    use artweb\artbox\modules\catalog\models\ProductUnitLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/modules/catalog/views/product-unit/create.php b/modules/catalog/views/product-unit/create.php
index 244d1ef..15bb64f 100755
--- a/modules/catalog/views/product-unit/create.php
+++ b/modules/catalog/views/product-unit/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\ProductUnit;
-    use artweb\artbox\modules\product\models\ProductUnitLang;
+    use artweb\artbox\modules\catalog\models\ProductUnit;
+    use artweb\artbox\modules\catalog\models\ProductUnitLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/modules/catalog/views/product-unit/index.php b/modules/catalog/views/product-unit/index.php
index 9db2df4..1c81cfc 100755
--- a/modules/catalog/views/product-unit/index.php
+++ b/modules/catalog/views/product-unit/index.php
@@ -1,6 +1,6 @@
 <?php
     
-    use artweb\artbox\modules\product\models\ProductUnitSearch;
+    use artweb\artbox\modules\catalog\models\ProductUnitSearch;
     use yii\data\ActiveDataProvider;
     use yii\helpers\Html;
     use yii\grid\GridView;
diff --git a/modules/catalog/views/product-unit/update.php b/modules/catalog/views/product-unit/update.php
index afbab9c..dc8a4f5 100755
--- a/modules/catalog/views/product-unit/update.php
+++ b/modules/catalog/views/product-unit/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\ProductUnit;
-    use artweb\artbox\modules\product\models\ProductUnitLang;
+    use artweb\artbox\modules\catalog\models\ProductUnit;
+    use artweb\artbox\modules\catalog\models\ProductUnitLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/modules/catalog/views/product-unit/view.php b/modules/catalog/views/product-unit/view.php
index 5849c8f..3d0fd7f 100755
--- a/modules/catalog/views/product-unit/view.php
+++ b/modules/catalog/views/product-unit/view.php
@@ -1,6 +1,6 @@
 <?php
     
-    use artweb\artbox\modules\product\models\ProductUnit;
+    use artweb\artbox\modules\catalog\models\ProductUnit;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\DetailView;
diff --git a/modules/catalog/views/tax-group/_form.php b/modules/catalog/views/tax-group/_form.php
index 79735b7..337f2d6 100755
--- a/modules/catalog/views/tax-group/_form.php
+++ b/modules/catalog/views/tax-group/_form.php
@@ -1,12 +1,12 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxGroupLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroupLang;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
-    use artweb\artbox\modules\product\helpers\ProductHelper;
+    use artweb\artbox\modules\catalog\helpers\ProductHelper;
     use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
     
     /**
diff --git a/modules/catalog/views/tax-group/_form_language.php b/modules/catalog/views/tax-group/_form_language.php
index 709a4da..ed54c1d 100755
--- a/modules/catalog/views/tax-group/_form_language.php
+++ b/modules/catalog/views/tax-group/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\rubrication\models\TaxGroupLang;
+    use artweb\artbox\modules\catalog\models\TaxGroupLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/modules/catalog/views/tax-group/create.php b/modules/catalog/views/tax-group/create.php
index 18658b1..a6d167a 100755
--- a/modules/catalog/views/tax-group/create.php
+++ b/modules/catalog/views/tax-group/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxGroupLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroupLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/modules/catalog/views/tax-group/index.php b/modules/catalog/views/tax-group/index.php
index c02407a..42aa544 100755
--- a/modules/catalog/views/tax-group/index.php
+++ b/modules/catalog/views/tax-group/index.php
@@ -1,5 +1,5 @@
 <?php
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\data\ActiveDataProvider;
     use yii\helpers\Html;
     use yii\grid\GridView;
diff --git a/modules/catalog/views/tax-group/update.php b/modules/catalog/views/tax-group/update.php
index 1184459..b912639 100755
--- a/modules/catalog/views/tax-group/update.php
+++ b/modules/catalog/views/tax-group/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxGroupLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxGroupLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/modules/catalog/views/tax-group/view.php b/modules/catalog/views/tax-group/view.php
index b847d3a..cee2f52 100755
--- a/modules/catalog/views/tax-group/view.php
+++ b/modules/catalog/views/tax-group/view.php
@@ -4,7 +4,7 @@
     use yii\widgets\DetailView;
     
     /* @var $this yii\web\View */
-    /* @var $model artweb\artbox\modules\rubrication\models\TaxGroup */
+    /* @var $model artweb\artbox\modules\catalog\models\TaxGroup */
     
     $this->title = $model->id;
     $this->params[ 'breadcrumbs' ][] = [
diff --git a/modules/catalog/views/tax-option/_form.php b/modules/catalog/views/tax-option/_form.php
index 3be4f12..b924562 100755
--- a/modules/catalog/views/tax-option/_form.php
+++ b/modules/catalog/views/tax-option/_form.php
@@ -1,16 +1,16 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOptionLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOptionLang;
     use yii\helpers\ArrayHelper;
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     
     /**
      * @var yii\web\View                                $this
-     * @var artweb\artbox\modules\rubrication\models\TaxOption $model
+     * @var artweb\artbox\modules\catalog\models\TaxOption $model
      * @var yii\widgets\ActiveForm                      $form
      * @var TaxGroup                                    $group
      * @var TaxOptionLang[]                             $modelLangs
diff --git a/modules/catalog/views/tax-option/_form_language.php b/modules/catalog/views/tax-option/_form_language.php
index f4045e5..8cdb7b6 100755
--- a/modules/catalog/views/tax-option/_form_language.php
+++ b/modules/catalog/views/tax-option/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\rubrication\models\TaxOptionLang;
+    use artweb\artbox\modules\catalog\models\TaxOptionLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/modules/catalog/views/tax-option/create.php b/modules/catalog/views/tax-option/create.php
index 32f577e..c1588a6 100755
--- a/modules/catalog/views/tax-option/create.php
+++ b/modules/catalog/views/tax-option/create.php
@@ -1,12 +1,12 @@
 <?php
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOptionLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOptionLang;
     use yii\helpers\Html;
     
     /**
      * @var yii\web\View                                $this
-     * @var artweb\artbox\modules\rubrication\models\TaxOption $model
+     * @var artweb\artbox\modules\catalog\models\TaxOption $model
      * @var TaxGroup                                    $group
      * @var TaxOptionLang[]                             $modelLangs
      */
diff --git a/modules/catalog/views/tax-option/index.php b/modules/catalog/views/tax-option/index.php
index 584f068..5cc8df0 100755
--- a/modules/catalog/views/tax-option/index.php
+++ b/modules/catalog/views/tax-option/index.php
@@ -1,13 +1,13 @@
 <?php
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use yii\helpers\Html;
     use yii\grid\GridView;
     
     /**
      * @var yii\web\View                                      $this
-     * @var artweb\artbox\modules\rubrication\models\TaxOptionSearch $searchModel
+     * @var artweb\artbox\modules\catalog\models\TaxOptionSearch $searchModel
      * @var yii\data\ActiveDataProvider                       $dataProvider
      * @var TaxGroup                                          $group
      */
diff --git a/modules/catalog/views/tax-option/update.php b/modules/catalog/views/tax-option/update.php
index 5286a6d..55939be 100755
--- a/modules/catalog/views/tax-option/update.php
+++ b/modules/catalog/views/tax-option/update.php
@@ -1,12 +1,12 @@
 <?php
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOptionLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOptionLang;
     use yii\helpers\Html;
     
     /**
      * @var yii\web\View                                $this
-     * @var artweb\artbox\modules\rubrication\models\TaxOption $model
+     * @var artweb\artbox\modules\catalog\models\TaxOption $model
      * @var TaxGroup                                    $group
      * @var TaxOptionLang[]                             $modelLangs
      */
diff --git a/modules/catalog/views/tax-option/view.php b/modules/catalog/views/tax-option/view.php
index 6a72b3f..81073ee 100755
--- a/modules/catalog/views/tax-option/view.php
+++ b/modules/catalog/views/tax-option/view.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
-    use artweb\artbox\modules\rubrication\models\TaxOption;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\TaxOption;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\DetailView;
diff --git a/modules/catalog/views/variant/_form.php b/modules/catalog/views/variant/_form.php
index fff3ea5..9954eea 100755
--- a/modules/catalog/views/variant/_form.php
+++ b/modules/catalog/views/variant/_form.php
@@ -1,12 +1,12 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductStock;
-    use artweb\artbox\modules\product\models\ProductUnit;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\product\models\ProductVariantLang;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductStock;
+    use artweb\artbox\modules\catalog\models\ProductUnit;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariantLang;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use yii\web\View;
diff --git a/modules/catalog/views/variant/_form_language.php b/modules/catalog/views/variant/_form_language.php
index 33adef4..7f00356 100755
--- a/modules/catalog/views/variant/_form_language.php
+++ b/modules/catalog/views/variant/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\ProductVariantLang;
+    use artweb\artbox\modules\catalog\models\ProductVariantLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/modules/catalog/views/variant/create.php b/modules/catalog/views/variant/create.php
index 80a5b94..68fa353 100755
--- a/modules/catalog/views/variant/create.php
+++ b/modules/catalog/views/variant/create.php
@@ -1,9 +1,9 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductStock;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\product\models\ProductVariantLang;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductStock;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariantLang;
     use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use yii\web\View;
diff --git a/modules/catalog/views/variant/index.php b/modules/catalog/views/variant/index.php
index 292de43..a18c6e8 100755
--- a/modules/catalog/views/variant/index.php
+++ b/modules/catalog/views/variant/index.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductVariantSearch;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductVariantSearch;
     use yii\data\ActiveDataProvider;
     use yii\helpers\Html;
     use yii\grid\GridView;
diff --git a/modules/catalog/views/variant/update.php b/modules/catalog/views/variant/update.php
index 2c065a0..40830f5 100755
--- a/modules/catalog/views/variant/update.php
+++ b/modules/catalog/views/variant/update.php
@@ -1,9 +1,9 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Product;
-    use artweb\artbox\modules\product\models\ProductStock;
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\product\models\ProductVariantLang;
+    use artweb\artbox\modules\catalog\models\Product;
+    use artweb\artbox\modules\catalog\models\ProductStock;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\ProductVariantLang;
     use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use yii\helpers\Url;
diff --git a/modules/catalog/views/variant/view.php b/modules/catalog/views/variant/view.php
index 8202bec..d0fac32 100755
--- a/modules/catalog/views/variant/view.php
+++ b/modules/catalog/views/variant/view.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\ProductVariant;
-    use artweb\artbox\modules\rubrication\models\TaxGroup;
+    use artweb\artbox\modules\catalog\models\ProductVariant;
+    use artweb\artbox\modules\catalog\models\TaxGroup;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\DetailView;
diff --git a/modules/catalog/widgets/brandsCarouselWidget.php b/modules/catalog/widgets/brandsCarouselWidget.php
index b7c8b8e..7f6e381 100755
--- a/modules/catalog/widgets/brandsCarouselWidget.php
+++ b/modules/catalog/widgets/brandsCarouselWidget.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\product\widgets;
+    namespace artweb\artbox\modules\catalog\widgets;
     
-    use artweb\artbox\modules\product\models\Brand;
+    use artweb\artbox\modules\catalog\models\Brand;
     use yii\base\Widget;
     
     class brandsCarouselWidget extends Widget
diff --git a/modules/catalog/widgets/lastProducts.php b/modules/catalog/widgets/lastProducts.php
index 057a4aa..eeef106 100755
--- a/modules/catalog/widgets/lastProducts.php
+++ b/modules/catalog/widgets/lastProducts.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\product\widgets;
+    namespace artweb\artbox\modules\catalog\widgets;
     
-    use artweb\artbox\modules\product\helpers\ProductHelper;
+    use artweb\artbox\modules\catalog\helpers\ProductHelper;
     use yii\base\Widget;
     
     class lastProducts extends Widget
diff --git a/modules/catalog/widgets/similarProducts.php b/modules/catalog/widgets/similarProducts.php
index 9a99b37..72c1b2b 100755
--- a/modules/catalog/widgets/similarProducts.php
+++ b/modules/catalog/widgets/similarProducts.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\product\widgets;
+    namespace artweb\artbox\modules\catalog\widgets;
     
-    use artweb\artbox\modules\product\helpers\ProductHelper;
+    use artweb\artbox\modules\catalog\helpers\ProductHelper;
     use yii\base\Widget;
     use Yii;
     
diff --git a/modules/catalog/widgets/specialProducts.php b/modules/catalog/widgets/specialProducts.php
index e9ea2a7..24399e5 100755
--- a/modules/catalog/widgets/specialProducts.php
+++ b/modules/catalog/widgets/specialProducts.php
@@ -1,8 +1,8 @@
 <?php
     
-    namespace artweb\artbox\modules\product\widgets;
+    namespace artweb\artbox\modules\catalog\widgets;
     
-    use artweb\artbox\modules\product\helpers\ProductHelper;
+    use artweb\artbox\modules\catalog\helpers\ProductHelper;
     use yii\base\Widget;
     use Yii;
     
diff --git a/modules/catalog/widgets/views/brandsCarousel.php b/modules/catalog/widgets/views/brandsCarousel.php
index 870a7dc..83ec0ae 100755
--- a/modules/catalog/widgets/views/brandsCarousel.php
+++ b/modules/catalog/widgets/views/brandsCarousel.php
@@ -3,7 +3,7 @@
      * @var Brand[] $brands
      */
     use artweb\artbox\components\artboximage\ArtboxImageHelper;
-    use artweb\artbox\modules\product\models\Brand;
+    use artweb\artbox\modules\catalog\models\Brand;
 
 ?>
 <div class="slider_prod">
diff --git a/modules/catalog/widgets/views/product_smart.php b/modules/catalog/widgets/views/product_smart.php
index 7283c5b..f4e02e1 100755
--- a/modules/catalog/widgets/views/product_smart.php
+++ b/modules/catalog/widgets/views/product_smart.php
@@ -1,6 +1,6 @@
 <?php
     /**
-     * @var $product  artweb\artbox\modules\product\models\Product
+     * @var $product  artweb\artbox\modules\catalog\models\Product
      */
     use yii\helpers\Html;
     use yii\helpers\Url;
diff --git a/modules/catalog/widgets/views/products_block.php b/modules/catalog/widgets/views/products_block.php
index 4e48c60..0cd3e26 100755
--- a/modules/catalog/widgets/views/products_block.php
+++ b/modules/catalog/widgets/views/products_block.php
@@ -1,5 +1,5 @@
 <?php
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use yii\web\View;
     
     /**
diff --git a/modules/catalog/widgets/views/submenu.php b/modules/catalog/widgets/views/submenu.php
index bf90083..026f3c3 100755
--- a/modules/catalog/widgets/views/submenu.php
+++ b/modules/catalog/widgets/views/submenu.php
@@ -3,7 +3,7 @@
      * @var Category $rootCategory
      * @var string   $rootClass
      */
-    use artweb\artbox\modules\product\models\Category;
+    use artweb\artbox\modules\catalog\models\Category;
 
 ?>
 <div class="menu_item">
diff --git a/views/brand/_form.php b/views/brand/_form.php
index c61e0bd..a82fdd2 100755
--- a/views/brand/_form.php
+++ b/views/brand/_form.php
@@ -1,8 +1,8 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\BrandLang;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\BrandLang;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
diff --git a/views/brand/_form_language.php b/views/brand/_form_language.php
index b0ec20b..d0620ca 100755
--- a/views/brand/_form_language.php
+++ b/views/brand/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\BrandLang;
+    use artweb\artbox\modules\catalog\models\BrandLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/views/brand/create.php b/views/brand/create.php
index e231cb7..980c62d 100755
--- a/views/brand/create.php
+++ b/views/brand/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\BrandLang;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\BrandLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/brand/index.php b/views/brand/index.php
index 50b0ce6..82e4c04 100755
--- a/views/brand/index.php
+++ b/views/brand/index.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\BrandSearch;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\BrandSearch;
     use yii\data\ActiveDataProvider;
     use yii\helpers\Html;
     use yii\grid\GridView;
diff --git a/views/brand/update.php b/views/brand/update.php
index a0536b7..6714bd9 100755
--- a/views/brand/update.php
+++ b/views/brand/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Brand;
-    use artweb\artbox\modules\product\models\BrandLang;
+    use artweb\artbox\modules\catalog\models\Brand;
+    use artweb\artbox\modules\catalog\models\BrandLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/brand/view.php b/views/brand/view.php
index c0c8440..aefcc3f 100755
--- a/views/brand/view.php
+++ b/views/brand/view.php
@@ -1,6 +1,6 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Brand;
+    use artweb\artbox\modules\catalog\models\Brand;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\DetailView;
diff --git a/views/category/_form.php b/views/category/_form.php
index 937f0ae..ed364a1 100755
--- a/views/category/_form.php
+++ b/views/category/_form.php
@@ -1,8 +1,8 @@
 <?php
     
     use artweb\artbox\modules\language\widgets\LanguageForm;
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\CategoryLang;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\CategoryLang;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
diff --git a/views/category/_form_language.php b/views/category/_form_language.php
index 6898b8c..d61c516 100755
--- a/views/category/_form_language.php
+++ b/views/category/_form_language.php
@@ -1,6 +1,6 @@
 <?php
     use artweb\artbox\modules\language\models\Language;
-    use artweb\artbox\modules\product\models\CategoryLang;
+    use artweb\artbox\modules\catalog\models\CategoryLang;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/views/category/create.php b/views/category/create.php
index 096c410..3a7d897 100755
--- a/views/category/create.php
+++ b/views/category/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\CategoryLang;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\CategoryLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/category/index.php b/views/category/index.php
index 1aeefb3..04e99ca 100755
--- a/views/category/index.php
+++ b/views/category/index.php
@@ -1,12 +1,12 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Category;
+    use artweb\artbox\modules\catalog\models\Category;
     use yii\helpers\Html;
     use kartik\grid\GridView;
     
     /**
      * @var $this         yii\web\View
-     * @var $searchModel  artweb\artbox\modules\product\models\CategorySearch
+     * @var $searchModel  artweb\artbox\modules\catalog\models\CategorySearch
      * @var $dataProvider yii\data\ActiveDataProvider
      */
     $this->title = Yii::t('product', 'Categories');
diff --git a/views/category/update.php b/views/category/update.php
index a816c33..d0a5ea6 100755
--- a/views/category/update.php
+++ b/views/category/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Category;
-    use artweb\artbox\modules\product\models\CategoryLang;
+    use artweb\artbox\modules\catalog\models\Category;
+    use artweb\artbox\modules\catalog\models\CategoryLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/category/view.php b/views/category/view.php
index 66b5215..ee80200 100755
--- a/views/category/view.php
+++ b/views/category/view.php
@@ -1,6 +1,6 @@
 <?php
     
-    use artweb\artbox\modules\product\models\Category;
+    use artweb\artbox\modules\catalog\models\Category;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\DetailView;
--
libgit2 0.21.4