Testing

Yarik
1 parent ea1a19bc
Showing 110 changed files with 230 additions and 224 deletions Show diff stats
Module.php
behaviors/NotifyBehavior.php
behaviors/RatingBehavior.php
components/artboxtree/treegrid/TreeGridWidget.php
console/controllers/GenerateController.php
console/controllers/ImportController.php
console/controllers/SiteMapController.php
controllers/BrandController.php
controllers/CategoryController.php
controllers/OrderController.php
models/Basket.php
models/Order.php
models/OrderProduct.php
models/ProductToRating.php
models/private/OrderProduct.php
models/private/OrderProducts.php
modules/blog/controllers/BlogArticleController.php
modules/blog/models/BlogArticle.php
modules/catalog/Module.php
modules/catalog/behaviors/FilterBehavior.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
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -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
@@ -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;
@@ -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;
@@ -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;
     /**
@@ -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
@@ -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;
@@ -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;
 <?php
-    namespace artweb\artbox\modules\product;
+    namespace artweb\artbox\modules\catalog;
     /**
      * product module definition class
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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
 <?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;
 <?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;
 <?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;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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
     {
 <?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;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\components\artboxtree\ArtboxTreeQueryTrait;
     use yii\db\ActiveQuery;
 <?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
     {
 <?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
 <?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
     {
 <?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;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use Yii;
     use yii\db\ActiveRecord;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\behaviors\ImageBehavior;
     use Yii;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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;
 <?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
     {
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use yii\db\ActiveRecord;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use Yii;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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
     {
 <?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;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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;
     /**
 <?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
     {
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\behaviors\LanguageBehavior;
     use Yii;
 <?php
-    namespace artweb\artbox\modules\product\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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;
 <?php
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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;
     /**
 <?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;
 <?php
-    namespace artweb\artbox\modules\rubrication\models;
+    namespace artweb\artbox\modules\catalog\models;
     use artweb\artbox\modules\language\models\Language;
     use Yii;
 <?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
     {
 <?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
 <?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;
 <?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;
 <?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;
@@ -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;
 <?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;
     /**
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
     /**
 <?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;
 <?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;
 <?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;
 <?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;
@@ -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' ][] = [
 <?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
 <?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;
 <?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
      */
 <?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
      */
 <?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
      */
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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;
 <?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
 <?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
 <?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;
 <?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;
@@ -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">
 <?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;
 <?php
-    use artweb\artbox\modules\product\models\Product;
+    use artweb\artbox\modules\catalog\models\Product;
     use yii\web\View;
     /**
@@ -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">
 <?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;
 <?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;