From 0fd77f5f6746b201bbd79d38718e28cd2bab3603 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 25 Mar 2020 16:31:53 +0100
Subject: [PATCH] fix #3529 @0.75

---
 app/Http/Controllers/ProductController.php | 3 ++-
 app/Models/Product.php                     | 2 +-
 app/Templates/Home.php                     | 1 +
 app/Templates/News.php                     | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index ab6baca..3527e3a 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -22,7 +22,8 @@ class ProductController extends CubistFrontController
         $this->data['page'] = $this->data['product_type'] = $productType->getPageData();
 
         $products = Product::with('media') // Eager load media to avoid N+1 query problem
-        ->where('product_type', $id)
+            ->whereVariant()
+            ->where('product_type', $id)
             ->where('online', 1)
             ->where('public', 1)
             ->orderBy('reference')
diff --git a/app/Models/Product.php b/app/Models/Product.php
index e78bbcb..a8ac619 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -459,7 +459,7 @@ class Product extends CubistMagicPageModel
             return $res;
         }
 
-        $raw_products = Product::where('product_type', $product_type)->where('online', 1)->where('public', 1)->get();
+        $raw_products = Product::whereVariant()->where('product_type', $product_type)->where('online', 1)->where('public', 1)->get();
         $products = [];
         $allids = [];
         foreach ($raw_products as $idx => $raw_product) {
diff --git a/app/Templates/Home.php b/app/Templates/Home.php
index e229e83..3f2b3a5 100644
--- a/app/Templates/Home.php
+++ b/app/Templates/Home.php
@@ -78,6 +78,7 @@ class Home extends Base
         $newsItems = [];
 
         $news = News::with('media')
+            ->whereVariant()
             ->where('type', 'news')
             ->orderBy('date', 'desc')
             ->get();
diff --git a/app/Templates/News.php b/app/Templates/News.php
index 7637ec9..edba0d8 100644
--- a/app/Templates/News.php
+++ b/app/Templates/News.php
@@ -58,6 +58,7 @@ class News extends Base
         $newsItems = [];
 
         $news = NewsModel::with('media')
+            ->whereVariant()
             ->where('type', 'news')
             ->whereDate('date', '<=', Carbon::now())
             ->orderBy('date', 'desc')
@@ -83,6 +84,7 @@ class News extends Base
 
         // Get all events
         $events = NewsModel::with('media')
+            ->whereVariant()
             ->where('type', 'event')
             ->whereDate('date', '<=', $now)
             ->orderBy('event_start', 'asc')
-- 
2.39.5