CHK-6928: Provide Page Source as Option to EPS Payments SDK

Api/Quote/GetQuoteInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bold\CheckoutPaymentBooster\Api\Quote;
+
+/**
+ * Hydrate Bold order from Magento quote.
+ */
+interface GetQuoteInterface
+{
+    /**
+     * Gets Current Session Quote ID
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getQuoteId();
+}

Model/InitOrderFromQuote.php

@@ -75,7 +75,7 @@ public function init(CartInterface $quote): array
             'cart_id' => $quote->getId() ?? '',
         ];
         $orderData = $this->client->post(
-            (int)$quote->getStore()->getWebsiteId(),
+            (int)$websiteId,
             self::INIT_SIMPLE_ORDER_URI,
             $body
         );

Observer/Product/ExpressPayBeforeAddToCartObserver.php

@@ -0,0 +1,59 @@
+<?php
+
+
+namespace Bold\CheckoutPaymentBooster\Observer\Product;
+
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Api\CartRepositoryInterface;
+
+/**
+ * Observer for `controller_action_predispatch_checkout_cart_add` event
+ *
+ * @see \Magento\Framework\App\FrontController::dispatchPreDispatchEvents
+ * @see \Magento\Checkout\Controller\Cart\Add::execute
+ */
+class ExpressPayBeforeAddToCartObserver implements ObserverInterface
+{
+    /**
+     * @var Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    protected $cartRepository;
+
+    public function __construct(Session $checkoutSession, CartRepositoryInterface $cartRepository)
+    {
+        $this->checkoutSession = $checkoutSession;
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * Clear the cart before checking out with Express Pay from the product detail page
+     *
+     * @param Observer $observer
+     * @return void
+     */
+    public function execute(Observer $observer): void
+    {
+        $request = $observer->getEvent()->getRequest();
+        $isExpressPayOrder = $request->getParam('source') === 'expresspay';
+
+        $quote = $this->checkoutSession->getQuote();
+
+        if (!$isExpressPayOrder) {
+            return;
+        }
+        $this->checkoutSession->setCheckoutState(true);
+        $quote->removeAllItems();
+        $quote->setTotalsCollectedFlag(false);
+        $this->checkoutSession->clearQuote();
+
+        $this->cartRepository->save($quote);
+        $this->checkoutSession->setQuoteId($quote->getId());
+    }
+}

Observer/ShortcutButtons/AddExpressPayButtonsObserver.php

@@ -9,6 +9,7 @@
 use Magento\Catalog\Block\ShortcutButtons;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
+use Bold\CheckoutPaymentBooster\UI\PaymentBoosterConfigProvider;
 
 /**
  * Observes the `shortcut_buttons_container` event
@@ -32,18 +33,40 @@ public function execute(Observer $observer): void
         $event = $observer->getEvent();
         /** @var ShortcutButtons $container */
         $container = $event->getData('container');
+
+        $layout = $container->getLayout();
+
+        if ($layout->getBlock(ExpressPayShortcutButtons::BLOCK_ALIAS) !== false) {
+            return;
+        }
+
         /** @var ExpressPayShortcutButtons $expressPayShortcutButtons */
-        $expressPayShortcutButtons = $container->getLayout()->createBlock(
+        $expressPayShortcutButtons = $layout->createBlock(
             ExpressPayShortcutButtons::class,
-            ExpressPayShortcutButtons::BLOCK_ALIAS,
+            '',
             [
                 'data' => [
                     'express_pay_view_model' => $this->expressPayFactory->create(),
-                    'render_page_source' => 'mini-cart'
+                    'render_page_source' => $this->getPageType($observer->getEvent())
                 ]
             ]
         );
 
         $container->addShortcut($expressPayShortcutButtons);
     }
+
+    /**
+     * @param $event
+     * @return string
+     */
+    private function getPageType($event) : string
+    {
+        if ($event->getIsCatalogProduct()) {
+            return PaymentBoosterConfigProvider::PAGE_SOURCE_PRODUCT;
+        }
+        if ($event->getIsShoppingCart()) {
+            return PaymentBoosterConfigProvider::PAGE_SOURCE_CART;
+        }
+        return PaymentBoosterConfigProvider::PAGE_SOURCE_MINICART;
+    }
 }

Service/ExpressPay/Order/Create.php

@@ -7,8 +7,10 @@
 use Bold\CheckoutPaymentBooster\Api\Http\ClientInterface;
 use Bold\CheckoutPaymentBooster\Service\ExpressPay\QuoteConverter;
 use Exception;
+use Magento\Checkout\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
@@ -41,18 +43,24 @@ class Create
     /**
      * @var ClientInterface
      */
-    private $httpClient;
+    private $httpClient;    
+    /**
+     * @var SessionManagerInterface
+     */
+    private $checkoutSession;
 
     public function __construct(
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         CartRepositoryInterface $cartRepository,
         QuoteConverter $quoteConverter,
-        ClientInterface $httpClient
+        ClientInterface $httpClient,
+        SessionManagerInterface $checkoutSession
     ) {
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->cartRepository = $cartRepository;
         $this->quoteConverter = $quoteConverter;
         $this->httpClient = $httpClient;
+        $this->checkoutSession = $checkoutSession;
     }
 
     /**
@@ -77,18 +85,29 @@ public function execute($quoteMaskId, $gatewayId, $shippingStrategy): array
             $quoteId = $quoteMaskId;
         }
 
-        try {
-            /** @var Quote $quote */
-            $quote = $this->cartRepository->get((int)$quoteId);
-        } catch (NoSuchEntityException $noSuchEntityException) {
-            throw new LocalizedException(__('Could not create Express Pay order. Invalid quote ID "%1".', $quoteId));
+        if ($quoteId !== '') {
+            try {
+                /** @var Quote $quote */
+                $quote = $this->cartRepository->get((int)$quoteId);
+            } catch (NoSuchEntityException $noSuchEntityException) {
+                throw new LocalizedException(__('Could not create Express Pay order. Invalid quote ID "%1".', $quoteId));
+            }
+        } else {
+            try {
+                /** @var Session $session */
+                $session = $this->checkoutSession;
+                /** @var Quote $quote */
+                $quote = $session->getQuote();
+            } catch (NoSuchEntityException $noSuchEntityException) {
+                throw new LocalizedException(__('Active quote not found.'));
+            }
         }
 
-       $hasBillingData = $quote->getBillingAddress()->getFirstname() && $quote->getBillingAddress()->getStreet();
+        $hasBillingData = $quote->getBillingAddress()->getFirstname() && $quote->getBillingAddress()->getStreet();
 
-       if (!$hasBillingData && !empty($quote->getShippingAddress()->getShippingMethod())) {
-           $quote->getShippingAddress()->setShippingMethod('');
-       }
+        if (!$hasBillingData && !empty($quote->getShippingAddress()->getShippingMethod())) {
+            $quote->getShippingAddress()->setShippingMethod('');
+        }
 
         $websiteId = (int)$quote->getStore()->getWebsiteId();
         $uri = 'checkout/orders/{{shopId}}/wallet_pay';

Service/ExpressPay/Order/Update.php

@@ -8,8 +8,10 @@
 use Bold\CheckoutPaymentBooster\Service\ExpressPay\Order\Get as GetExpressPayOrder;
 use Bold\CheckoutPaymentBooster\Service\ExpressPay\QuoteConverter;
 use Exception;
+use Magento\Checkout\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
@@ -46,20 +48,26 @@ class Update
     /**
      * @var GetExpressPayOrder
      */
-    private $getExpressPayOrder;
+    private $getExpressPayOrder;    
+    /**
+     * @var SessionManagerInterface
+     */
+    private $checkoutSession;
 
     public function __construct(
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         CartRepositoryInterface $cartRepository,
         QuoteConverter $quoteConverter,
         GetExpressPayOrder $getExpressPayOrder,
-        ClientInterface $httpClient
+        ClientInterface $httpClient,
+        SessionManagerInterface $checkoutSession
     ) {
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->cartRepository = $cartRepository;
         $this->quoteConverter = $quoteConverter;
         $this->getExpressPayOrder = $getExpressPayOrder;
         $this->httpClient = $httpClient;
+        $this->checkoutSession = $checkoutSession;
     }
 
     /**
@@ -83,11 +91,22 @@ public function execute($quoteMaskId, $gatewayId, $paypalOrderId): void
             $quoteId = $quoteMaskId;
         }
 
-        try {
-            /** @var Quote $quote */
-            $quote = $this->cartRepository->get((int)$quoteId);
-        } catch (NoSuchEntityException $noSuchEntityException) {
-            throw new LocalizedException(__('Could not update Express Pay order. Invalid quote ID "%1".', $quoteId));
+        if ($quoteId !== '') {
+            try {
+                /** @var Quote $quote */
+                $quote = $this->cartRepository->get((int)$quoteId);
+            } catch (NoSuchEntityException $noSuchEntityException) {
+                throw new LocalizedException(__('Could not update Express Pay order. Invalid quote ID "%1".', $quoteId));
+            }
+        } else {
+            try {
+                /** @var Session $session */
+                $session = $this->checkoutSession;
+                /** @var Quote $quote */
+                $quote = $session->getQuote();
+            } catch (NoSuchEntityException $noSuchEntityException) {
+                throw new LocalizedException(__('Active quote not found.'));
+            }
         }
 
         $websiteId = (int)$quote->getStore()->getWebsiteId();

Service/Quote/GetQuote.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bold\CheckoutPaymentBooster\Service\Quote;
+
+use Bold\CheckoutPaymentBooster\Api\Quote\GetQuoteInterface;
+use Magento\Checkout\Model\Session;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+
+/**
+ * Get Current Quote ID from Magento quote.
+ */
+class GetQuote implements GetQuoteInterface
+{
+    /**
+     * @var Session
+     */
+    private $checkoutSession;    
+
+    /**
+     * @var QuoteIdToMaskedQuoteId
+     */
+    private $quoteIdToMaskedQuoteId;
+
+    public function __construct(Session $checkoutSession, QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId) 
+    {
+        $this->checkoutSession = $checkoutSession;
+        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+    }
+
+    /**
+     * Gets Current Session Quote ID
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getQuoteId()
+    {
+        $quoteId = (int)$this->checkoutSession->getQuote()->getId();
+        $quoteIdMask = $this->quoteIdToMaskedQuoteId->execute($quoteId);
+
+        return $quoteIdMask;
+    }
+}