Update cart model before collect totals

bold-commerce · Oct 16, 2023 · ec316fe · ec316fe
1 parent 5321400
commit ec316fe
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/Model/Quote/GetQuote.php b/Model/Quote/GetQuote.php
@@ -82,14 +82,14 @@ public function getQuote(
         try {
             $quote = $this->cartRepository->getActive($cartId);
             $this->checkoutSession->replaceQuote($quote);
+            $this->cart->setQuote($quote);
             $this->shopIdValidator->validate($shopId, $quote->getStoreId());
             $this->storeManager->setCurrentStore($quote->getStoreId());
             $this->storeManager->getStore()->setCurrentCurrencyCode($quote->getQuoteCurrencyCode());
         } catch (LocalizedException $e) {
             return $this->quoteResultBuilder->createErrorResult($e->getMessage());
         }
         $quote->collectTotals();
-        $this->cart->setQuote($quote);
         return $this->quoteResultBuilder->createSuccessResult($quote);
     }
 }
diff --git a/Model/Quote/RemoveQuoteCouponCode.php b/Model/Quote/RemoveQuoteCouponCode.php
@@ -8,6 +8,7 @@
 use Bold\Checkout\Model\Http\Client\Request\Validator\ShopIdValidator;
 use Bold\Checkout\Model\Quote\Result\Builder;
 use Exception;
+use Magento\Checkout\Model\Cart;
 use Magento\Checkout\Model\Session;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\CouponManagementInterface;
@@ -48,28 +49,36 @@ class RemoveQuoteCouponCode implements RemoveQuoteCouponCodeInterface
      */
     private $checkoutSession;
 
+    /**
+     * @var Cart
+     */
+    private $cart;
+
     /**
      * @param ShopIdValidator $shopIdValidator
      * @param CouponManagementInterface $couponService
      * @param CartRepositoryInterface $cartRepository
      * @param Builder $quoteResultBuilder
      * @param StoreManagerInterface $storeManager
      * @param Session $checkoutSession
+     * @param Cart $cart
      */
     public function __construct(
         ShopIdValidator $shopIdValidator,
         CouponManagementInterface $couponService,
         CartRepositoryInterface $cartRepository,
         Builder $quoteResultBuilder,
         StoreManagerInterface $storeManager,
-        Session $checkoutSession
+        Session $checkoutSession,
+        Cart $cart
     ) {
         $this->couponService = $couponService;
         $this->quoteResultBuilder = $quoteResultBuilder;
         $this->cartRepository = $cartRepository;
         $this->shopIdValidator = $shopIdValidator;
         $this->storeManager = $storeManager;
         $this->checkoutSession = $checkoutSession;
+        $this->cart = $cart;
     }
 
     /**
@@ -80,6 +89,7 @@ public function removeCoupon(string $shopId, int $cartId, string $couponCode = n
         try {
             $quote = $this->cartRepository->getActive($cartId);
             $this->checkoutSession->replaceQuote($quote);
+            $this->cart->setQuote($quote);
             $this->shopIdValidator->validate($shopId, $quote->getStoreId());
             $this->storeManager->setCurrentStore($quote->getStoreId());
             $this->storeManager->getStore()->setCurrentCurrencyCode($quote->getQuoteCurrencyCode());

diff --git a/Model/Quote/SetQuoteAddresses.php b/Model/Quote/SetQuoteAddresses.php
@@ -95,6 +95,7 @@ public function setAddresses(
         try {
             $quote = $this->cartRepository->getActive($cartId);
             $this->checkoutSession->replaceQuote($quote);
+            $this->cart->setQuote($quote);
             $this->shopIdValidator->validate($shopId, $quote->getStoreId());
             $this->storeManager->setCurrentStore($quote->getStoreId());
             $this->storeManager->getStore()->setCurrentCurrencyCode($quote->getQuoteCurrencyCode());
@@ -116,7 +117,6 @@ public function setAddresses(
         if (!$quote->isVirtual()) {
             $this->setShippingAddress($quote, $shippingAddress);
         }
-        $this->cart->setQuote($quote);
         $quote->collectTotals();
         $this->cartRepository->save($quote);
         return $this->quoteResultBuilder->createSuccessResult($quote);

diff --git a/Model/Quote/SetQuoteCouponCode.php b/Model/Quote/SetQuoteCouponCode.php
@@ -9,6 +9,7 @@
 use Bold\Checkout\Model\Http\Client\Request\Validator\ShopIdValidator;
 use Bold\Checkout\Model\Quote\Result\Builder;
 use Exception;
+use Magento\Checkout\Model\Cart;
 use Magento\Checkout\Model\Session;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\CouponManagementInterface;
@@ -54,6 +55,11 @@ class SetQuoteCouponCode implements SetQuoteCouponCodeInterface
      */
     private $checkoutSession;
 
+    /**
+     * @var Cart
+     */
+    private $cart;
+
     /**
      * @param ShopIdValidator $shopIdValidator
      * @param CouponManagementInterface $couponService
@@ -62,6 +68,7 @@ class SetQuoteCouponCode implements SetQuoteCouponCodeInterface
      * @param ConfigInterface $config
      * @param StoreManagerInterface $storeManager
      * @param Session $checkoutSession
+     * @param Cart $cart used for the backward compatibility with earlier versions of Magento.
      */
     public function __construct(
         ShopIdValidator $shopIdValidator,
@@ -70,7 +77,8 @@ public function __construct(
         Builder $quoteResultBuilder,
         ConfigInterface $config,
         StoreManagerInterface $storeManager,
-        Session $checkoutSession
+        Session $checkoutSession,
+        Cart $cart
     ) {
         $this->couponService = $couponService;
         $this->quoteResultBuilder = $quoteResultBuilder;
@@ -79,6 +87,7 @@ public function __construct(
         $this->config = $config;
         $this->storeManager = $storeManager;
         $this->checkoutSession = $checkoutSession;
+        $this->cart = $cart;
     }
 
     /**
@@ -89,6 +98,7 @@ public function setCoupon(string $shopId, int $cartId, string $couponCode): Resu
         try {
             $quote = $this->cartRepository->getActive($cartId);
             $this->checkoutSession->replaceQuote($quote);
+            $this->cart->setQuote($quote);
             $this->storeManager->setCurrentStore($quote->getStoreId());
             $this->storeManager->getStore()->setCurrentCurrencyCode($quote->getQuoteCurrencyCode());
             if ($this->config->isCheckoutTypeSelfHosted((int)$quote->getStore()->getWebsiteId())) {

diff --git a/Model/Quote/SetQuoteShippingMethod.php b/Model/Quote/SetQuoteShippingMethod.php
@@ -116,6 +116,7 @@ public function setShippingMethod(
         try {
             $quote = $this->cartRepository->getActive($cartId);
             $this->checkoutSession->replaceQuote($quote);
+            $this->cart->setQuote($quote);
             $this->shopIdValidator->validate($shopId, $quote->getStoreId());
             $this->storeManager->setCurrentStore($quote->getStoreId());
             $this->storeManager->getStore()->setCurrentCurrencyCode($quote->getQuoteCurrencyCode());
@@ -125,7 +126,6 @@ public function setShippingMethod(
         if ($this->config->isCheckoutTypeSelfHosted((int)$quote->getStore()->getWebsiteId())) {
             $this->quoteResultBuilder->createSuccessResult($quote);
         }
-        $this->cart->setQuote($quote);
         $shippingInformation = $this->shippingInformationFactory->create()
             ->setShippingAddress($quote->getShippingAddress())
             ->setBillingAddress($quote->getBillingAddress())