Release version 5.4.0

afterpay · Aug 26, 2024 · 6c53aae · 6c53aae
1 parent f59477e
commit 6c53aae
Show file tree

Hide file tree

Showing 58 changed files with 3,124 additions and 200 deletions.
diff --git a/Api/Data/Quote/ExtendedShippingInformationInterface.php b/Api/Data/Quote/ExtendedShippingInformationInterface.php
diff --git a/Block/Cta/Cart.php b/Block/Cta/Cart.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\Cta;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class Cart extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        if ($this->config->getIsEnableCtaCartPage() && !$this->config->getIsEnableCartPageHeadless()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Block/Cta/CartHeadless.php b/Block/Cta/CartHeadless.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\Cta;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class CartHeadless extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        /** @var \Afterpay\Afterpay\ViewModel\Container\Cta\Headless $viewModel */
+        $viewModel = $this->getViewModel();
+        if ($viewModel && $viewModel->isContainerEnable() && $this->isEnabledForCart()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+    public function isEnabledForCart(): bool
+    {
+        return $this->config->getIsEnableCtaCartPage() && $this->config->getIsEnableCartPageHeadless();
+    }
+}
diff --git a/Block/Cta/MiniCartHeadless.php b/Block/Cta/MiniCartHeadless.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\Cta;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class MiniCartHeadless extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        /** @var \Afterpay\Afterpay\ViewModel\Container\Cta\Headless $viewModel */
+        $viewModel = $this->getViewModel();
+        if ($viewModel && $viewModel->isContainerEnable() && $this->isEnabledForMinicart()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+
+    public function isEnabledForMinicart(): bool
+    {
+        return $this->config->getIsEnableCtaMiniCart() && $this->config->getIsEnableMiniCartHeadless();
+    }
+}
diff --git a/Block/Cta/Product.php b/Block/Cta/Product.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\Cta;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class Product extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        if ($this->config->getIsEnableCtaProductPage() && !$this->config->getIsEnableProductPageHeadless()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Block/Cta/ProductHeadless.php b/Block/Cta/ProductHeadless.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\Cta;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class ProductHeadless extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        /** @var \Afterpay\Afterpay\ViewModel\Container\Cta\Headless $viewModel */
+        $viewModel = $this->getViewModel();
+        if ($viewModel && $viewModel->isContainerEnable()
+            && $this->config->getIsEnableCtaProductPage() && $this->config->getIsEnableProductPageHeadless()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Block/ExpressCheckout/Cart.php b/Block/ExpressCheckout/Cart.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\ExpressCheckout;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class Cart extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        if ($this->config->getIsEnableExpressCheckoutCartPage() && !$this->config->getIsEnableCartPageHeadless()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Block/ExpressCheckout/CartHeadless.php b/Block/ExpressCheckout/CartHeadless.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\ExpressCheckout;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class CartHeadless extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        /** @var \Afterpay\Afterpay\ViewModel\Container\ExpressCheckout\Headless $viewModel */
+        $viewModel = $this->getViewModel();
+        if ($viewModel && $viewModel->isContainerEnable() && $this->isEnabledForCart()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+    public function isEnabledForCart(): bool
+    {
+        return $this->config->getIsEnableExpressCheckoutCartPage() && $this->config->getIsEnableCartPageHeadless();
+    }
+}
diff --git a/Block/ExpressCheckout/MiniCartHeadless.php b/Block/ExpressCheckout/MiniCartHeadless.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\ExpressCheckout;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class MiniCartHeadless extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        /** @var \Afterpay\Afterpay\ViewModel\Container\ExpressCheckout\Headless $viewModel */
+        $viewModel = $this->getViewModel();
+        if ($viewModel && $viewModel->isContainerEnable() && $this->isEnabledForMinicart()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+
+    public function isEnabledForMinicart(): bool
+    {
+        return $this->config->getIsEnableExpressCheckoutMiniCart() && $this->config->getIsEnableMiniCartHeadless();
+    }
+}
diff --git a/Block/ExpressCheckout/Product.php b/Block/ExpressCheckout/Product.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\ExpressCheckout;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class Product extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        if ($this->config->getIsEnableExpressCheckoutProductPage() && !$this->config->getIsEnableProductPageHeadless()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Block/ExpressCheckout/ProductHeadless.php b/Block/ExpressCheckout/ProductHeadless.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Afterpay\Afterpay\Block\ExpressCheckout;
+
+use Afterpay\Afterpay\Model\Config;
+use Magento\Framework\View\Element\Template;
+
+class ProductHeadless extends Template
+{
+    private Config $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config           $config,
+        array            $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    protected function _toHtml()
+    {
+        /** @var \Afterpay\Afterpay\ViewModel\Container\ExpressCheckout\Headless $viewModel */
+        $viewModel = $this->getViewModel();
+        if ($viewModel && $viewModel->isContainerEnable()
+            && $this->config->getIsEnableExpressCheckoutProductPage() && $this->config->getIsEnableProductPageHeadless()) {
+            return parent::_toHtml();
+        }
+
+        return '';
+    }
+}
diff --git a/Gateway/Request/ExpressCheckoutDataBuilder.php b/Gateway/Request/ExpressCheckoutDataBuilder.php
@@ -4,19 +4,6 @@
 
 class ExpressCheckoutDataBuilder extends \Afterpay\Afterpay\Gateway\Request\Checkout\CheckoutDataBuilder
 {
-    private \Afterpay\Afterpay\Api\Data\Quote\ExtendedShippingInformationInterface $extendedShippingInformation;
-
-    public function __construct(
-        \Magento\Framework\UrlInterface $url,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
-        \Afterpay\Afterpay\Model\CBT\CheckCBTCurrencyAvailabilityInterface $checkCBTCurrencyAvailability,
-        \Afterpay\Afterpay\Api\Data\Quote\ExtendedShippingInformationInterface $extendedShippingInformation
-    ) {
-        parent::__construct($url, $productRepository, $searchCriteriaBuilder, $checkCBTCurrencyAvailability);
-        $this->extendedShippingInformation = $extendedShippingInformation;
-    }
-
     public function build(array $buildSubject): array
     {
         /** @var \Magento\Quote\Model\Quote $quote */
@@ -26,10 +13,11 @@ public function build(array $buildSubject): array
         $amount = $isCBTCurrencyAvailable ? $quote->getGrandTotal() : $quote->getBaseGrandTotal();
         $currencyCode = $isCBTCurrencyAvailable ? $currentCurrencyCode : $quote->getBaseCurrencyCode();
         $popupOriginUrl = $buildSubject['popup_origin_url'];
-        $lastSelectedShippingRate = $this->extendedShippingInformation->getParam(
-            $quote,
-            \Afterpay\Afterpay\Api\Data\Quote\ExtendedShippingInformationInterface::LAST_SELECTED_SHIPPING_RATE
-        );
+
+        $lastSelectedShippingRate = null;
+        if ($quote->getShippingAddress() && $quote->getShippingAddress()->getShippingMethod()) {
+            $lastSelectedShippingRate = $quote->getShippingAddress()->getShippingMethod();
+        }
 
         $data = [
             'mode' => 'express',