big commti

Administrator
1 parent 771f8d54
Showing 7 changed files with 102 additions and 59 deletions Show diff stats
backend/views/layouts/main-sidebar.php
common/modules/product/models/Product.php
common/modules/product/models/ProductVariant.php
common/modules/product/models/TaxGroupToCategory.php
common/modules/product/views/manage/_form.php
console/migrations/m160815_101433_add_name_to_category.php
console/migrations/m160815_101441_add_name_to_brand.php
@@ -74,11 +74,6 @@ use yii\widgets\Menu;
                         'label' => 'Характеристики Модификаций',
                         'url' => Url::toRoute(['/rubrication/tax-group', 'level'=> '1']),
                         'options' => ['class'=>\Yii::$app->user->can('rubrication') ? '' :'hide'],
-                    ],
-                    [
-                        'label' => 'Зависимости',
-                        'url' => ['/relation/manage'],
-                        'options' => ['class'=>\Yii::$app->user->can('relation') ? '' :'hide'],
                     ]
                 ]
             ],
@@ -433,6 +433,6 @@ class Product extends \yii\db\ActiveRecord
     public function getTaxGroupsByLevel($level)
     {
         $categories = ArrayHelper::getColumn($this->categories, 'category_id');
-        return TaxGroup::find()->distinct()->innerJoin('relation', 'entity1_id = tax_group_id')->andWhere(['relation.entity2_id' => $categories])->andWhere(['level' => $level]);
+        return TaxGroup::find()->distinct()->innerJoin('tax_group_to_category', 'tax_group_to_category.tax_group_id = tax_group.tax_group_id')->andWhere(['tax_group_to_category.category_id' => $categories])->andWhere(['level' => $level]);
     }
 }
@@ -252,7 +252,7 @@ class ProductVariant extends \yii\db\ActiveRecord
     public function getTaxGroupsByLevel($level)
     {
         $categories = ArrayHelper::getColumn($this->categories, 'category_id');
-        return TaxGroup::find()->distinct()->innerJoin('relation', 'entity1_id = tax_group_id')->where(['relation.entity2_id' => $categories])->where(['level' => $level]);
+        return TaxGroup::find()->distinct()->innerJoin('tax_group_to_category', 'tax_group_to_category.tax_group_id = tax_group.tax_group_id')->where(['tax_group_to_category.category_id'  => $categories])->where(['level' => $level]);
     }
 //    public function afterSave($insert, $changedAttributes)
+<?php
+
+namespace common\modules\product\models;
+
+use common\modules\rubrication\models\TaxGroup;
+use Yii;
+
+/**
+ * This is the model class for table "tax_group_to_category".
+ *
+ * @property integer $tax_group_to_category_id
+ * @property integer $tax_group_id
+ * @property integer $category_id
+ *
+ * @property Category $category
+ * @property TaxGroup $taxGroup
+ */
+class TaxGroupToCategory extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'tax_group_to_category';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['tax_group_id', 'category_id'], 'required'],
+            [['tax_group_id', 'category_id'], 'integer'],
+            [['category_id'], 'exist', 'skipOnError' => true, 'targetClass' => Category::className(), 'targetAttribute' => ['category_id' => 'category_id']],
+            [['tax_group_id'], 'exist', 'skipOnError' => true, 'targetClass' => TaxGroup::className(), 'targetAttribute' => ['tax_group_id' => 'tax_group_id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'tax_group_to_category_id' => 'Tax Group To Category ID',
+            'tax_group_id' => 'Tax Group ID',
+            'category_id' => 'Category ID',
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCategory()
+    {
+        return $this->hasOne(Category::className(), ['category_id' => 'category_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getTaxGroup()
+    {
+        return $this->hasOne(TaxGroup::className(), ['tax_group_id' => 'tax_group_id']);
+    }
+}
@@ -66,58 +66,6 @@ use kartik\select2\Select2;
         ],
     ]); ?>
-    <?php /*= $form->field($model, 'variants')->widget(MultipleInput::className(), [
-        'columns' => [
-            [
-                'name'  => 'product_variant_id',
-                'type'  => MultipleInputColumn::TYPE_HIDDEN_INPUT,
-            ],
-            [
-                'name'  => 'name',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Name'),
-            ],
-            [
-                'name'  => 'sku',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'SKU'),
-            ],
-            [
-                'name'  => 'price',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Price'),
-            ],
-            [
-                'name'  => 'price_old',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Old Price'),
-            ],
-            [
-                'name'  => 'product_unit_id',
-                'type'  => MultipleInputColumn::TYPE_DROPDOWN,
-                'title' => Yii::t('product', 'Unit'),
-                'items' => ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
-            ],
-            [
-                'name'  => 'stock',
-                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
-                'title' => Yii::t('product', 'Stock'),
-                'options' => [
-                    'placeholder' => '∞'
-                ],
-            ],
-            [
-                'name'  => 'image',
-                'type'  => 'fileInput',
-                'title' => Yii::t('product', 'Image'),
-                'options' => [
-                    'multiple' => false
-                ],
-            ],
-        ],
-    ]);
-    */ ?>
-
     <?php if(isset($groups)) :?>
     <?php  foreach($groups->all() as $group) :?>
         <?= $form->field($model, 'options')->checkboxList(
+<?php
+
+use yii\db\Migration;
+
+class m160815_101433_add_name_to_category extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('category', 'name', $this->string(255));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('category', 'name');
+    }
+}
+<?php
+
+use yii\db\Migration;
+
+class m160815_101441_add_name_to_brand extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('brand', 'name', $this->string(255));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('brand', 'name');
+    }
+}