diff --git a/Controller/AbandonedCart/LoadCart.php b/Controller/AbandonedCart/LoadCart.php index d953cfb..50ee0ff 100644 --- a/Controller/AbandonedCart/LoadCart.php +++ b/Controller/AbandonedCart/LoadCart.php @@ -130,23 +130,27 @@ public function __construct( */ public function execute() { + $resultPage = $this->resultRedirectFactory->create(); + $originRequestParams = $this->request->getParams(); + $redirectionRequestParamsArray = ['_query' => $originRequestParams]; + $yotpoQuoteToken = $this->request->getParam('yotpoQuoteToken', null); if ($yotpoQuoteToken === null) { $this->messageManager->addErrorMessage(self::NO_ACTIVE_QUOTE); - return $this->resultRedirectFactory->create()->setPath('/'); + return $resultPage->setPath('/', $redirectionRequestParamsArray); } $abandonedCartQuoteId = (int)$this->abandonedCartData->getQuoteId($yotpoQuoteToken); if (!$abandonedCartQuoteId) { $this->messageManager->addErrorMessage(self::NO_ACTIVE_QUOTE); - return $this->resultRedirectFactory->create()->setPath('/'); + return $resultPage->setPath('/', $redirectionRequestParamsArray); } $abandonedQuote = $this->quoteRepository->get($abandonedCartQuoteId); /** @phpstan-ignore-next-line */ if (!$abandonedQuote || !$abandonedQuote->getId() || !$abandonedQuote->getIsActive()) { $this->messageManager->addErrorMessage(self::NO_ACTIVE_QUOTE); - return $this->resultRedirectFactory->create()->setPath('/'); + return $resultPage->setPath('/', $redirectionRequestParamsArray); } $customerSessionCustomer = $this->customerSession->getCustomer(); @@ -165,17 +169,17 @@ public function execute() $this->yotpoSmsBumpSession->start(); $this->yotpoSmsBumpSession->setData('yotpoQuoteToken', $abandonedCartQuoteId); if ($isLoggedInCustomerDifferent) { - return $this->resultRedirectFactory->create()->setPath('customer/account/login'); + return $resultPage->setPath('customer/account/login', $redirectionRequestParamsArray); } } $isValidQuote = $this->abandonedCartData->setQuoteData($abandonedCartQuoteId); if (!$isValidQuote) { - return $this->resultRedirectFactory->create()->setPath('/'); + return $resultPage->setPath('/', $redirectionRequestParamsArray); } $this->checkoutSession->setQuoteId($abandonedCartQuoteId); - $resultPage = $this->resultRedirectFactory->create()->setPath('checkout/cart'); + $resultPage->setPath('checkout/cart', $redirectionRequestParamsArray); $resultPage->setHeader('Yotpo-Abandoned-Cart', 'true'); return $resultPage; } diff --git a/composer.json b/composer.json index b9d2b11..1f34bd1 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "yotpo/module-yotpo-messaging", "description": "Yotpo Sms extension for Magento2", - "version": "4.0.28", + "version": "4.0.29", "license": [ "OSL-3.0", "AFL-3.0" @@ -9,7 +9,7 @@ "require": { "php": "~5.6.0|^7.0|^8.0", "magento/framework": ">=102.0.0", - "yotpo/module-yotpo-core": "4.0.28" + "yotpo/module-yotpo-core": "4.0.29" }, "type": "magento2-module", "autoload": { diff --git a/etc/module.xml b/etc/module.xml index 379546c..fbd2800 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,6 +1,6 @@ - +