Move the Payment booster view logic

Model/Config.php

@@ -20,7 +20,7 @@ class Config implements ConfigInterface
     private const PATH_SECRET = 'checkout/bold_checkout_base/shared_secret';
     private const PATH_ENABLED = 'checkout/bold_checkout_base/enabled';
     private const PATH_TYPE = 'checkout/bold_checkout_base/type';
-    private const PATH_PAYMENT_TITLE = 'checkout/bold_checkout_base/payment_title';
+    public const PATH_PAYMENT_TITLE = 'checkout/bold_checkout_base/payment_title';
     private const PATH_PARALLEL_CHECKOUT_BUTTON_TITLE = 'checkout/bold_checkout_base/parallel_checkout_button_title';
     private const PATH_ENABLED_FOR = 'checkout/bold_checkout_advanced/enabled_for';
     private const PATH_IP_WHITELIST = 'checkout/bold_checkout_advanced/ip_whitelist';
@@ -325,28 +325,6 @@ public function isCheckoutTypeParallel(int $websiteId): bool
             ) === ConfigInterface::VALUE_TYPE_PARALLEL;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function isCheckoutTypeSelfHosted(int $websiteId): bool
-    {
-        return (int)$this->configManagement->getValue(
-                self::PATH_TYPE,
-                $websiteId
-            ) === ConfigInterface::VALUE_TYPE_SELF;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function isCheckoutTypeSelfHostedReact(int $websiteId): bool
-    {
-        return (int)$this->configManagement->getValue(
-                self::PATH_TYPE,
-                $websiteId
-            ) === ConfigInterface::VALUE_TYPE_SELF_REACT;
-    }
-
     /**
      * @inheritDoc
      */

Model/Config/Source/CheckoutTypeSource.php

@@ -19,8 +19,6 @@ public function toOptionArray(): array
         return [
             ['value' => ConfigInterface::VALUE_TYPE_STANDARD, 'label' => __('Bold-Hosted (Standard)')],
             ['value' => ConfigInterface::VALUE_TYPE_PARALLEL, 'label' => __('Dual')],
-            ['value' => ConfigInterface::VALUE_TYPE_SELF, 'label' => __('Payment Booster')],
-            ['value' => ConfigInterface::VALUE_TYPE_SELF_REACT, 'label' => __('Self-Hosted')],
         ];
     }
 }

Model/ConfigInterface.php

@@ -14,8 +14,6 @@ interface ConfigInterface
     public const VALUE_ENABLED_FOR_PERCENTAGE = 3;
     public const VALUE_TYPE_STANDARD = 0;
     public const VALUE_TYPE_PARALLEL = 1;
-    public const VALUE_TYPE_SELF = 2;
-    public const VALUE_TYPE_SELF_REACT = 3;
     public const PATH_SHOP_ID = 'checkout/bold_checkout_base/shop_id';
 
     /**
@@ -170,22 +168,6 @@ public function isCheckoutTypeStandard(int $websiteId): bool;
      */
     public function isCheckoutTypeParallel(int $websiteId): bool;
 
-    /**
-     * Check if Bold Checkout type is self-hosted (Magento storefront).
-     *
-     * @param int $websiteId
-     * @return bool
-     */
-    public function isCheckoutTypeSelfHosted(int $websiteId): bool;
-
-    /**
-     * Check if Bold Checkout type is self-hosted (React application).
-     *
-     * @param int $websiteId
-     * @return bool
-     */
-    public function isCheckoutTypeSelfHostedReact(int $websiteId): bool;
-
     /**
      * Get Bold Payment storefront title.
      *

Model/Order/InitOrderFromQuote.php

@@ -4,8 +4,10 @@
 namespace Bold\Checkout\Model\Order;
 
 use Bold\Checkout\Api\Http\ClientInterface;
+use Bold\Checkout\Model\Order\InitOrderFromQuote\OrderDataProcessorInterface;
 use Bold\Checkout\Model\Quote\GetCartLineItems;
 use Bold\Checkout\Model\Quote\QuoteAction;
+use Bold\Checkout\Model\Quote\SetQuoteExtensionData;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Directory\Model\Country;
 use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
@@ -41,26 +43,42 @@ class InitOrderFromQuote
      */
     private $quoteAction;
 
+    /**
+     * @var SetQuoteExtensionData
+     */
+    private $setQuoteExtensionData;
+
+    /**
+     * @var OrderDataProcessorInterface[]
+     */
+    private $orderDataProcessors;
+
     /**
      * @param ClientInterface $client
      * @param CollectionFactory $countryCollectionFactory
      * @param GetCartLineItems $getCartLineItems
      * @param QuoteAction $quoteAction
+     * @param SetQuoteExtensionData $setQuoteExtensionData
+     * @param OrderDataProcessorInterface[] $orderDataProcessors
      */
     public function __construct(
         ClientInterface $client,
         CollectionFactory $countryCollectionFactory,
         GetCartLineItems $getCartLineItems,
-        QuoteAction $quoteAction
+        QuoteAction $quoteAction,
+        SetQuoteExtensionData $setQuoteExtensionData,
+        array $orderDataProcessors = []
     ) {
         $this->client = $client;
         $this->countryCollectionFactory = $countryCollectionFactory;
         $this->getCartLineItems = $getCartLineItems;
         $this->quoteAction = $quoteAction;
+        $this->setQuoteExtensionData = $setQuoteExtensionData;
+        $this->orderDataProcessors = $orderDataProcessors;
     }
 
     /**
-     * Initialize order on bold side.
+     * Initialize order on Bold side.
      *
      * @param CartInterface $quote
      * @param string $flowId
@@ -112,6 +130,12 @@ public function init(CartInterface $quote, string $flowId = self::FLOW_ID): arra
             throw new LocalizedException(__('Cannot authenticate customer with id="%1"', $quote->getCustomerId()));
         }
 
+        $this->setQuoteExtensionData->execute((int)$quote->getId(), false);
+
+        foreach ($this->orderDataProcessors as $processor) {
+            $orderData = $processor->process($orderData, $quote);
+        }
+
         return $orderData;
     }
 

Model/Order/InitOrderFromQuote/OrderDataProcessorInterface.php

@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace Bold\Checkout\Model\Order\InitOrderFromQuote;
+
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Process bold order data service interface.
+ */
+interface OrderDataProcessorInterface
+{
+    /**
+     * Process bold order data.
+     *
+     * @param array $data
+     * @param CartInterface $quote
+     * @return array
+     */
+    public function process(array $data, CartInterface $quote): array;
+}

Model/Order/PlaceOrder.php

@@ -8,12 +8,13 @@
 use Bold\Checkout\Api\Data\PlaceOrder\ResultInterface;
 use Bold\Checkout\Api\Data\PlaceOrder\ResultInterfaceFactory;
 use Bold\Checkout\Api\PlaceOrderInterface;
-use Bold\Checkout\Model\ConfigInterface;
 use Bold\Checkout\Model\Http\Client\Request\Validator\OrderPayloadValidator;
 use Bold\Checkout\Model\Order\PlaceOrder\CreateOrderFromPayload;
 use Bold\Checkout\Model\Order\PlaceOrder\ProcessOrder;
 use Bold\Checkout\Model\Order\PlaceOrder\Progress;
 use Bold\Checkout\Model\Quote\LoadAndValidate;
+use Bold\Checkout\Model\Quote\QuoteExtensionDataFactory;
+use Bold\Checkout\Model\ResourceModel\Quote\QuoteExtensionData;
 use Exception;
 use Magento\Framework\Exception\LocalizedException;
 
@@ -37,11 +38,6 @@ class PlaceOrder implements PlaceOrderInterface
      */
     private $orderPayloadValidator;
 
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * @var CreateOrderFromPayload
      */
@@ -62,34 +58,47 @@ class PlaceOrder implements PlaceOrderInterface
      */
     private $loadAndValidate;
 
+    /**
+     * @var QuoteExtensionDataFactory
+     */
+    private $quoteExtensionDataFactory;
+
+    /**
+     * @var QuoteExtensionData
+     */
+    private $quoteExtensionDataResource;
+
     /**
      * @param OrderPayloadValidator $orderPayloadValidator
      * @param ResultInterfaceFactory $responseFactory
      * @param ErrorInterfaceFactory $errorFactory
-     * @param ConfigInterface $config
      * @param CreateOrderFromPayload $createOrderFromPayload
      * @param ProcessOrder $processOrder
      * @param Progress $progress
      * @param LoadAndValidate $loadAndValidate
+     * @param QuoteExtensionDataFactory $quoteExtensionDataFactory
+     * @param QuoteExtensionData $quoteExtensionDataResource
      */
     public function __construct(
         OrderPayloadValidator $orderPayloadValidator,
         ResultInterfaceFactory $responseFactory,
         ErrorInterfaceFactory $errorFactory,
-        ConfigInterface $config,
         CreateOrderFromPayload $createOrderFromPayload,
         ProcessOrder $processOrder,
         Progress $progress,
-        LoadAndValidate $loadAndValidate
+        LoadAndValidate $loadAndValidate,
+        QuoteExtensionDataFactory $quoteExtensionDataFactory,
+        QuoteExtensionData $quoteExtensionDataResource
     ) {
         $this->responseFactory = $responseFactory;
         $this->errorFactory = $errorFactory;
         $this->orderPayloadValidator = $orderPayloadValidator;
-        $this->config = $config;
         $this->createOrderFromPayload = $createOrderFromPayload;
         $this->processOrder = $processOrder;
         $this->progress = $progress;
         $this->loadAndValidate = $loadAndValidate;
+        $this->quoteExtensionDataFactory = $quoteExtensionDataFactory;
+        $this->quoteExtensionDataResource = $quoteExtensionDataResource;
     }
 
     /**
@@ -111,8 +120,12 @@ public function place(string $shopId, OrderDataInterface $order): ResultInterfac
             return $this->getValidationErrorResponse($e->getMessage());
         }
         try {
-            $websiteId = (int)$quote->getStore()->getWebsiteId();
-            $magentoOrder = $this->config->isCheckoutTypeSelfHosted($websiteId)
+            $quoteExtensionData = $this->quoteExtensionDataFactory->create();
+            $this->quoteExtensionDataResource->load(
+                $quoteExtensionData,
+                $quote->getId(), QuoteExtensionData::QUOTE_ID
+            );
+            $magentoOrder = $quoteExtensionData->getOrderCreated()
                 ? $this->processOrder->process($order)
                 : $this->createOrderFromPayload->createOrder($order, $quote);
         } catch (Exception $e) {
@@ -141,7 +154,7 @@ public function place(string $shopId, OrderDataInterface $order): ResultInterfac
      * Build validation error response.
      *
      * @param string $message
-     * @return Bold\Checkout\Api\Data\PlaceOrder\ResultInterface
+     * @return ResultInterface
      */
     private function getValidationErrorResponse(string $message): ResultInterface
     {
@@ -159,5 +172,4 @@ private function getValidationErrorResponse(string $message): ResultInterface
             ]
         );
     }
-
 }

Model/Order/PlaceOrder/CreateOrderFromPayload.php

@@ -6,6 +6,7 @@
 use Bold\Checkout\Api\Data\PlaceOrder\Request\OrderDataInterface;
 use Bold\Checkout\Model\Order\OrderExtensionData;
 use Bold\Checkout\Model\Order\OrderExtensionDataFactory;
+use Bold\Checkout\Model\Order\PlaceOrder\CreateOrderFromPayload\CreateOrderFromQuote;
 use Bold\Checkout\Model\ResourceModel\Order\OrderExtensionData as OrderExtensionDataResource;
 use Exception;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;

Model/Order/PlaceOrder/CreateOrderFromQuote.php → Model/Order/PlaceOrder/CreateOrderFromPayload/CreateOrderFromQuote.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Bold\Checkout\Model\Order\PlaceOrder;
+namespace Bold\Checkout\Model\Order\PlaceOrder\CreateOrderFromPayload;
 
 use Bold\Checkout\Api\Data\PlaceOrder\Request\OrderDataInterface;
 use Bold\Checkout\Model\Payment\Gateway\Service;

Model/Order/PlaceOrder/ProcessOrder.php

@@ -12,9 +12,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\Sales\Model\OrderRepository;
-use Magento\Sales\Model\ResourceModel\Order;
 
 /**
  * Process order in case of self-hosted checkout.

Model/Payment/Gateway/Config/CanUseCheckoutValueHandler.php

@@ -29,6 +29,7 @@ public function __construct(Session $checkoutSession)
      */
     public function handle(array $subject, $storeId = null): bool
     {
-        return $this->checkoutSession->getBoldCheckoutData() !== null;
+        return $this->checkoutSession->getBoldCheckoutData() !== null
+            && !$this->checkoutSession->getQuote()->getIsMultiShipping();
     }
 }

Model/Payment/Gateway/Config/IsActiveValueHandler.php

@@ -41,7 +41,8 @@ public function handle(array $subject, $storeId = null)
     {
         try {
             if ($this->state->getAreaCode() === Area::AREA_FRONTEND) {
-                return $this->checkoutSession->getBoldCheckoutData() !== null;
+                return $this->checkoutSession->getBoldCheckoutData() !== null
+                    && !$this->checkoutSession->getQuote()->getIsMultiShipping();
             }
         } catch (LocalizedException $e) {
             return false;