fix #3529 @0.75

diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index ab6baca1e8c0982166bb390aa0734b15a95d8c48..3527e3a55f2912e575adc6ad1654191e0baa39a1 100644 (file)
--- 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 e78bbcb39f767ef9095b55b0e09c38c51de8123f..a8ac61931b133024781b8f425b586b469b7abbf3 100644 (file)
--- 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 e229e838e055689d6c7c17db27203e5c5bb02383..3f2b3a55f7b31dd4f1e7d0b50dd9b050702104ff 100644 (file)
--- 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 7637ec92046983930b8c2f842fec56fcd741407f..edba0d8626e1b5b1651c8b406f6a451cf2030c8b 100644 (file)
--- 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')