Release version 3.4.3

afterpay · Sep 8, 2021 · 475d026 · 475d026
1 parent e16ca5b
commit 475d026
Show file tree

Hide file tree

Showing 80 changed files with 270 additions and 198 deletions.
diff --git a/Block/Adminhtml/System/Config/Button/Update.php b/Block/Adminhtml/System/Config/Button/Update.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block\Adminhtml\System\Config\Button;
 

diff --git a/Block/Adminhtml/System/Config/Form/Field/Disable.php b/Block/Adminhtml/System/Config/Form/Field/Disable.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block\Adminhtml\System\Config\Form\Field;
 

diff --git a/Block/Adminhtml/System/Config/Form/Field/Label.php b/Block/Adminhtml/System/Config/Form/Field/Label.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block\Adminhtml\System\Config\Form\Field;
 

diff --git a/Block/Adminhtml/System/Config/Form/Field/cbtLabel.php b/Block/Adminhtml/System/Config/Form/Field/cbtLabel.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block\Adminhtml\System\Config\Form\Field;
 

diff --git a/Block/Catalog/Installments.php b/Block/Catalog/Installments.php
@@ -113,6 +113,14 @@ public function getTypeOfProduct()
         return $product->getTypeId();
     }
 
+    /**
+     * @return \Magento\Catalog\Model\Product|null
+     */
+    public function getProduct()
+    {
+        return $this->registry->registry('product');
+    }
+
     /**
      * @return string
      */

diff --git a/Block/Info.php b/Block/Info.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block;
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Afterpay Magento 2 Extension Changelog
 
+## Version 3.4.3
+
+_Wed 08 Sep 2021_
+
+### Supported Editions & Versions
+
+Tested and verified in clean installations of Magento 2:
+
+- Magento Community Edition (CE) version 2.4.3
+- Magento Enterprise Edition (EE) version 2.4.2
+
+### Highlights
+
+- Disabled Express Checkout for virtual products.
+- Improved the asset cache handling.
+- Improved customer email address validation to allow symbols such as “+”.
+- Improved debug logging.
+
+---
 ## Version 3.4.2
 
 _Wed 16 June 2021_

diff --git a/Controller/Payment/Express.php b/Controller/Payment/Express.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Controller\Payment;
 
@@ -63,50 +63,53 @@ class Express extends \Magento\Framework\App\Action\Action
 
     protected $_timezone;
 
-
+    private \Afterpay\Afterpay\Model\ExpressPayment\ShippingListProvider $shippingListProvider;
+
     /**
      * Response constructor.
      *
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Checkout\Model\Session $checkoutSession
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context, 
+        \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\ObjectManagerInterface $objectManager,
-        CheckoutSession $checkoutSession,  
-        QuoteFactory $quoteFactory, 
-        AfterpayConfig $afterpayConfig, 
-        AfterpayOrderTokenV2 $afterpayOrderTokenV2, 
-        TokenCheck $tokenCheck, 
-        JsonHelper $jsonHelper, 
-        Helper $helper, 
-        QuoteRepository $quoteRepository, 
-        JsonResultFactory $jsonResultFactory, 
-        QuoteValidator $quoteValidator, 
+        CheckoutSession $checkoutSession,
+        QuoteFactory $quoteFactory,
+        AfterpayConfig $afterpayConfig,
+        AfterpayOrderTokenV2 $afterpayOrderTokenV2,
+        TokenCheck $tokenCheck,
+        JsonHelper $jsonHelper,
+        Helper $helper,
+        QuoteRepository $quoteRepository,
+        JsonResultFactory $jsonResultFactory,
+        QuoteValidator $quoteValidator,
         \Afterpay\Afterpay\Model\Adapter\V2\AfterpayOrderDirectCapture $directCapture,
         \Afterpay\Afterpay\Model\Adapter\V2\AfterpayOrderAuthRequest $authRequest,
-        \Afterpay\Afterpay\Model\Adapter\AfterpayPayment $afterpayApiPayment, 
+        \Afterpay\Afterpay\Model\Adapter\AfterpayPayment $afterpayApiPayment,
         \Magento\Quote\Model\QuoteManagement $quoteManagement,
         ExpressPayment $expressPayment,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone)
-    {
-        $this->_checkoutSession = $checkoutSession;        
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone,
+        \Afterpay\Afterpay\Model\ExpressPayment\ShippingListProvider $shippingListProvider
+    ) {
+        $this->_checkoutSession = $checkoutSession;
         $this->_objectManager = $objectManager;
         $this->_quoteFactory = $quoteFactory;
         $this->_afterpayConfig = $afterpayConfig;
         $this->_afterpayOrderTokenV2 = $afterpayOrderTokenV2;
         $this->_tokenCheck = $tokenCheck;
         $this->_jsonHelper = $jsonHelper;
-        $this->_helper = $helper;        
+        $this->_helper = $helper;
         $this->_quoteRepository = $quoteRepository;
         $this->_jsonResultFactory = $jsonResultFactory;
-        $this->_quoteValidator = $quoteValidator; 
+        $this->_quoteValidator = $quoteValidator;
         $this->_directCapture = $directCapture;
         $this->_authRequest = $authRequest;
         $this->_afterpayApiPayment = $afterpayApiPayment;
         $this->_quoteManagement = $quoteManagement;
-        $this->_expressPayment=$expressPayment;        
+        $this->_expressPayment=$expressPayment;
         $this->_timezone = $timezone;
+        $this->shippingListProvider = $shippingListProvider;
 
         parent::__construct($context);
     }
@@ -244,42 +247,8 @@ public function _change()
             $this->_checkoutSession->replaceQuote($quote);
         }
 
-        $shippingData = $this->_expressPayment->getShippingDetails($quote);
-        $shippingList = array();
-        if (! empty($shippingData)) {
-            foreach ($shippingData as $rateData) {
-                $shippingAmount = $rateData->getBaseAmount();
-                $taxAmount = $shippingAddress->getBaseTaxAmount();
-                $orderAmount = $quote->getBaseSubtotalWithDiscount() + $shippingAmount + $taxAmount;
-                if($this->_expressPayment->isValidOrderAmount($orderAmount)){
-                    $carrierCode = $rateData->getCarrierCode();
-                    $methodCode = $rateData->getMethodCode();
-                    $shippingOptions['id'] = $carrierCode . "_" . $methodCode;
-                    $shippingOptions['name'] = $rateData->getCarrierTitle();
-                    $shippingOptions['description'] = $rateData->getCarrierTitle();
-
-
-                    $shippingOptions['shippingAmount'] = array(
-                        'amount' => $this->_expressPayment->formatAmount($shippingAmount),
-                        'currency' => $quote->getStoreCurrencyCode()
-                    );
-
-
-                    $shippingOptions['taxAmount'] = array(
-                        'amount' => $this->_expressPayment->formatAmount($taxAmount),
-                        'currency' => $quote->getBaseCurrencyCode()
-                    );
-
-
-                    $shippingOptions['orderAmount'] = array(
-                        'amount' => $this->_expressPayment->formatAmount($orderAmount),
-                        'currency' => $quote->getBaseCurrencyCode()
-                    );
-
-                    $shippingList[] = $shippingOptions;
-                }
-            }
-        }
+        $shippingList = $this->shippingListProvider->provide($quote);
+
         $this->_helper->debug("Shipping Estimation Rates", $shippingList);
         if (! empty($shippingList)) {
             $result = $result = $this->_jsonResultFactory->create()->setData([

diff --git a/Controller/Payment/Process.php b/Controller/Payment/Process.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Controller\Payment;
 

diff --git a/Controller/Payment/Response.php b/Controller/Payment/Response.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Controller\Payment;
 

diff --git a/Helper/Category.php b/Helper/Category.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Helper;
 

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Helper;
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016-2020 Afterpay Touch Group Limited
+   Copyright 2016-2021 Afterpay Touch Group Limited
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Model/Adapter/Afterpay/AfterpayClient.php b/Model/Adapter/Afterpay/AfterpayClient.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Model\Adapter\Afterpay;
 

diff --git a/Model/Adapter/Afterpay/AfterpayResponse.php b/Model/Adapter/Afterpay/AfterpayResponse.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Model\Adapter\Afterpay;
 

diff --git a/Model/Adapter/Afterpay/Call.php b/Model/Adapter/Afterpay/Call.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2020 Afterpay https://www.afterpay.com
+ * @copyright 2016-2021 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Model\Adapter\Afterpay;