Tax options fix

Yarik
1 parent e8e6b858
Showing 5 changed files with 23 additions and 4 deletions Show diff stats
common/modules/product/controllers/ManageController.php
common/modules/product/controllers/VariantController.php
common/modules/product/models/Product.php
common/modules/product/models/ProductVariant.php
common/modules/product/views/variant/_form.php
@@ -133,7 +133,7 @@ class ManageController extends Controller
                 return $this->redirect(['view', 'id' => $model->product_id]);
             }
         } else {
-            $groups = $model->category-> getTaxGroupsByLevel(0);
+            $groups = $model->getTaxGroupsByLevel(0);
  
             return $this->render('update', [
                 'model' => $model,
@@ -96,7 +96,7 @@ class VariantController extends Controller
                 return $this->redirect(['index', 'product_id' => $product_id]);
             }
         } else {
-            $groups = $model->category->getTaxGroupsByLevel(1);
+            $groups = $model->getTaxGroupsByLevel(1);
  
             return $this->render('create', [
                 'model' => $model,
@@ -193,7 +193,7 @@ class VariantController extends Controller
  
  
         } else {
-            $groups = $model->category-> getTaxGroupsByLevel(1);
+            $groups = $model->getTaxGroupsByLevel(1);
  
             return $this->render('update', [
                 'model' => $model,
@@ -12,6 +12,7 @@ use common\modules\rubrication\models\TaxOption;
 use Yii;
 use common\modules\relation\relationBehavior;
 use yii\db\ActiveRecord;
+use yii\helpers\ArrayHelper;
  
 /**
  * This is the model class for table "{{%product}}".
@@ -413,4 +414,10 @@ class Product extends \yii\db\ActiveRecord
     public function getAverageRating() {
         return $this->hasOne(ProductToRating::className(), ['product_id' => 'product_id']);
     }
+    
+    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]);
+    }
 }
@@ -4,8 +4,10 @@ namespace common\modules\product\models;
  
 use common\modules\product\behaviors\FilterBehavior;
 use common\modules\relation\relationBehavior;
+use common\modules\rubrication\models\TaxGroup;
 use common\modules\rubrication\models\TaxOption;
 use Yii;
+use yii\db\ActiveQuery;
 use yii\helpers\ArrayHelper;
  
 /**
@@ -258,6 +260,16 @@ class ProductVariant extends \yii\db\ActiveRecord
     public function getCategory() {
         return $this->hasOne(Category::className(), ['category_id' => 'category_id'])->viaTable('product_category', ['product_id' => 'product_id']);
     }
+    
+    public function getCategories() {
+        return $this->hasMany(Category::className(), ['category_id' => 'category_id'])->viaTable('product_category', ['product_id' => 'product_id']);
+    }
+    
+    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]);
+    }
  
 //    public function afterSave($insert, $changedAttributes)
 //    {
@@ -127,7 +127,7 @@ $this-&gt;registerJs($js, View::POS_END);
         [
             'prompt' => Yii::t('product', 'Unit'),
         ])->label(Yii::t('product', 'Unit')) ?>
-
+    
     <?php if(isset($groups)) :?>
     <?php  foreach($groups->all() as $group) :?>
         <?= $form->field($model, 'options')->checkboxList(