Commit 1cd0fb0f4f88d3e333308ff082cde1d180af7130

Authored by Yarik
1 parent ea1a19bc

Testing

Showing 110 changed files with 230 additions and 224 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 110 files are displayed.

Module.php
... ... @@ -7,6 +7,12 @@
7 7 public function init()
8 8 {
9 9 parent::init();
  10 +
  11 + $this->modules = [
  12 + 'catalog' => [
  13 + 'class' => '\artweb\artbox\modules\catalog\Module',
  14 + ],
  15 + ];
10 16 }
11 17 }
12 18  
13 19 \ No newline at end of file
... ...
behaviors/NotifyBehavior.php
... ... @@ -4,7 +4,7 @@
4 4  
5 5 use artweb\artbox\models\Article;
6 6 use artweb\artbox\modules\comment\models\CommentModel;
7   - use artweb\artbox\modules\product\models\Product;
  7 + use artweb\artbox\modules\catalog\models\Product;
8 8 use artweb\artbox\widgets\Mailer;
9 9 use yii\base\Behavior;
10 10 use yii\base\Event;
... ...
behaviors/RatingBehavior.php
... ... @@ -4,7 +4,7 @@
4 4  
5 5 use artweb\artbox\models\Article;
6 6 use artweb\artbox\modules\comment\models\CommentModel;
7   - use artweb\artbox\modules\product\models\Product;
  7 + use artweb\artbox\modules\catalog\models\Product;
8 8 use yii\base\Behavior;
9 9 use yii\base\Event;
10 10 use yii\db\ActiveRecord;
... ...
components/artboxtree/treegrid/TreeGridWidget.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace artweb\artbox\components\artboxtree\treegrid;
4 4  
5   -use artweb\artbox\modules\rubrication\models\TaxOption;
  5 +use artweb\artbox\modules\catalog\models\TaxOption;
6 6 use Yii;
7 7 use yii\helpers\Html;
8 8 use yii\helpers\ArrayHelper;
... ...
console/controllers/GenerateController.php
... ... @@ -2,12 +2,12 @@
2 2  
3 3 namespace console\controllers;
4 4  
5   - use artweb\artbox\modules\product\models\Brand;
6   - use artweb\artbox\modules\product\models\Category;
7   - use artweb\artbox\modules\product\models\Product;
8   - use artweb\artbox\modules\product\models\ProductVariant;
9   - use artweb\artbox\modules\rubrication\models\TaxGroup;
10   - use artweb\artbox\modules\rubrication\models\TaxOption;
  5 + use artweb\artbox\modules\catalog\models\Brand;
  6 + use artweb\artbox\modules\catalog\models\Category;
  7 + use artweb\artbox\modules\catalog\models\Product;
  8 + use artweb\artbox\modules\catalog\models\ProductVariant;
  9 + use artweb\artbox\modules\catalog\models\TaxGroup;
  10 + use artweb\artbox\modules\catalog\models\TaxOption;
11 11 use Faker\Factory;
12 12 use Faker\Generator;
13 13 use yii\console\Controller;
... ...
console/controllers/ImportController.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace console\controllers;
4 4  
5   -use artweb\artbox\modules\product\models\Import;
  5 +use artweb\artbox\modules\catalog\models\Import;
6 6 use Yii;
7 7 use yii\console\Controller;
8 8  
... ...
console/controllers/SiteMapController.php
... ... @@ -4,8 +4,8 @@ namespace console\controllers;
4 4  
5 5 use artweb\artbox\models\Article;
6 6 use artweb\artbox\models\Seo;
7   -use artweb\artbox\modules\product\models\Category;
8   -use artweb\artbox\modules\product\models\Product;
  7 +use artweb\artbox\modules\catalog\models\Category;
  8 +use artweb\artbox\modules\catalog\models\Product;
9 9 use frontend\models\ProductFrontendSearch;
10 10 use Yii;
11 11 use artweb\artbox\models\Page;
... ...
controllers/BrandController.php
... ... @@ -3,8 +3,8 @@
3 3 namespace artweb\artbox\controllers;
4 4  
5 5 use Yii;
6   - use artweb\artbox\modules\product\models\Brand;
7   - use artweb\artbox\modules\product\models\BrandSearch;
  6 + use artweb\artbox\modules\catalog\models\Brand;
  7 + use artweb\artbox\modules\catalog\models\BrandSearch;
8 8 use yii\web\Controller;
9 9 use yii\web\NotFoundHttpException;
10 10 use yii\filters\VerbFilter;
... ...
controllers/CategoryController.php
... ... @@ -5,8 +5,8 @@
5 5 use developeruz\db_rbac\behaviors\AccessBehavior;
6 6 use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
7 7 use Yii;
8   - use artweb\artbox\modules\product\models\Category;
9   - use artweb\artbox\modules\product\models\CategorySearch;
  8 + use artweb\artbox\modules\catalog\models\Category;
  9 + use artweb\artbox\modules\catalog\models\CategorySearch;
10 10 use yii\web\Controller;
11 11 use yii\web\NotFoundHttpException;
12 12 use yii\filters\VerbFilter;
... ...
controllers/OrderController.php
... ... @@ -10,7 +10,7 @@
10 10 use yii\web\HttpException;
11 11 use artweb\artbox\models\Order;
12 12 use artweb\artbox\models\OrderProduct;
13   - use artweb\artbox\modules\product\models\ProductVariant;
  13 + use artweb\artbox\modules\catalog\models\ProductVariant;
14 14 use yii\web\NotFoundHttpException;
15 15 use developeruz\db_rbac\behaviors\AccessBehavior;
16 16  
... ...
models/Basket.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace artweb\artbox\models;
4 4  
5   - use artweb\artbox\modules\product\models\ProductVariant;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
6 6 use yii\base\Component;
7 7 use yii\web\NotFoundHttpException;
8 8  
... ... @@ -146,7 +146,7 @@
146 146 *
147 147 * @param int $product_variant_id
148 148 *
149   - * @return \artweb\artbox\modules\product\models\ProductVariant
  149 + * @return \artweb\artbox\modules\catalog\models\ProductVariant
150 150 * @throws \yii\web\NotFoundHttpException
151 151 */
152 152 public function findModel(int $product_variant_id): ProductVariant
... ...
models/Order.php
... ... @@ -5,7 +5,7 @@
5 5 use yii\db\ActiveRecord;
6 6 use yii\db\Expression;
7 7 use yii\web\Session;
8   - use artweb\artbox\modules\product\models\ProductVariant;
  8 + use artweb\artbox\modules\catalog\models\ProductVariant;
9 9  
10 10 /**
11 11 * Class Order
... ...
models/OrderProduct.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace artweb\artbox\models;
4 4  
5   - use artweb\artbox\modules\product\models\ProductVariant;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
6 6 use Yii;
7 7 use yii\db\ActiveRecord;
8 8  
... ...
models/ProductToRating.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace artweb\artbox\models;
4 4  
5   - use artweb\artbox\modules\product\models\Product;
  5 + use artweb\artbox\modules\catalog\models\Product;
6 6 use Yii;
7 7 use yii\db\ActiveRecord;
8 8  
... ...
models/private/OrderProduct.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace artweb\artbox\models;
4 4  
5   - use artweb\artbox\modules\product\models\ProductVariant;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
6 6 use yii\db\ActiveRecord;
7 7  
8 8 /**
... ...
models/private/OrderProducts.php
... ... @@ -2,7 +2,7 @@
2 2  
3 3 namespace artweb\artbox\models;
4 4  
5   - use artweb\artbox\modules\product\models\ProductVariant;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
6 6 use yii\db\ActiveRecord;
7 7  
8 8 class orderProduct extends ActiveRecord
... ...
modules/blog/controllers/BlogArticleController.php
... ... @@ -4,7 +4,7 @@
4 4  
5 5 use artweb\artbox\modules\blog\models\BlogCategory;
6 6 use artweb\artbox\modules\blog\models\BlogTag;
7   - use artweb\artbox\modules\product\models\Product;
  7 + use artweb\artbox\modules\catalog\models\Product;
8 8 use Yii;
9 9 use artweb\artbox\modules\blog\models\BlogArticle;
10 10 use artweb\artbox\modules\blog\models\BlogArticleSearch;
... ...
modules/blog/models/BlogArticle.php
... ... @@ -7,7 +7,7 @@
7 7 use yii\db\ActiveRecord;
8 8 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
9 9 use artweb\artbox\modules\language\models\Language;
10   - use artweb\artbox\modules\product\models\Product;
  10 + use artweb\artbox\modules\catalog\models\Product;
11 11 use yii\db\ActiveQuery;
12 12 use yii\web\Request;
13 13  
... ...
modules/catalog/Module.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product;
  3 + namespace artweb\artbox\modules\catalog;
4 4  
5 5 /**
6 6 * product module definition class
... ...
modules/catalog/behaviors/FilterBehavior.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\behaviors;
  3 + namespace artweb\artbox\modules\catalog\behaviors;
4 4  
5   - use artweb\artbox\modules\product\models\ProductOption;
6   - use artweb\artbox\modules\rubrication\models\TaxOption;
  5 + use artweb\artbox\modules\catalog\models\ProductOption;
  6 + use artweb\artbox\modules\catalog\models\TaxOption;
7 7 use yii\base\Behavior;
8 8 use yii\db\ActiveRecord;
9 9  
... ...
modules/catalog/controllers/ManageController.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\controllers;
  3 + namespace artweb\artbox\modules\catalog\controllers;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6   - use artweb\artbox\modules\product\models\Export;
7   - use artweb\artbox\modules\product\models\Import;
8   - use artweb\artbox\modules\product\models\ProductImage;
  6 + use artweb\artbox\modules\catalog\models\Export;
  7 + use artweb\artbox\modules\catalog\models\Import;
  8 + use artweb\artbox\modules\catalog\models\ProductImage;
9 9 use Yii;
10   - use artweb\artbox\modules\product\models\Product;
11   - use artweb\artbox\modules\product\models\ProductSearch;
  10 + use artweb\artbox\modules\catalog\models\Product;
  11 + use artweb\artbox\modules\catalog\models\ProductSearch;
12 12 use yii\db\ActiveQuery;
13 13 use yii\web\Controller;
14 14 use yii\web\NotFoundHttpException;
... ...
modules/catalog/controllers/ProductUnitController.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\controllers;
  3 + namespace artweb\artbox\modules\catalog\controllers;
4 4  
5 5 use Yii;
6   - use artweb\artbox\modules\product\models\ProductUnit;
7   - use artweb\artbox\modules\product\models\ProductUnitSearch;
  6 + use artweb\artbox\modules\catalog\models\ProductUnit;
  7 + use artweb\artbox\modules\catalog\models\ProductUnitSearch;
8 8 use yii\web\Controller;
9 9 use yii\web\NotFoundHttpException;
10 10 use yii\filters\VerbFilter;
... ...
modules/catalog/controllers/TaxGroupController.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\controllers;
  3 + namespace artweb\artbox\modules\catalog\controllers;
4 4  
5 5 use Yii;
6   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  6 + use artweb\artbox\modules\catalog\models\TaxGroup;
7 7 use yii\data\ActiveDataProvider;
8 8 use yii\web\Controller;
9 9 use yii\web\NotFoundHttpException;
... ...
modules/catalog/controllers/TaxOptionController.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\controllers;
  3 + namespace artweb\artbox\modules\catalog\controllers;
4 4  
5   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  5 + use artweb\artbox\modules\catalog\models\TaxGroup;
6 6 use Yii;
7   - use artweb\artbox\modules\rubrication\models\TaxOption;
8   - use artweb\artbox\modules\rubrication\models\TaxOptionSearch;
  7 + use artweb\artbox\modules\catalog\models\TaxOption;
  8 + use artweb\artbox\modules\catalog\models\TaxOptionSearch;
9 9 use yii\db\ActiveQuery;
10 10 use yii\web\Controller;
11 11 use yii\web\NotFoundHttpException;
... ...
modules/catalog/controllers/VariantController.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\controllers;
  3 + namespace artweb\artbox\modules\catalog\controllers;
4 4  
5   - use artweb\artbox\modules\product\models\Product;
6   - use artweb\artbox\modules\product\models\ProductImage;
7   - use artweb\artbox\modules\product\models\ProductStock;
8   - use artweb\artbox\modules\product\models\ProductVariant;
9   - use artweb\artbox\modules\product\models\ProductVariantSearch;
10   - use artweb\artbox\modules\product\models\Stock;
  5 + use artweb\artbox\modules\catalog\models\Product;
  6 + use artweb\artbox\modules\catalog\models\ProductImage;
  7 + use artweb\artbox\modules\catalog\models\ProductStock;
  8 + use artweb\artbox\modules\catalog\models\ProductVariant;
  9 + use artweb\artbox\modules\catalog\models\ProductVariantSearch;
  10 + use artweb\artbox\modules\catalog\models\Stock;
11 11 use Yii;
12 12 use yii\db\ActiveQuery;
13 13 use yii\web\Controller;
... ... @@ -209,7 +209,7 @@
209 209 /**
210 210 * Save ProductStocks for ProductVariant and return total count of products.
211 211 *
212   - * @param \artweb\artbox\modules\product\models\ProductVariant $productVariant
  212 + * @param \artweb\artbox\modules\catalog\models\ProductVariant $productVariant
213 213 * @param array|null $productStocks
214 214 *
215 215 * @return int
... ...
modules/catalog/helpers/FilterHelper.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\helpers;
  3 + namespace artweb\artbox\modules\catalog\helpers;
4 4  
5   - use artweb\artbox\modules\product\models\BrandLang;
6   - use artweb\artbox\modules\product\models\CategoryLang;
7   - use artweb\artbox\modules\product\models\Product;
8   - use artweb\artbox\modules\product\models\ProductLang;
9   - use artweb\artbox\modules\product\models\ProductVariant;
10   - use artweb\artbox\modules\product\models\ProductVariantLang;
11   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  5 + use artweb\artbox\modules\catalog\models\BrandLang;
  6 + use artweb\artbox\modules\catalog\models\CategoryLang;
  7 + use artweb\artbox\modules\catalog\models\Product;
  8 + use artweb\artbox\modules\catalog\models\ProductLang;
  9 + use artweb\artbox\modules\catalog\models\ProductVariant;
  10 + use artweb\artbox\modules\catalog\models\ProductVariantLang;
  11 + use artweb\artbox\modules\catalog\models\TaxGroup;
12 12 use yii\base\Object;
13 13 use yii\db\ActiveQuery;
14 14 use yii\db\Query;
... ...
modules/catalog/helpers/ProductHelper.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\helpers;
  3 + namespace artweb\artbox\modules\catalog\helpers;
4 4  
5   - use artweb\artbox\modules\product\models\Category;
6   - use artweb\artbox\modules\product\models\Product;
  5 + use artweb\artbox\modules\catalog\models\Category;
  6 + use artweb\artbox\modules\catalog\models\Product;
7 7 use yii\base\Object;
8 8 use Yii;
9 9 use yii\db\ActiveQuery;
... ...
modules/catalog/models/Brand.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\behaviors\SaveImgBehavior;
6 6 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
... ...
modules/catalog/models/BrandLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/BrandSearch.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\base\Model;
6 6 use yii\data\ActiveDataProvider;
7 7  
8 8 /**
9 9 * BrandSearch represents the model behind the search form about
10   - * `artweb\artbox\modules\product\models\Brand`.
  10 + * `artweb\artbox\modules\catalog\models\Brand`.
11 11 */
12 12 class BrandSearch extends Brand
13 13 {
... ...
modules/catalog/models/Category.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\behaviors\SaveImgBehavior;
6 6 use artweb\artbox\components\artboxtree\ArtboxTreeBehavior;
7 7 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
8 8 use artweb\artbox\modules\language\models\Language;
9   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  9 + use artweb\artbox\modules\catalog\models\TaxGroup;
10 10 use Yii;
11 11 use yii\base\InvalidParamException;
12 12 use yii\db\ActiveQuery;
... ...
modules/catalog/models/CategoryLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/CategoryQuery.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\components\artboxtree\ArtboxTreeQueryTrait;
6 6 use yii\db\ActiveQuery;
... ...
modules/catalog/models/CategorySearch.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\base\Model;
6 6 use yii\data\ActiveDataProvider;
7 7  
8 8 /**
9 9 * CategorySearch represents the model behind the search form about
10   - * `artweb\artbox\modules\product\models\Category`.
  10 + * `artweb\artbox\modules\catalog\models\Category`.
11 11 */
12 12 class CategorySearch extends Category
13 13 {
... ...
modules/catalog/models/Export.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6   - use artweb\artbox\modules\rubrication\models\TaxOption;
  6 + use artweb\artbox\modules\catalog\models\TaxOption;
7 7 use yii\base\Model;
8 8  
9 9 class Export extends Model
... ...
modules/catalog/models/Import.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6   - use artweb\artbox\modules\rubrication\models\TaxGroup;
7   - use artweb\artbox\modules\rubrication\models\TaxOption;
  6 + use artweb\artbox\modules\catalog\models\TaxGroup;
  7 + use artweb\artbox\modules\catalog\models\TaxOption;
8 8 use Yii;
9 9 use yii\base\Model;
10 10 use yii\helpers\ArrayHelper;
... ... @@ -12,7 +12,7 @@
12 12 /**
13 13 * Class Import
14 14 *
15   - * @package artweb\artbox\modules\product\models
  15 + * @package artweb\artbox\modules\catalog\models
16 16 */
17 17 class Import extends Model
18 18 {
... ...
modules/catalog/models/Product.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\behaviors\MultipleImgBehavior;
6 6 use artweb\artbox\behaviors\SaveMultipleFileBehavior;
7 7 use artweb\artbox\models\ProductToRating;
8 8 use artweb\artbox\modules\comment\models\CommentModel;
9 9 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
10   - use artweb\artbox\modules\rubrication\models\TaxGroup;
11   - use artweb\artbox\modules\rubrication\models\TaxGroupToCategory;
12   - use artweb\artbox\modules\rubrication\models\TaxOption;
  10 + use artweb\artbox\modules\catalog\models\TaxGroup;
  11 + use artweb\artbox\modules\catalog\models\TaxGroupToCategory;
  12 + use artweb\artbox\modules\catalog\models\TaxOption;
13 13 use Yii;
14 14 use yii\base\InvalidParamException;
15 15 use yii\db\ActiveQuery;
... ...
modules/catalog/models/ProductCategory.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use Yii;
6 6 use yii\db\ActiveRecord;
... ...
modules/catalog/models/ProductImage.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\behaviors\ImageBehavior;
6 6 use Yii;
... ...
modules/catalog/models/ProductLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/ProductOption.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5   - use artweb\artbox\modules\rubrication\models\TaxOption;
  5 + use artweb\artbox\modules\catalog\models\TaxOption;
6 6 use Yii;
7 7 use yii\db\ActiveRecord;
8 8  
... ...
modules/catalog/models/ProductSearch.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\base\Model;
6 6 use yii\data\ActiveDataProvider;
... ... @@ -8,7 +8,7 @@
8 8  
9 9 /**
10 10 * ProductSearch represents the model behind the search form about
11   - * `artweb\artbox\modules\product\models\Product`.
  11 + * `artweb\artbox\modules\catalog\models\Product`.
12 12 */
13 13 class ProductSearch extends Product
14 14 {
... ...
modules/catalog/models/ProductStock.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\db\ActiveRecord;
6 6  
... ...
modules/catalog/models/ProductUnit.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
6 6 use Yii;
... ...
modules/catalog/models/ProductUnitLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/ProductUnitSearch.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\base\Model;
6 6 use yii\data\ActiveDataProvider;
7 7  
8 8 /**
9 9 * ProductUnitSearch represents the model behind the search form about
10   - * `artweb\artbox\modules\product\models\ProductUnit`.
  10 + * `artweb\artbox\modules\catalog\models\ProductUnit`.
11 11 */
12 12 class ProductUnitSearch extends ProductUnit
13 13 {
... ...
modules/catalog/models/ProductVariant.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\behaviors\MultipleImgBehavior;
6 6 use artweb\artbox\behaviors\SaveMultipleFileBehavior;
7 7 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
8   - use artweb\artbox\modules\rubrication\models\TaxGroup;
9   - use artweb\artbox\modules\rubrication\models\TaxOption;
  8 + use artweb\artbox\modules\catalog\models\TaxGroup;
  9 + use artweb\artbox\modules\catalog\models\TaxOption;
10 10 use Yii;
11 11 use yii\base\InvalidParamException;
12 12 use yii\db\ActiveQuery;
... ...
modules/catalog/models/ProductVariantLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/ProductVariantOption.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5   - use artweb\artbox\modules\rubrication\models\TaxOption;
  5 + use artweb\artbox\modules\catalog\models\TaxOption;
6 6 use yii\db\ActiveRecord;
7 7  
8 8 /**
... ...
modules/catalog/models/ProductVariantSearch.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\base\Model;
6 6 use yii\data\ActiveDataProvider;
7 7  
8 8 /**
9 9 * ProductVariantSearch represents the model behind the search form about
10   - * `artweb\artbox\modules\product\models\ProductVariant`.
  10 + * `artweb\artbox\modules\catalog\models\ProductVariant`.
11 11 */
12 12 class ProductVariantSearch extends ProductVariant
13 13 {
... ...
modules/catalog/models/Stock.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
6 6 use Yii;
... ...
modules/catalog/models/StockLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/TaxGroup.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
6 6 use artweb\artbox\modules\language\models\Language;
7   - use artweb\artbox\modules\product\models\Category;
  7 + use artweb\artbox\modules\catalog\models\Category;
8 8 use yii\base\InvalidValueException;
9 9 use yii\db\ActiveQuery;
10 10 use yii\db\ActiveRecord;
... ...
modules/catalog/models/TaxGroupLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/TaxGroupToCategory.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5   - use artweb\artbox\modules\product\models\Category;
  5 + use artweb\artbox\modules\catalog\models\Category;
6 6 use yii\db\ActiveRecord;
7 7  
8 8 /**
... ...
modules/catalog/models/TaxOption.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\behaviors\SaveImgBehavior;
6 6 use artweb\artbox\modules\language\behaviors\LanguageBehavior;
7   - use artweb\artbox\modules\product\models\Product;
8   - use artweb\artbox\modules\product\models\ProductVariant;
  7 + use artweb\artbox\modules\catalog\models\Product;
  8 + use artweb\artbox\modules\catalog\models\ProductVariant;
9 9 use Yii;
10 10 use yii\db\ActiveQuery;
11 11 use yii\db\ActiveRecord;
... ...
modules/catalog/models/TaxOptionLang.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use artweb\artbox\modules\language\models\Language;
6 6 use Yii;
... ...
modules/catalog/models/TaxOptionSearch.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\rubrication\models;
  3 + namespace artweb\artbox\modules\catalog\models;
4 4  
5 5 use yii\base\Model;
6 6 use yii\data\ActiveDataProvider;
7 7  
8 8 /**
9 9 * TaxOptionSearch represents the model behind the search form about
10   - * `artweb\artbox\modules\rubrication\models\TaxOption`.
  10 + * `artweb\artbox\modules\catalog\models\TaxOption`.
11 11 */
12 12 class TaxOptionSearch extends TaxOption
13 13 {
... ...
modules/catalog/views/manage/_form.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\widgets\LanguageForm;
4   - use artweb\artbox\modules\product\models\Brand;
5   - use artweb\artbox\modules\product\models\ProductLang;
6   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\Brand;
  5 + use artweb\artbox\modules\catalog\models\ProductLang;
  6 + use artweb\artbox\modules\catalog\models\TaxGroup;
7 7 use yii\db\ActiveQuery;
8 8 use yii\helpers\Html;
9 9 use yii\widgets\ActiveForm;
10 10 use yii\helpers\ArrayHelper;
11 11 use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
12   - use artweb\artbox\modules\product\helpers\ProductHelper;
  12 + use artweb\artbox\modules\catalog\helpers\ProductHelper;
13 13 use kartik\select2\Select2;
14 14  
15 15 /**
16 16 * @var yii\web\View $this
17   - * @var artweb\artbox\modules\product\models\Product $model
  17 + * @var artweb\artbox\modules\catalog\models\Product $model
18 18 * @var ProductLang[] $modelLangs
19 19 * @var yii\widgets\ActiveForm $form
20 20 * @var ActiveQuery $groups
... ...
modules/catalog/views/manage/_form_language.php
1 1 <?php
2 2 use artweb\artbox\modules\language\models\Language;
3   - use artweb\artbox\modules\product\models\ProductLang;
  3 + use artweb\artbox\modules\catalog\models\ProductLang;
4 4 use mihaildev\ckeditor\CKEditor;
5 5 use mihaildev\elfinder\ElFinder;
6 6 use yii\web\View;
... ...
modules/catalog/views/manage/create.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Product;
4   - use artweb\artbox\modules\product\models\ProductLang;
  3 + use artweb\artbox\modules\catalog\models\Product;
  4 + use artweb\artbox\modules\catalog\models\ProductLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
modules/catalog/views/manage/export.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\models\Language;
4   - use artweb\artbox\modules\product\models\Export;
  4 + use artweb\artbox\modules\catalog\models\Export;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7 use yii\widgets\ActiveForm;
... ...
modules/catalog/views/manage/import.php
... ... @@ -5,7 +5,7 @@
5 5 * @var array $languages
6 6 */
7 7  
8   - use artweb\artbox\modules\product\models\Import;
  8 + use artweb\artbox\modules\catalog\models\Import;
9 9 use yii\helpers\Html;
10 10 use yii\widgets\ActiveForm;
11 11  
... ...
modules/catalog/views/manage/index.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Brand;
4   - use artweb\artbox\modules\product\models\Category;
5   - use artweb\artbox\modules\product\models\Product;
6   - use artweb\artbox\modules\product\models\ProductSearch;
  3 + use artweb\artbox\modules\catalog\models\Brand;
  4 + use artweb\artbox\modules\catalog\models\Category;
  5 + use artweb\artbox\modules\catalog\models\Product;
  6 + use artweb\artbox\modules\catalog\models\ProductSearch;
7 7 use yii\data\ActiveDataProvider;
8 8 use yii\helpers\Html;
9 9 use yii\grid\GridView;
10 10 use kartik\select2\Select2;
11 11 use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
12   - use artweb\artbox\modules\product\helpers\ProductHelper;
  12 + use artweb\artbox\modules\catalog\helpers\ProductHelper;
13 13 use yii\web\View;
14 14  
15 15 /**
... ...
modules/catalog/views/manage/update.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Product;
4   - use artweb\artbox\modules\product\models\ProductLang;
  3 + use artweb\artbox\modules\catalog\models\Product;
  4 + use artweb\artbox\modules\catalog\models\ProductLang;
5 5 use yii\db\ActiveQuery;
6 6 use yii\helpers\Html;
7 7 use yii\web\View;
... ...
modules/catalog/views/manage/view.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Category;
4   - use artweb\artbox\modules\product\models\Product;
5   - use artweb\artbox\modules\product\models\ProductVariant;
6   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  3 + use artweb\artbox\modules\catalog\models\Category;
  4 + use artweb\artbox\modules\catalog\models\Product;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
  6 + use artweb\artbox\modules\catalog\models\TaxGroup;
7 7 use yii\helpers\ArrayHelper;
8 8 use yii\helpers\Html;
9 9 use yii\web\View;
... ...
modules/catalog/views/product-unit/_form.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\widgets\LanguageForm;
4   - use artweb\artbox\modules\product\models\ProductUnit;
5   - use artweb\artbox\modules\product\models\ProductUnitLang;
  4 + use artweb\artbox\modules\catalog\models\ProductUnit;
  5 + use artweb\artbox\modules\catalog\models\ProductUnitLang;
6 6 use yii\helpers\Html;
7 7 use yii\web\View;
8 8 use yii\widgets\ActiveForm;
... ...
modules/catalog/views/product-unit/_form_language.php
1 1 <?php
2 2 use artweb\artbox\modules\language\models\Language;
3   - use artweb\artbox\modules\product\models\ProductUnitLang;
  3 + use artweb\artbox\modules\catalog\models\ProductUnitLang;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...
modules/catalog/views/product-unit/create.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\ProductUnit;
4   - use artweb\artbox\modules\product\models\ProductUnitLang;
  3 + use artweb\artbox\modules\catalog\models\ProductUnit;
  4 + use artweb\artbox\modules\catalog\models\ProductUnitLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
modules/catalog/views/product-unit/index.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\ProductUnitSearch;
  3 + use artweb\artbox\modules\catalog\models\ProductUnitSearch;
4 4 use yii\data\ActiveDataProvider;
5 5 use yii\helpers\Html;
6 6 use yii\grid\GridView;
... ...
modules/catalog/views/product-unit/update.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\ProductUnit;
4   - use artweb\artbox\modules\product\models\ProductUnitLang;
  3 + use artweb\artbox\modules\catalog\models\ProductUnit;
  4 + use artweb\artbox\modules\catalog\models\ProductUnitLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
modules/catalog/views/product-unit/view.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\ProductUnit;
  3 + use artweb\artbox\modules\catalog\models\ProductUnit;
4 4 use yii\helpers\Html;
5 5 use yii\web\View;
6 6 use yii\widgets\DetailView;
... ...
modules/catalog/views/tax-group/_form.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\widgets\LanguageForm;
4   - use artweb\artbox\modules\rubrication\models\TaxGroup;
5   - use artweb\artbox\modules\rubrication\models\TaxGroupLang;
  4 + use artweb\artbox\modules\catalog\models\TaxGroup;
  5 + use artweb\artbox\modules\catalog\models\TaxGroupLang;
6 6 use yii\helpers\Html;
7 7 use yii\web\View;
8 8 use yii\widgets\ActiveForm;
9   - use artweb\artbox\modules\product\helpers\ProductHelper;
  9 + use artweb\artbox\modules\catalog\helpers\ProductHelper;
10 10 use artweb\artbox\components\artboxtree\ArtboxTreeHelper;
11 11  
12 12 /**
... ...
modules/catalog/views/tax-group/_form_language.php
1 1 <?php
2 2 use artweb\artbox\modules\language\models\Language;
3   - use artweb\artbox\modules\rubrication\models\TaxGroupLang;
  3 + use artweb\artbox\modules\catalog\models\TaxGroupLang;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...
modules/catalog/views/tax-group/create.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\rubrication\models\TaxGroup;
4   - use artweb\artbox\modules\rubrication\models\TaxGroupLang;
  3 + use artweb\artbox\modules\catalog\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\TaxGroupLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
modules/catalog/views/tax-group/index.php
1 1 <?php
2   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  2 + use artweb\artbox\modules\catalog\models\TaxGroup;
3 3 use yii\data\ActiveDataProvider;
4 4 use yii\helpers\Html;
5 5 use yii\grid\GridView;
... ...
modules/catalog/views/tax-group/update.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\rubrication\models\TaxGroup;
4   - use artweb\artbox\modules\rubrication\models\TaxGroupLang;
  3 + use artweb\artbox\modules\catalog\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\TaxGroupLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
modules/catalog/views/tax-group/view.php
... ... @@ -4,7 +4,7 @@
4 4 use yii\widgets\DetailView;
5 5  
6 6 /* @var $this yii\web\View */
7   - /* @var $model artweb\artbox\modules\rubrication\models\TaxGroup */
  7 + /* @var $model artweb\artbox\modules\catalog\models\TaxGroup */
8 8  
9 9 $this->title = $model->id;
10 10 $this->params[ 'breadcrumbs' ][] = [
... ...
modules/catalog/views/tax-option/_form.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\widgets\LanguageForm;
4   - use artweb\artbox\modules\rubrication\models\TaxGroup;
5   - use artweb\artbox\modules\rubrication\models\TaxOptionLang;
  4 + use artweb\artbox\modules\catalog\models\TaxGroup;
  5 + use artweb\artbox\modules\catalog\models\TaxOptionLang;
6 6 use yii\helpers\ArrayHelper;
7 7 use yii\helpers\Html;
8 8 use yii\widgets\ActiveForm;
9   - use artweb\artbox\modules\rubrication\models\TaxOption;
  9 + use artweb\artbox\modules\catalog\models\TaxOption;
10 10  
11 11 /**
12 12 * @var yii\web\View $this
13   - * @var artweb\artbox\modules\rubrication\models\TaxOption $model
  13 + * @var artweb\artbox\modules\catalog\models\TaxOption $model
14 14 * @var yii\widgets\ActiveForm $form
15 15 * @var TaxGroup $group
16 16 * @var TaxOptionLang[] $modelLangs
... ...
modules/catalog/views/tax-option/_form_language.php
1 1 <?php
2 2 use artweb\artbox\modules\language\models\Language;
3   - use artweb\artbox\modules\rubrication\models\TaxOptionLang;
  3 + use artweb\artbox\modules\catalog\models\TaxOptionLang;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...
modules/catalog/views/tax-option/create.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\rubrication\models\TaxGroup;
4   - use artweb\artbox\modules\rubrication\models\TaxOptionLang;
  3 + use artweb\artbox\modules\catalog\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\TaxOptionLang;
5 5 use yii\helpers\Html;
6 6  
7 7 /**
8 8 * @var yii\web\View $this
9   - * @var artweb\artbox\modules\rubrication\models\TaxOption $model
  9 + * @var artweb\artbox\modules\catalog\models\TaxOption $model
10 10 * @var TaxGroup $group
11 11 * @var TaxOptionLang[] $modelLangs
12 12 */
... ...
modules/catalog/views/tax-option/index.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\rubrication\models\TaxGroup;
4   - use artweb\artbox\modules\rubrication\models\TaxOption;
  3 + use artweb\artbox\modules\catalog\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\TaxOption;
5 5 use yii\helpers\Html;
6 6 use yii\grid\GridView;
7 7  
8 8 /**
9 9 * @var yii\web\View $this
10   - * @var artweb\artbox\modules\rubrication\models\TaxOptionSearch $searchModel
  10 + * @var artweb\artbox\modules\catalog\models\TaxOptionSearch $searchModel
11 11 * @var yii\data\ActiveDataProvider $dataProvider
12 12 * @var TaxGroup $group
13 13 */
... ...
modules/catalog/views/tax-option/update.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\rubrication\models\TaxGroup;
4   - use artweb\artbox\modules\rubrication\models\TaxOptionLang;
  3 + use artweb\artbox\modules\catalog\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\TaxOptionLang;
5 5 use yii\helpers\Html;
6 6  
7 7 /**
8 8 * @var yii\web\View $this
9   - * @var artweb\artbox\modules\rubrication\models\TaxOption $model
  9 + * @var artweb\artbox\modules\catalog\models\TaxOption $model
10 10 * @var TaxGroup $group
11 11 * @var TaxOptionLang[] $modelLangs
12 12 */
... ...
modules/catalog/views/tax-option/view.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\rubrication\models\TaxGroup;
4   - use artweb\artbox\modules\rubrication\models\TaxOption;
  3 + use artweb\artbox\modules\catalog\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\TaxOption;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7 use yii\widgets\DetailView;
... ...
modules/catalog/views/variant/_form.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\widgets\LanguageForm;
4   - use artweb\artbox\modules\product\models\Product;
5   - use artweb\artbox\modules\product\models\ProductStock;
6   - use artweb\artbox\modules\product\models\ProductUnit;
7   - use artweb\artbox\modules\product\models\ProductVariant;
8   - use artweb\artbox\modules\product\models\ProductVariantLang;
9   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  4 + use artweb\artbox\modules\catalog\models\Product;
  5 + use artweb\artbox\modules\catalog\models\ProductStock;
  6 + use artweb\artbox\modules\catalog\models\ProductUnit;
  7 + use artweb\artbox\modules\catalog\models\ProductVariant;
  8 + use artweb\artbox\modules\catalog\models\ProductVariantLang;
  9 + use artweb\artbox\modules\catalog\models\TaxGroup;
10 10 use yii\db\ActiveQuery;
11 11 use yii\helpers\Html;
12 12 use yii\web\View;
... ...
modules/catalog/views/variant/_form_language.php
1 1 <?php
2 2 use artweb\artbox\modules\language\models\Language;
3   - use artweb\artbox\modules\product\models\ProductVariantLang;
  3 + use artweb\artbox\modules\catalog\models\ProductVariantLang;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...
modules/catalog/views/variant/create.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Product;
4   - use artweb\artbox\modules\product\models\ProductStock;
5   - use artweb\artbox\modules\product\models\ProductVariant;
6   - use artweb\artbox\modules\product\models\ProductVariantLang;
  3 + use artweb\artbox\modules\catalog\models\Product;
  4 + use artweb\artbox\modules\catalog\models\ProductStock;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
  6 + use artweb\artbox\modules\catalog\models\ProductVariantLang;
7 7 use yii\db\ActiveQuery;
8 8 use yii\helpers\Html;
9 9 use yii\web\View;
... ...
modules/catalog/views/variant/index.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Product;
4   - use artweb\artbox\modules\product\models\ProductVariantSearch;
  3 + use artweb\artbox\modules\catalog\models\Product;
  4 + use artweb\artbox\modules\catalog\models\ProductVariantSearch;
5 5 use yii\data\ActiveDataProvider;
6 6 use yii\helpers\Html;
7 7 use yii\grid\GridView;
... ...
modules/catalog/views/variant/update.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\Product;
4   - use artweb\artbox\modules\product\models\ProductStock;
5   - use artweb\artbox\modules\product\models\ProductVariant;
6   - use artweb\artbox\modules\product\models\ProductVariantLang;
  3 + use artweb\artbox\modules\catalog\models\Product;
  4 + use artweb\artbox\modules\catalog\models\ProductStock;
  5 + use artweb\artbox\modules\catalog\models\ProductVariant;
  6 + use artweb\artbox\modules\catalog\models\ProductVariantLang;
7 7 use yii\db\ActiveQuery;
8 8 use yii\helpers\Html;
9 9 use yii\helpers\Url;
... ...
modules/catalog/views/variant/view.php
1 1 <?php
2 2  
3   - use artweb\artbox\modules\product\models\ProductVariant;
4   - use artweb\artbox\modules\rubrication\models\TaxGroup;
  3 + use artweb\artbox\modules\catalog\models\ProductVariant;
  4 + use artweb\artbox\modules\catalog\models\TaxGroup;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7 use yii\widgets\DetailView;
... ...
modules/catalog/widgets/brandsCarouselWidget.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\widgets;
  3 + namespace artweb\artbox\modules\catalog\widgets;
4 4  
5   - use artweb\artbox\modules\product\models\Brand;
  5 + use artweb\artbox\modules\catalog\models\Brand;
6 6 use yii\base\Widget;
7 7  
8 8 class brandsCarouselWidget extends Widget
... ...
modules/catalog/widgets/lastProducts.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\widgets;
  3 + namespace artweb\artbox\modules\catalog\widgets;
4 4  
5   - use artweb\artbox\modules\product\helpers\ProductHelper;
  5 + use artweb\artbox\modules\catalog\helpers\ProductHelper;
6 6 use yii\base\Widget;
7 7  
8 8 class lastProducts extends Widget
... ...
modules/catalog/widgets/similarProducts.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\widgets;
  3 + namespace artweb\artbox\modules\catalog\widgets;
4 4  
5   - use artweb\artbox\modules\product\helpers\ProductHelper;
  5 + use artweb\artbox\modules\catalog\helpers\ProductHelper;
6 6 use yii\base\Widget;
7 7 use Yii;
8 8  
... ...
modules/catalog/widgets/specialProducts.php
1 1 <?php
2 2  
3   - namespace artweb\artbox\modules\product\widgets;
  3 + namespace artweb\artbox\modules\catalog\widgets;
4 4  
5   - use artweb\artbox\modules\product\helpers\ProductHelper;
  5 + use artweb\artbox\modules\catalog\helpers\ProductHelper;
6 6 use yii\base\Widget;
7 7 use Yii;
8 8  
... ...
modules/catalog/widgets/views/brandsCarousel.php
... ... @@ -3,7 +3,7 @@
3 3 * @var Brand[] $brands
4 4 */
5 5 use artweb\artbox\components\artboximage\ArtboxImageHelper;
6   - use artweb\artbox\modules\product\models\Brand;
  6 + use artweb\artbox\modules\catalog\models\Brand;
7 7  
8 8 ?>
9 9 <div class="slider_prod">
... ...
modules/catalog/widgets/views/product_smart.php
1 1 <?php
2 2 /**
3   - * @var $product artweb\artbox\modules\product\models\Product
  3 + * @var $product artweb\artbox\modules\catalog\models\Product
4 4 */
5 5 use yii\helpers\Html;
6 6 use yii\helpers\Url;
... ...
modules/catalog/widgets/views/products_block.php
1 1 <?php
2   - use artweb\artbox\modules\product\models\Product;
  2 + use artweb\artbox\modules\catalog\models\Product;
3 3 use yii\web\View;
4 4  
5 5 /**
... ...
modules/catalog/widgets/views/submenu.php
... ... @@ -3,7 +3,7 @@
3 3 * @var Category $rootCategory
4 4 * @var string $rootClass
5 5 */
6   - use artweb\artbox\modules\product\models\Category;
  6 + use artweb\artbox\modules\catalog\models\Category;
7 7  
8 8 ?>
9 9 <div class="menu_item">
... ...
views/brand/_form.php
1 1 <?php
2 2  
3 3 use artweb\artbox\modules\language\widgets\LanguageForm;
4   - use artweb\artbox\modules\product\models\Brand;
5   - use artweb\artbox\modules\product\models\BrandLang;
  4 + use artweb\artbox\modules\catalog\models\Brand;
  5 + use artweb\artbox\modules\catalog\models\BrandLang;
6 6 use yii\helpers\Html;
7 7 use yii\web\View;
8 8 use yii\widgets\ActiveForm;
... ...
views/brand/_form_language.php
1 1 <?php
2 2 use artweb\artbox\modules\language\models\Language;
3   - use artweb\artbox\modules\product\models\BrandLang;
  3 + use artweb\artbox\modules\catalog\models\BrandLang;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...