last added item should be removed for session after reading (#108)

Closes #107
EmicoEcommerce · Dec 8, 2023 · e778ed4 · e778ed4
1 parent 8f4dd0d
commit e778ed4
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Block/Checkout/Cart/Crosssell/Plugin.php b/Block/Checkout/Cart/Crosssell/Plugin.php
@@ -87,16 +87,18 @@ protected function getType()
 
     public function aroundGetLastAddedProduct(Crosssell $crossell, Closure $proceed)
     {
-        $product = null;
-        $productId = $this->_getLastAddedProductId();
-        if ($productId) {
-            try {
-                $product = $this->productRepository->getById($productId);
-            } catch (NoSuchEntityException $e) {
-                $product = null;
+        if ($this->lastAddedProduct === null) {
+            $product = null;
+            $productId = $this->_getLastAddedProductId();
+            if ($productId) {
+                try {
+                    $product = $this->productRepository->getById($productId);
+                } catch (NoSuchEntityException $e) {
+                    $product = null;
+                }
             }
+            $this->lastAddedProduct = $product;
         }
-        $this->lastAddedProduct = $product;
 
         return $this->lastAddedProduct;
     }
@@ -108,7 +110,7 @@ public function aroundGetLastAddedProduct(Crosssell $crossell, Closure $proceed)
      */
     protected function _getLastAddedProductId()
     {
-        return $this->checkoutSession->getLastAddedProductId(false);
+        return $this->checkoutSession->getLastAddedProductId(true);
     }
 
     /**