big commti

Administrator
1 parent 52aea36a
Showing 22 changed files with 47 additions and 270 deletions Show diff stats
backend/controllers/CategoryController.php
backend/controllers/SiteController.php
common/modules/product/controllers/ManageController.php
common/modules/product/helpers/FilterHelper.php
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/Brand.php
common/modules/product/models/BrandName.php
common/modules/product/models/BrandSearch.php
common/modules/product/models/Category.php
common/modules/product/models/CategoryName.php
common/modules/product/models/CategoryQuery.php
common/modules/product/models/CategorySearch.php
common/modules/product/models/Product.php
common/modules/product/models/ProductSearch.php
common/modules/product/models/ProductVariantSearch.php
common/modules/product/widgets/brandsCarouselWidget.php
common/modules/product/widgets/views/submenu.php
common/modules/rubrication/views/tax-group/_form.php
console/controllers/ImportController.php
frontend/controllers/CatalogController.php
@@ -97,7 +97,7 @@ class CategoryController extends Controller
             }
             return $this->render('create', [
                 'model' => $model,
-                'categories' => ArtboxTreeHelper::treeMap(Category::find()->with('categoryName')->getTree(), 'category_id', 'categoryName.value', '.')
+                'categories' => ArtboxTreeHelper::treeMap(Category::find()->getTree(), 'category_id', 'name', '.')
             ]);
         }
     }
@@ -125,7 +125,7 @@ class CategoryController extends Controller
         } else {
             return $this->render('update', [
                 'model' => $model,
-                'categories' => ArtboxTreeHelper::treeMap(Category::find()->with('categoryName')->getTree(), 'category_id', 'categoryName.value', '.')
+                'categories' => ArtboxTreeHelper::treeMap(Category::find()->getTree(), 'category_id', 'name', '.')
             ]);
         }
     }
@@ -2,9 +2,7 @@
 namespace backend\controllers;
 use developeruz\db_rbac\behaviors\AccessBehavior;
 use common\modules\product\models\Brand;
-use common\modules\product\models\BrandName;
 use common\modules\product\models\Category;
-use common\modules\product\models\CategoryName;
 use common\modules\product\models\Product;
 use common\modules\product\models\ProductVariant;
 use common\modules\product\models\ProductVariantType;
@@ -199,7 +197,7 @@ class SiteController extends Controller
                 }
                 // ==== Set category ====
-                if ( ($category = CategoryName::find()->filterWhere(['ilike', 'value', trim($catalog_name)])->one()) !== null ) {
+                if ( ($category = Category::find()->filterWhere(['ilike', 'name', trim($catalog_name)])->one()) !== null ) {
                     $_product->categories = [$category->category_id];
                 } else {
                     // Create category
@@ -211,7 +209,7 @@ class SiteController extends Controller
                 // ===== Set brand ====
                 if ( $brand_name ) {
-                    if ( ($brand = BrandName::find()->filterWhere(['ilike', 'value', trim($brand_name)])->one()) !== null ) {
+                    if ( ($brand = Brand::find()->filterWhere(['ilike', 'name', trim($brand_name)])->one()) !== null ) {
                         $_product->brand_id = $brand->brand_id;
                     } else {
                         // Create brand
@@ -8,7 +8,6 @@ use common\modules\product\models\Export;
 use common\modules\product\models\Import;
 use common\modules\product\models\ProductImage;
 use common\modules\product\models\ProductVariant;
-use common\modules\product\models\RemoteProductsSearch;
 use Yii;
 use common\modules\product\models\Product;
 use common\modules\product\models\ProductSearch;
@@ -16,8 +15,6 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use common\modules\product\models\Brand;
-use common\modules\product\models\BrandName;
-use common\modules\product\models\RemoteProducts;
 use yii\web\UploadedFile;
 /**
@@ -2,9 +2,7 @@
 namespace common\modules\product\helpers;
-use common\modules\product\models\Product;
-use common\modules\product\models\BrandName;
-use common\modules\product\models\CategoryName;
+
 use common\modules\rubrication\models\TaxGroup;
 use yii\base\Object;
 use Yii;
@@ -6,8 +6,6 @@
     use common\modules\product\models\Category;
     use common\modules\product\models\Product;
     use common\modules\product\models\ProductVariant;
-    use common\modules\product\models\BrandName;
-    use common\modules\product\models\CategoryName;
     use yii\base\Object;
     use Yii;
     use yii\db\ActiveQuery;
@@ -202,12 +200,12 @@
                     ]);
                     $query->orFilterWhere([
                         'ilike',
-                        BrandName::tableName() . '.value',
+                        Brand::tableName() . '.name',
                         $keyword,
                     ]);
                     $query->orFilterWhere([
                         'ilike',
-                        CategoryName::tableName() . '.value',
+                        Category::tableName() . '.name',
                         $keyword,
                     ]);
                     $query->orFilterWhere([
@@ -19,6 +19,7 @@ use Yii;
  * @property string $meta_desc
  * @property string $meta_robots
  * @property string $seo_text
+ * @property string $name
  *
  * @property BrandName $brandName
  * @property BrandName[] $brandNames
@@ -30,26 +31,6 @@ class Brand extends \yii\db\ActiveRecord
     public $_items_count = 0;
-    public function behaviors()
-    {
-        return [
-            'artboxsynonym' => [
-                'class' => ArtboxSynonymBehavior::className(),
-                'keyNameValue' => 'brand_name_id',
-                'valueModel' => BrandName::className(),
-                'valueOptionId' => 'brand_id',
-                'valueFields' => [ // postKey => DBFieldName
-                    'name' => 'value'
-                ],
-                'slug' => [
-                    'valueKeyName' => 'value',
-                    'slugKeyName' => 'alias',
-                    'translit' => true
-                ],
-            ],
-        ];
-    }
-
     /**
      * @inheritdoc
      */
@@ -94,21 +75,7 @@ class Brand extends \yii\db\ActiveRecord
         ];
     }
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getBrandName()
-    {
-        return $this->hasOne(BrandName::className(), ['brand_name_id' => 'brand_name_id']);
-    }
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getBrandNames()
-    {
-        return $this->hasMany(BrandName::className(), ['brand_id' => 'brand_id']);
-    }
     /**
      * @return \yii\db\ActiveQuery
@@ -118,10 +85,6 @@ class Brand extends \yii\db\ActiveRecord
         return $this->hasMany(Product::className(), ['brand_id' => 'brand_id']);
     }
-    public function getName() {
-        return empty($this->brand_name_id) ? null : $this->brandName->value;
-    }
-
     public function getImageFile() {
         return empty($this->image) ? null : Yii::getAlias('@imagesDir/brands/'. $this->image);
     }
-<?php
-
-namespace common\modules\product\models;
-
-use Yii;
-
-/**
- * This is the model class for table "brand_name".
- *
- * @property integer $brand_name_id
- * @property integer $brand_id
- * @property string $value
- *
- * @property Brand[] $brands
- * @property Brand $brand
- */
-class BrandName extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'brand_name';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['brand_id'], 'integer'],
-            [['value'], 'string', 'max' => 250],
-//            [['brand_id'], 'exist', 'skipOnError' => true, 'targetClass' => Brand::className(), 'targetAttribute' => ['brand_id' => 'brand_id']],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'brand_name_id' => Yii::t('product', 'Brand Name ID'),
-            'brand_id' => Yii::t('product', 'Brand ID'),
-            'value' => Yii::t('product', 'Value'),
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getBrands()
-    {
-        return $this->hasMany(Brand::className(), ['brand_name_id' => 'brand_name_id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getBrand()
-    {
-        return $this->hasOne(Brand::className(), ['brand_id' => 'brand_id']);
-    }
-}
@@ -81,8 +81,7 @@ class BrandSearch extends Brand
             ->andFilterWhere(['ilike', 'meta_robots', $this->meta_robots])
             ->andFilterWhere(['ilike', 'seo_text', $this->seo_text]);
         if (!empty($this->brand_name)) {
-            $query->joinWith('brandName');
-            $query->andFilterWhere(['ilike', 'brand_name.value', $this->brand_name]);
+            $query->andFilterWhere(['ilike', 'name', $this->brand_name]);
         }
         $query->orderBy('brand_id', 'asc');
@@ -110,8 +109,7 @@ class BrandSearch extends Brand
                 Brand::tableName() .'.*'
             ])
             ->innerJoin(Product::tableName(), Product::tableName() .'.brand_id='. Brand::tableName() .'.brand_id')
-            ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. Product::tableName() .'.product_id')
-            ->with(['brandName']);
+            ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.product_id='. Product::tableName() .'.product_id');
 //        $queryCount = Product::find()
@@ -157,7 +155,6 @@ class BrandSearch extends Brand
     public static function findByAlias($alias) {
         /** @var CategoryQuery $query */
         $query = Brand::find()
-            ->with('brandName')
             ->andFilterWhere(['alias' => $alias]);
         if (($model = $query->one()) !== null) {
             return $model;
@@ -2,13 +2,13 @@
 namespace common\modules\product\models;
-use common\behaviors\RuSlug;
+
 use common\components\artboxtree\ArtboxTreeBehavior;
 use common\components\artboxtree\ArtboxTreeHelper;
-use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
+
 use common\modules\rubrication\models\TaxGroup;
 use Yii;
-use yii\base\ErrorException;
+
 use yii\db\Query;
 /**
@@ -28,6 +28,7 @@ use yii\db\Query;
  * @property integer $product_unit_id
  * @property string $alias
  * @property boolean $populary
+ * @property boolean $name
  *
  * @property CategoryName $categoryName
  * @property Product[] $products
@@ -46,21 +47,7 @@ class Category extends \yii\db\ActiveRecord
                 'class' => ArtboxTreeBehavior::className(),
                 'keyNameGroup' => null,
                 'keyNamePath' => 'path',
-            ],
-            'artboxsynonym' => [
-                'class' => ArtboxSynonymBehavior::className(),
-                'keyNameValue' => 'category_name_id',
-                'valueModel' => CategoryName::className(),
-                'valueOptionId' => 'category_id',
-                'valueFields' => [ // postKey => DBFieldName
-                    'name' => 'value'
-                ],
-                'slug' => [
-                    'valueKeyName' => 'value',
-                    'slugKeyName' => 'alias',
-                    'translit' => true
-                ]
-            ],
+            ]
         ];
     }
@@ -87,7 +74,6 @@ class Category extends \yii\db\ActiveRecord
             [['alias', 'name'], 'string', 'max' => 250],
             [['populary'], 'boolean'],
             [['group_to_category', 'remote_category'], 'safe'],
-            [['category_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => CategoryName::className(), 'targetAttribute' => ['category_name_id' => 'category_name_id']],
             [['imageUpload'], 'safe'],
             [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
         ];
@@ -137,13 +123,6 @@ class Category extends \yii\db\ActiveRecord
 //        return $this->getRelations('product_categories');
     }
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getCategoryNames()
-    {
-        return $this->hasMany(CategoryName::className(), ['category_id' => 'category_id']);
-    }
     /**
      * @return \yii\db\ActiveQuery
@@ -153,10 +132,6 @@ class Category extends \yii\db\ActiveRecord
         return $this->hasMany(ProductCategory::className(), ['category_id' => 'category_id']);
     }
-    public function getTaxGroups()
-    {
-        return $this->getRelations('tax_group_to_category');
-    }
     public function getTaxGroupsByLevel($level)
     {
@@ -177,14 +152,8 @@ class Category extends \yii\db\ActiveRecord
         }
     }
-    public function getCategoryName()
-    {
-        return $this->hasOne(CategoryName::className(), ['category_name_id' => 'category_name_id']);
-    }
-    public function getName() {
-        return empty($this->categoryName) ? null : $this->categoryName->value;
-    }
+
     public function getImageFile() {
         return empty($this->image) ? '/images/no_photo.png' : Yii::getAlias('@imagesDir/categories/'. $this->image);
@@ -216,22 +185,13 @@ class Category extends \yii\db\ActiveRecord
             }
         }
         ProductCategory::deleteAll(['category_id' => $this->category_id]);
-        CategoryName::deleteAll(['category_id' => $this->category_id]);
         return true;
     }
-    
     public function getActiveFilters() {
         $query1 = (new Query())
             ->distinct()
             ->select([
-                'option_id',
-                'tax_option.*',
-                'tax_group.*',
-                'tax_option.alias as option_alias',
-                'tax_group.alias as group_alias',
-                'tax_value_string.value as value',
-                'tax_option.sort AS tax_option_sort',
-                'tax_group.sort AS tax_group_sort',
+                'option_id'
             ])
             ->from('tax_option')
             ->innerJoin('product_variant_option', 'tax_option.tax_option_id = product_variant_option.option_id')
@@ -242,18 +202,11 @@ class Category extends \yii\db\ActiveRecord
             ->innerJoin('tax_value_string', 'tax_value_string.tax_option_id = tax_option.tax_option_id')
             ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE])
             ->andWhere(['!=', 'product_variant.stock', 0]);
-        
+
         $query2 = (new Query())
             ->distinct()
             ->select([
-                'option_id',
-                'tax_option.*',
-                'tax_group.*',
-                'tax_option.alias as option_alias',
-                'tax_group.alias as group_alias',
-                'tax_value_string.value as value',
-                'tax_option.sort AS tax_option_sort',
-                'tax_group.sort AS tax_group_sort',
+                'option_id'
             ])
             ->from('tax_option')
             ->innerJoin('product_option', 'tax_option.tax_option_id = product_option.option_id')
@@ -265,9 +218,20 @@ class Category extends \yii\db\ActiveRecord
             ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE])
             ->andWhere(['!=', 'product_variant.stock', 0]);
         $query3 = (new Query())
-            ->select('*')
-            ->from(['subquery' => $query1->union($query2)])
-            ->orderBy('tax_group_sort, tax_option_sort');
+            ->select([
+                'tax_option.*',
+                'tax_group.*',
+                'tax_option.alias as option_alias',
+                'tax_group.alias as group_alias',
+                'tax_value_string.value as value',
+                'tax_option.sort AS tax_option_sort',
+                'tax_group.sort AS tax_group_sort',
+            ])
+            ->from(['tax_option' ])
+            ->where(['tax_option.tax_option_id'=>$query1->union($query2)])
+            ->innerJoin('tax_group','tax_group.tax_group_id = tax_option.tax_group_id')
+            ->innerJoin('tax_value_string', 'tax_value_string.tax_option_id = tax_option.tax_option_id')
+            ->orderBy('tax_option.sort, tax_group.sort');
         return $query3;
     }
-<?php
-
-namespace common\modules\product\models;
-
-use Yii;
-
-/**
- * This is the model class for table "category_name".
- *
- * @property integer $category_name_id
- * @property integer $category_id
- * @property string $value
- *
- * @property Category[] $categories
- * @property Category $category
- */
-class CategoryName extends \yii\db\ActiveRecord
-{
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'category_name';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['category_id'], 'integer'],
-            [['value'], 'string', 'max' => 250],
-            [['category_id'], 'exist', 'skipOnError' => true, 'targetClass' => Category::className(), 'targetAttribute' => ['category_id' => 'category_id']],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'category_name_id' => Yii::t('product', 'Category Name ID'),
-            'category_id' => Yii::t('product', 'Category ID'),
-            'value' => Yii::t('product', 'Value'),
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getCategories()
-    {
-        return $this->hasMany(Category::className(), ['category_name_id' => 'category_name_id']);
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getCategory()
-    {
-        return $this->hasOne(Category::className(), ['category_id' => 'category_id']);
-    }
-}
@@ -23,7 +23,6 @@ class CategoryQuery extends \yii\db\ActiveQuery
      */
     public function all($db = null)
     {
-        $this->with('categoryName');
         return parent::all($db);
     }
@@ -56,7 +56,7 @@ class CategorySearch extends Category
      */
     public function search($params)
     {
-        $query = Category::find()->with('categoryName');
+        $query = Category::find();
         // add conditions that should always apply here
@@ -90,7 +90,6 @@ class CategorySearch extends Category
     public static function findByAlias($alias) {
         /** @var CategoryQuery $query */
         $query = Category::find()
-            ->with('categoryName')
             ->andFilterWhere(['alias' => $alias]);
         if (($model = $query->one()) !== null) {
             return $model;
@@ -102,7 +101,6 @@ class CategorySearch extends Category
     public static function findByRemoteID($id) {
         /** @var CategoryQuery $query */
         $query = Category::find()
-            ->with('categoryName')
             ->andFilterWhere(['@>', 'remote_id', ArtboxTreeHelper::setArrayField($id)]);
         if (($model = $query->one()) !== null) {
             return $model;
@@ -218,7 +218,7 @@ class Product extends \yii\db\ActiveRecord
 //        return $this->getRelations('product_categories');
     }
     public function getCategoriesWithName() {
-        return $this->hasMany(Category::className(), ['category_id' => 'category_id'])->viaTable('product_category', ['product_id' => 'product_id'])->joinWith('categoryNames');
+        return $this->hasMany(Category::className(), ['category_id' => 'category_id'])->viaTable('product_category', ['product_id' => 'product_id']);
 //        return $this->getRelations('product_categories');
     }
@@ -51,7 +51,7 @@ class ProductSearch extends Product
     {
         $query = Product::find();
-        $query->joinWith(['brand', 'brand.brandNames', 'categories', 'categories.categoryNames', 'variant']);
+        $query->joinWith(['brand', 'categories', 'variant']);
         $query->groupBy(['product.product_id']);
         $query->orderBy('product.product_id', 'DESC');
@@ -87,7 +87,7 @@ class ProductVariantSearch extends ProductVariant
             ]
         ]);
-        $query->joinWith(['product', 'product.brand.brandNames', 'product.categories', 'product.categories.categoryNames']);
+        $query->joinWith(['product', 'product.brand', 'product.categories']);
         if (isset($this->is_top)) {
             $query->andFilterWhere([
@@ -13,7 +13,7 @@ class brandsCarouselWidget extends Widget {
     }
     public function run() {
-        $brands = Brand::find()->with('brandName')->all();
+        $brands = Brand::find()->all();
         return $this->render('brandsCarousel', [
             'brands' => $brands,
         ]);
 <div class="menu_item">
-    <?= \yii\helpers\Html::a($rootCategory->categoryName->value, ['catalog/category', 'category' => $rootCategory], ['class' => 'submenu_button '. $rootClass])?>
+    <?= \yii\helpers\Html::a($rootCategory->name, ['catalog/category', 'category' => $rootCategory], ['class' => 'submenu_button '. $rootClass])?>
     <div class="submenu">
         <ul class="categories">
             <li class="sub_cat"><span>Популярные категории</span>
@@ -15,7 +15,7 @@
                                                 <?= $_item->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item->imageUrl, 'mainmenu') : ''?>
                                             <?php endif?>
                                         </div>
-                                        <div class="title"><?= $_item->categoryName->value?></div>
+                                        <div class="title"><?= $_item->name?></div>
                                     </a></div>
                             <?php endforeach?>
                         </div>
@@ -24,7 +24,7 @@
             </li>
         <?php foreach($items as $item) :?>
             <li class="sub_cat">
-                <span><?= $item['item']->categoryName->value?></span>
+                <span><?= $item['item']->name?></span>
                 <?php if(!empty($item['children'])) :?>
                 <div class="sub_cat_content">
                     <div class="content_items">
@@ -37,7 +37,7 @@
                                     <?= $_item['item']->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($_item['item']->imageUrl, 'mainmenu') : ''?>
                                 <?php endif?>
                             </div>
-                            <div class="title"><?= $_item['item']->categoryName->value?></div>
+                            <div class="title"><?= $_item['item']->name?></div>
                         </a></div>
                         <?php endforeach?>
                     </div>
@@ -26,7 +26,7 @@ use common\components\artboxtree\ArtboxTreeHelper;
     ]) ?>
     <?= $form->field($model, 'group_to_category')->dropDownList(
-        ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'categoryName.value'),
+        ArtboxTreeHelper::treeMap(ProductHelper::getCategories(), 'category_id', 'name'),
         [
             'multiple' => true
         ]
@@ -3,7 +3,6 @@
 namespace console\controllers;
 use common\modules\product\models\Category;
-use common\modules\product\models\CategoryName;
 use common\modules\product\models\Import;
 use common\modules\product\models\ProductImage;
 use common\modules\product\models\ProductVariantType;
@@ -12,10 +11,8 @@ use common\modules\rubrication\models\TaxOption;
 use common\modules\rubrication\models\TaxValueString;
 use Yii;
 use common\modules\product\models\Brand;
-use common\modules\product\models\BrandName;
 use common\modules\product\models\Product;
 use common\modules\product\models\ProductVariant;
-use common\modules\product\models\RemoteProducts;
 use yii\console\Controller;
 use yii\helpers\Console;
@@ -166,7 +166,7 @@ class CatalogController extends \yii\web\Controller
     public function actionBrands()
     {
         $dataProvider = new ActiveDataProvider([
-            'query' => Brand::find()->joinWith('brandName')->orderBy('brand_name.value'),
+            'query' => Brand::find()->orderBy('name'),
             'pagination' => [
                 'pageSize' => -1,
             ]
@@ -91,7 +91,7 @@ class ProductFrontendSearch extends Product {
             $query = Product::find();
         }
         $query->select(['product.*']);
-        $query->joinWith(['enabledVariants','brand', 'brand.brandName', 'category', 'category.categoryName']);
+        $query->joinWith(['enabledVariants','brand', 'category']);
         $query->groupBy(['product.product_id', 'product_variant.price']);
@@ -19,8 +19,8 @@ use yii\helpers\Url;
                     'product' => $model->alias
                 ]) ?>">
                     <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->enabledVariants[ 0 ]->imageUrl, 'list', [
-                        'alt'   => $model->category->categoryName->value . ' ' . $model->fullname,
-                        'title' => $model->category->categoryName->value . ' ' . $model->fullname,
+                        'alt'   => $model->category->name . ' ' . $model->fullname,
+                        'title' => $model->category->name . ' ' . $model->fullname,
                         'class' => 'selected'
                     ]) ?>
                 </a>