big commti

Administrator
1 parent aac54f27
Showing 7 changed files with 15 additions and 18 deletions Show diff stats
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/BrandSearch.php
common/modules/product/models/Category.php
common/modules/product/models/Product.php
frontend/controllers/SearchController.php
frontend/models/ProductFrontendSearch.php
frontend/views/catalog/product.php
@@ -94,8 +94,8 @@
                                         ->where([ Product::tableName() . '.product_id' => $last_products ])
                                         ->andWhere([
                                             '!=',
-                                            ProductVariant::tableName() . '.stock',
-                                            0,
+                                            ProductVariant::tableName() . '.status',
+                                            1,
                                         ])
                                         ->all();
             }
@@ -120,8 +120,8 @@
                           ->where($data)
                           ->andWhere([
                               '!=',
-                              ProductVariant::tableName() . '.stock',
-                              0,
+                              ProductVariant::tableName() . '.status',
+                              1,
                           ])
                           ->limit($count)/*->orderBy($sort)*/
                           ->all();
@@ -149,8 +149,8 @@
                             ->joinWith('category')
                             ->where([
                                 '!=',
-                                'product_variant.stock',
-                                0,
+                                'product_variant.status',
+                                1,
                             ])
                             ->andWhere([ 'product_category.category_id' => $product_categories ]);
             //        $query->andWhere(['>=', 'product_variant.price', $product->enabledVariant->price * 0.7]);
@@ -140,7 +140,7 @@ class BrandSearch extends Brand
         $query->innerJoin('product_variant', 'product_variant.product_id = '. Product::tableName() .'.product_id');
-        $query->where(['!=', 'product_variant.stock', 0]);
+        $query->where(['!=', 'product_variant.status', 1]);
         $query->groupBy(Product::tableName() .'.product_id');
         if (!empty($category)) {
             $query->andWhere([
@@ -210,7 +210,6 @@ class Category extends \yii\db\ActiveRecord
             ->innerJoin('product_category', 'product_category.product_id = product.product_id')
             ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
             ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE,'tax_group_to_category.category_id'=>$this->category_id])
-            ->andWhere(['!=', 'product_variant.stock', 0])
             ->andWhere(['!=', 'product_variant.status', 1]);
         $query2 = (new Query())
@@ -226,7 +225,6 @@ class Category extends \yii\db\ActiveRecord
             ->innerJoin('product_variant', 'product_variant.product_id = product.product_id')
             ->innerJoin('tax_group_to_category', 'tax_group.tax_group_id = tax_group_to_category.tax_group_id')
             ->where(['product_category.category_id' => $this->category_id, 'tax_group.is_filter' => TRUE,'tax_group_to_category.category_id'=>$this->category_id])
-            ->andWhere(['!=', 'product_variant.stock', 0])
             ->andWhere(['!=', 'product_variant.status', 1]);
         $query3 = (new Query())
             ->select([
@@ -180,7 +180,6 @@ class Product extends \yii\db\ActiveRecord
     public function getEnabledVariant()
     {
         return $this->hasOne(ProductVariant::className(), ['product_id' => 'product_id'])
-            ->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0])
             ->andOnCondition(['!=', ProductVariant::tableName() .'.status', 1]);
     }
@@ -202,7 +201,7 @@ class Product extends \yii\db\ActiveRecord
     public function getEnabledVariants()
     {
-        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->andOnCondition(['!=', ProductVariant::tableName() .'.stock', 0])->joinWith('image');
+        return $this->hasMany(ProductVariant::className(), ['product_id' => 'product_id'])->andOnCondition(['!=', ProductVariant::tableName() .'.status', 1])->joinWith('image');
     }
     /*
@@ -50,7 +50,7 @@ class SearchController extends \yii\web\Controller
                 foreach ($params['keywords'] as $keyword) {
                     $categoriesQuery->andWhere(['ilike', 'product.name', $keyword]);
                 }
-                $categoriesQuery->andWhere(['!=', ProductVariant::tableName() .'.stock', 0]);
+                $categoriesQuery->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
                 $categories = $categoriesQuery->all();
             }
@@ -97,7 +97,6 @@ class ProductFrontendSearch extends Product {
         ProductHelper::_setQueryParams($query, $params);
-        $query->andWhere(['!=', ProductVariant::tableName() .'.stock', 0]);
         $query->andWhere(['!=', ProductVariant::tableName() .'.status', 1]);
         return $query;
@@ -113,7 +112,7 @@ class ProductFrontendSearch extends Product {
             ->where([TaxGroup::tableName() .'.is_filter' => true]);
         $query->innerJoin('product_variant', 'product_variant.product_id = '. ProductOption::tableName() .'.product_id');
-        $query->andWhere(['!=', 'product_variant.stock', 0]);
+        $query->andWhere(['!=', 'product_variant.status', 1]);
         $query->groupBy(TaxOption::tableName() .'.tax_option_id');
 //        $query->having(['>', 'COUNT(product_variant.product_variant_id)', 0]);
@@ -109,11 +109,12 @@ FlipclockAsset::register($this);
                                     </td>
                                     <td>
                                         <!-- Купить -->
-                                        <?php if($product->variant->status != 1){?>
+                                        <?php if($product->variant->status != 1)
+                                        {?>
                                             <a lang="5892" class="btn btnBuy buy_button btn-large1" data-id="<?php echo $product->variant->product_variant_id; ?>" data-toggle="modal" data-target="#buyForm">Купить</a>
-                                        <?php }else if($product->variant->status == 1){?>
+                                        <?php } else {?>
                                             <a  href="#" style="background-color:dimgrey; background-image:linear-gradient(to bottom, #9d9fa0, #abafb2)" class="btn btn-large btn-default " data-id="<?php echo $product->variant->product_variant_id; ?>" >снят с производства</a>
-                                        <?php} ?>
+                                        <?php } ?>
                                     </td>
                                     <td>
@@ -318,7 +319,7 @@ FlipclockAsset::register($this);
                                 <div class="buy_button">
                                     <?php if($product->variant->status != 1){?>
                                         <a href="#" class="btn btn-large buy_button" data-toggle="modal" data-id="<?php echo $product->variant->product_variant_id; ?>" data-target="#buyForm" lang="5892">Купить</a>
-                                    <?php}else if($product->variant->status == 1){?>
+                                    <?php }else { ?>
                                         <a href="#"  style="background-color:dimgrey; background-image:linear-gradient(to bottom, #9d9fa0, #abafb2)" class="btn btn-large btn-default "  data-id="<?php echo $product->variant->product_variant_id; ?>" >снят с производства</a>
                                     <?php } ?>
                                     <div class="clearfix"></div>