Merge pull request #219 from EmicoEcommerce/fix-wrong-product-tiles

fix: wrong product tiles
EmicoEcommerce · Sep 19, 2024 · 8eec3ae · 8eec3ae
2 parents 645bf81 + 9f4857d
commit 8eec3ae
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/ViewModel/LinkedProductListItem.php b/ViewModel/LinkedProductListItem.php
@@ -5,12 +5,14 @@
 namespace Tweakwise\Magento2Tweakwise\ViewModel;
 
 use Magento\Catalog\Model\Product;
+use Magento\Customer\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Framework\View\LayoutInterface;
 use Tweakwise\Magento2Tweakwise\Helper\Cache;
+use Magento\Store\Model\StoreManagerInterface;
 
 class LinkedProductListItem implements ArgumentInterface
 {
@@ -20,7 +22,9 @@ class LinkedProductListItem implements ArgumentInterface
      */
     public function __construct(
         private readonly LayoutInterface $layout,
-        private readonly Cache $cacheHelper
+        private readonly Cache $cacheHelper,
+        private readonly StoreManagerInterface $storeManager,
+        private readonly Session $customerSession
     ) {
     }
 
@@ -59,10 +63,15 @@ public function getItemHtml(
             $this->cacheHelper->save($itemHtml, $productId, $cardType);
         }
 
+        $storeId = $this->storeManager->getStore()->getId();
+        $customerGroupId = $this->customerSession->getCustomerGroupId();
+
         return sprintf(
-            '<esi:include src="/%s?product_id=%s&card_type=%s" />',
+            '<esi:include src="/%s?product_id=%s&store_id=%s&customer_group_id=%s&card_type=%s" />',
             Cache::PRODUCT_CARD_PATH,
             $productId,
+            $storeId,
+            $customerGroupId,
             $cardType
         );
     }

diff --git a/ViewModel/ProductListItem.php b/ViewModel/ProductListItem.php
@@ -5,12 +5,14 @@
 namespace Tweakwise\Magento2Tweakwise\ViewModel;
 
 use Magento\Catalog\Model\Product;
+use Magento\Customer\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Framework\View\LayoutInterface;
 use Tweakwise\Magento2Tweakwise\Helper\Cache;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ProductListItem implements ArgumentInterface
 {
@@ -20,7 +22,9 @@ class ProductListItem implements ArgumentInterface
      */
     public function __construct(
         private readonly LayoutInterface $layout,
-        private readonly Cache $cacheHelper
+        private readonly Cache $cacheHelper,
+        private readonly StoreManagerInterface $storeManager,
+        private readonly Session $customerSession
     ) {
     }
 
@@ -58,6 +62,7 @@ public function getItemHtml(
         }
 
         $productId = (int) $product->getId();
+
         if (!$this->cacheHelper->load($productId)) {
             $itemHtml = $this->getItemHtmlWithRenderer(
                 $product,
@@ -70,7 +75,16 @@ public function getItemHtml(
             $this->cacheHelper->save($itemHtml, $productId);
         }
 
-        return sprintf('<esi:include src="/%s?product_id=%s" />', Cache::PRODUCT_CARD_PATH, $productId);
+        $storeId = $this->storeManager->getStore()->getId();
+        $customerGroupId = $this->customerSession->getCustomerGroupId();
+
+        return sprintf(
+            '<esi:include src="/%s?product_id=%s&store_id=%s&customer_group_id=%s" />',
+            Cache::PRODUCT_CARD_PATH,
+            $productId,
+            $storeId,
+            $customerGroupId
+        );
     }
 
     /**