From 1c047fce359ee743dd0ece29a48349a8e0268491 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 27 Nov 2023 16:33:55 +0100
Subject: [PATCH] wait #6523

---
 app/Models/Product.php     |  5 +----
 app/Templates/Category.php | 41 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/Models/Product.php b/app/Models/Product.php
index ebc673e..ad508bc 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -580,10 +580,7 @@ class Product extends CubistMagicPageModel
 
     public function renderLink()
     {
-        $p = $this;
-        return \cache()->remember('product_details_' . $this->id . '_' . App::getLocale() . '_' . App::getVariant(), 3600, function () use ($p) {
-            return view('partials.product-link', ['id' => $p->id, 'product' => $p->getPageData()])->render();
-        });
+        return view('partials.product-link', ['id' => $this->id, 'product' => $this->getPageData()])->render();
     }
 
 
diff --git a/app/Templates/Category.php b/app/Templates/Category.php
index d91f6b8..21ddbcd 100644
--- a/app/Templates/Category.php
+++ b/app/Templates/Category.php
@@ -54,27 +54,26 @@ class Category extends Base
         $cat = $data['page']->get('category');
 
         \Barryvdh\Debugbar\Facade::startMeasure('set cat data ' . $cat);
-        $d = cache()->remember('cat_data_' . $cat . '_' . App::getVariant() . '_' . App::getLocale(), 3600, function () use ($cat) {
-            $res = [];
-            $productType = ProductType::find($cat);
-            if (!$productType) {
-                return false;
-            }
-            $res['product_type'] = $productType->getPageData();
-
-            $res['products'] = Product::whereVariant()
-                ->where('product_type', $cat)
-                ->where('online', 1)
-                ->where('public', 1)
-                ->orderBy('reference')
-                ->get();
-
-            // Get available filters
-            $filters = Product::getFilteredProducts($cat);
-            $res['filters'] = $filters ? $filters['filters'] : []; // To be used by Vue component
-            $res['filter_results'] = $filters ? $filters['results'] : [];
-            return $res;
-        });
+
+        $d = [];
+        $productType = ProductType::find($cat);
+        if (!$productType) {
+            return false;
+        }
+        $d['product_type'] = $productType->getPageData();
+
+        $d['products'] = Product::whereVariant()
+            ->where('product_type', $cat)
+            ->where('online', 1)
+            ->where('public', 1)
+            ->orderBy('reference')
+            ->get();
+
+        // Get available filters
+        $filters = Product::getFilteredProducts($cat);
+        $d['filters'] = $filters ? $filters['filters'] : []; // To be used by Vue component
+        $d['filter_results'] = $filters ? $filters['results'] : [];
+
         if (!$d) {
             $this->_404();
         }
-- 
2.39.5