PLUG-105: Fix shipping method being occasionally dropped when re-savi…

…ng quotes

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.0.10] - 2024-05-07
+
+### Fixed
+
+- Fix shipping method being dropped in some cases
+
 ## [v1.0.10] - 2024-04-12
 
 ### Changed

Service/Order/ProcessReturn.php

@@ -15,6 +15,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
+use Magento\Quote\Api\CartManagementInterface;
 use TrueLayer\Connect\Api\Log\RepositoryInterface as LogRepository;
 use TrueLayer\Connect\Api\Transaction\RepositoryInterface as TransactionRepository;
 use TrueLayer\Connect\Service\Api\GetClient;
@@ -58,6 +59,10 @@ class ProcessReturn
      * @var LogRepository
      */
     private $logger;
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
 
     /**
      * ProcessReturn constructor.
@@ -76,6 +81,7 @@ public function __construct(
         CartRepositoryInterface $quoteRepository,
         OrderInterface $orderInterface,
         OrderRepositoryInterface $orderRepository,
+        CartManagementInterface $cartManagement,
         TransactionRepository $transactionRepository,
         LogRepository $logger
     ) {
@@ -84,6 +90,7 @@ public function __construct(
         $this->quoteRepository = $quoteRepository;
         $this->orderInterface = $orderInterface;
         $this->orderRepository = $orderRepository;
+        $this->cartManagement = $cartManagement;
         $this->transactionRepository = $transactionRepository;
         $this->logger = $logger;
     }
@@ -113,9 +120,6 @@ public function execute(string $transactionId): array
         if (!$order->getEntityId()) {
             if ($transactionStatus == 'settled' || $transactionStatus == 'executed') {
                 return ['success' => false, 'status' => $transactionStatus];
-            } else {
-                $quote->setIsActive(true);
-                $this->quoteRepository->save($quote);
             }
         }
 
@@ -142,7 +146,7 @@ public function execute(string $transactionId): array
     /**
      * @param CartInterface $quote
      * @param Order $order
-     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     private function updateCheckoutSession(CartInterface $quote, Order $order): void
     {
@@ -153,6 +157,7 @@ private function updateCheckoutSession(CartInterface $quote, Order $order): void
             try {
                 $activeQuote = $this->quoteRepository->getActiveForCustomer($customerId);
                 $this->quoteRepository->delete($activeQuote);
+                $this->cartManagement->createEmptyCartForCustomer($customerId);
             } catch (NoSuchEntityException $e) {
                 $this->logger->addErrorLog('Remove customer quote', $e->getMessage());
             }

Service/Order/ProcessWebhook.php

@@ -200,6 +200,7 @@ private function prepareQuote(CartInterface $quote, string $userId): CartInterfa
 
         $quote->setCustomerIsGuest($quote->getCustomerId() == null);
         $quote->setIsActive(true);
+        $quote->getShippingAddress()->setCollectShippingRates(false);
         $this->quoteRepository->save($quote);
         return $quote;
     }

composer.json

@@ -2,7 +2,7 @@
     "name": "truelayer/magento2",
     "description": "TrueLayer extension for Magento 2",
     "type": "magento2-module",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

etc/config.xml

@@ -10,7 +10,7 @@
     <default>
         <payment>
             <truelayer>
-                <version>1.0.10</version>
+                <version>1.0.11</version>
                 <model>TrueLayerFacade</model>
                 <title>TrueLayer</title>
                 <description>Pay using TrueLayer</description>