Fix issue when confirmed cart does not match the current cart

CS-5639

Controller/Comeback/Index.php

@@ -105,7 +105,7 @@ public function execute()
         $metadata = $this->cookieMetadataFactory
             ->createPublicCookieMetadata()
             ->setPath('/');
-        $sectiondata = json_decode($this->cookieManager->getCookie('section_data_ids'));
+        $sectiondata = json_decode($this->cookieManager->getCookie('section_data_ids') ?: '');
         if($sectiondata){
             $sectiondata->cart += 1000;
             $this->cookieManager->setPublicCookie(

Model/Api/Builders/CreateOrderRequestBuilder.php

@@ -111,7 +111,11 @@ public function __construct(
 
     public function build(): CreateOrderRequest
     {
-        $this->quote = $this->quoteRepository->getActive($this->cartId);
+        try {
+            $this->quote = $this->quoteRepository->getActive($this->cartId);
+        } catch (\Exception $e) {
+            $this->quote = $this->quoteRepository->get($this->cartId);
+        }
 
         return $this->generateCreateOrderRequest();
     }

Services/BusinessLogic/OrderService.php

@@ -5,7 +5,9 @@
 use DateTime;
 use Exception;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use SeQura\Core\BusinessLogic\Domain\Order\Exceptions\InvalidOrderStateException;
@@ -22,6 +24,7 @@
 use SeQura\Core\Infrastructure\Http\Exceptions\HttpRequestException;
 use SeQura\Core\Infrastructure\ServiceRegister;
 use SeQura\Core\BusinessLogic\Domain\Order\Service\OrderService as SeQuraOrderService;
+use Sequra\Core\Model\Api\Builders\CreateOrderRequestBuilderFactory;
 use Sequra\Core\Services\BusinessLogic\Utility\SeQuraTranslationProvider;
 
 /**
@@ -64,14 +67,24 @@ class OrderService implements ShopOrderService
      * @var SeQuraOrderService
      */
     private $sequraOrderService;
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+    /**
+     * @var CreateOrderRequestBuilderFactory
+     */
+    private $createOrderRequestBuilderFactory;
 
     public function __construct(
         SearchCriteriaBuilder          $searchOrderCriteriaBuilder,
         OrderRepositoryInterface       $shopOrderRepository,
         OrderManagementInterface       $orderManagement,
         CartManagementInterface        $cartManagement,
         SeQuraOrderRepositoryInterface $seQuraOrderRepository,
-        SeQuraTranslationProvider      $translationProvider
+        SeQuraTranslationProvider      $translationProvider,
+        CartRepositoryInterface $cartProvider,
+        CreateOrderRequestBuilderFactory $createOrderRequestBuilderFactory
     )
     {
         $this->searchOrderCriteriaBuilder = $searchOrderCriteriaBuilder;
@@ -80,6 +93,8 @@ public function __construct(
         $this->cartManagement = $cartManagement;
         $this->seQuraOrderRepository = $seQuraOrderRepository;
         $this->translationProvider = $translationProvider;
+        $this->cartRepository = $cartProvider;
+        $this->createOrderRequestBuilderFactory = $createOrderRequestBuilderFactory;
     }
 
     /**
@@ -141,6 +156,24 @@ public function getOrderUrl(string $merchantReference): string
         return '';
     }
 
+    /**
+     * @inheritDoc
+     *
+     * @throws NoSuchEntityException
+     */
+    public function getCreateOrderRequest(string $orderReference): CreateOrderRequest
+    {
+        $seQuraOrder = $this->seQuraOrderRepository->getByOrderReference($orderReference);
+        $quote = $this->cartRepository->get($seQuraOrder->getCartId());
+
+        $builder = $this->createOrderRequestBuilderFactory->create([
+            'cartId' => $quote->getId(),
+            'storeId' => (string)$quote->getStore()->getId(),
+        ]);
+
+        return $builder->build();
+    }
+
     /**
      * Updates the Magento order and SeQuraOrder statuses.
      *

composer.json

@@ -19,7 +19,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=7.4",
-        "sequra/integration-core": "v1.0.13",
+        "sequra/integration-core": "dev-fix/CS-5639",
         "ext-json": "*"
     },
     "repositories": [