Fix search with stock-check

Karnovsky A
1 parent 163914fd
Showing 2 changed files with 9 additions and 1 deletions Show diff stats
frontend/controllers/CatalogController.php
frontend/models/ProductFrontendSearch.php
@@ -61,10 +61,12 @@ class CatalogController extends \yii\web\Controller
             $categoriesQuery = Category::find()
                 ->innerJoin(ProductCategory::tableName(), ProductCategory::tableName() .'.category_id = '. Category::tableName() .'.category_id')
-                ->innerJoin(Product::tableName(), Product::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id');
+                ->innerJoin(Product::tableName(), Product::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id')
+                ->innerJoin(ProductVariant::tableName(), ProductVariant::tableName() .'.product_id = '. ProductCategory::tableName() .'.product_id');
             foreach ($params['keywords'] as $keyword) {
                 $categoriesQuery->andWhere(['ilike', 'product.name', $keyword]);
             }
+            $categoriesQuery->andWhere(['!=', ProductVariant::tableName() .'.stock', 0]);
             $categories = $categoriesQuery->all();
             return $this->render(
@@ -157,6 +159,10 @@ class CatalogController extends \yii\web\Controller
         /** @var Product $product */
         $product = Yii::$app->request->get('product');
+        if(!$product->enabledVariant) {
+            throw new HttpException(404, 'Товар не найден');
+        }
+
         $groups = [];
         foreach($product->category->getTaxGroups()->all() as $_group) {
             $groups[$_group->tax_group_id] = $_group;
@@ -87,6 +87,8 @@ class ProductFrontendSearch extends Product {
         $this->_setParams($query, $params);
+        $query->andWhere(['!=', ProductVariant::tableName() .'.stock', 0]);
+
         return $dataProvider;
     }