Release version 3.1.2

afterpay · Jan 23, 2020 · 40b41ea · 40b41ea
1 parent 54f0ab1
commit 40b41ea
Show file tree

Hide file tree

Showing 79 changed files with 777 additions and 358 deletions.
diff --git a/Block/Adminhtml/Order/Creditmemo/Create/Items.php b/Block/Adminhtml/Order/Creditmemo/Create/Items.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block\Adminhtml\Order\Creditmemo\Create;
 

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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Block\Adminhtml\System\Config\Form\Field;
 

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

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

diff --git a/Block/Info.php b/Block/Info.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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.1.2
+
+_Fri 24 Jan 2020 (AEDT)_
+
+### Supported Editions & Versions
+
+- Magento Community Edition (CE) version 2.0.2 and later
+- Magento Enterprise Edition (EE) version 2.0.2 and later
+
+### Highlights
+
+- Improved handling of Store Credit and Gift Cards in Magento Enterprise.
+- Improved handling of unusual AJAX behaviour at the checkout.
+- Replaced legacy internal assets with latest artwork hosted on the Afterpay CDN.
+- Added a cron job for Deferred Payment Flow to create Credit Memos in Magento if a payment Auth is allowed to expire.
+- Added a new field on the Magento Invoice to show when a payment Auth will expire.
+
+---
+
 ## Version 3.1.1
 
 _Tue 24 Dec 2019 (AEDT)_

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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Controller\Payment;
 
@@ -38,6 +38,7 @@ class Response extends \Magento\Framework\App\Action\Action
 	protected $_notifierPool;
 	protected $_paymentCapture;
 	protected $_quoteValidator;
+	protected $_timezone;
 
     /**
      * Response constructor.
@@ -78,7 +79,8 @@ public function __construct(
         \Magento\Sales\Model\Order\Payment\Transaction\Repository $transactionRepository,
 		\Magento\Framework\Notification\NotifierInterface $notifierPool,
 		\Afterpay\Afterpay\Model\Adapter\V2\AfterpayOrderPaymentCapture $paymentCapture,
-		\Magento\Quote\Model\QuoteValidator $quoteValidator
+		\Magento\Quote\Model\QuoteValidator $quoteValidator,
+		\Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
     ) {
         $this->_resultForwardFactory = $resultForwardFactory; 
 		$this->response = $response;
@@ -98,6 +100,7 @@ public function __construct(
         $this->_notifierPool = $notifierPool;
 		$this->_paymentCapture = $paymentCapture;
 		$this->_quoteValidator = $quoteValidator;
+		$this->_timezone = $timezone;
 
         parent::__construct($context);
     }
@@ -190,6 +193,16 @@ private function _processAuthCapture($query)
 
 							$payment->setAdditionalInformation(\Afterpay\Afterpay\Model\Payovertime::PAYMENT_STATUS,$response['paymentState']);
 
+							if($response['paymentState']==\Afterpay\Afterpay\Model\Response::PAYMENT_STATUS_AUTH_APPROVED && array_key_exists('events',$response)){
+								try{
+									$payment->setAdditionalInformation(\Afterpay\Afterpay\Model\Payovertime::AUTH_EXPIRY,$this->_timezone->date($response['events'][0]['expires'])->format('Y-m-d H:i T'));
+								}
+								catch(\Exception $e){
+									$payment->setAdditionalInformation(\Afterpay\Afterpay\Model\Payovertime::AUTH_EXPIRY,$this->_timezone->date($response['events'][0]['expires'],null,false)->format('Y-m-d H:i T'));
+									$this->_helper->debug($e->getMessage());
+								}
+							}
+
 							$payment->setAdditionalInformation(\Afterpay\Afterpay\Model\Payovertime::OPEN_TOCAPTURE_AMOUNT, array_key_exists('openToCaptureAmount',$response) && !empty($response['openToCaptureAmount']) ? $response['openToCaptureAmount']['amount'] : "0.00");
 
                             $this->_checkoutSession
@@ -315,8 +328,8 @@ private function _createTransaction($order = null, $paymentData = [],$payment=nu
 
 			$order->setBaseCustomerBalanceInvoiced(null);
 			$order->setCustomerBalanceInvoiced(null);
-
-			$this->_orderRepository->save($order);
+            $this->_orderRepository->save($order);
+
             $transaction = $this->_transactionRepository->save($transaction);
 
             return  $transaction->getTransactionId();

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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-2019 Afterpay Touch Group Limited
+   Copyright 2016-2020 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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 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-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Model\Adapter\Afterpay;
 
@@ -141,7 +141,8 @@ public function send($url, $body = false, $method = \Magento\Framework\HTTP\Zend
                 'httpStatusCode' => $response->getStatus(),
                 'body' => $this->obfuscateCustomerData($this->jsonHelper->jsonDecode($response->getBody()))
             ];
-            $this->helper->debug($this->jsonHelper->jsonEncode($responseLog));
+			$this->helper->debug($this->jsonHelper->jsonEncode($responseLog));
+
         } catch (\Exception $e) {
             $this->helper->debug($e->getMessage());
 

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

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

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

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

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

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

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

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

diff --git a/Model/Config/Payovertime.php b/Model/Config/Payovertime.php
@@ -3,7 +3,7 @@
  * Magento 2 extensions for Afterpay Payment
  *
  * @author Afterpay
- * @copyright 2016-2019 Afterpay https://www.afterpay.com
+ * @copyright 2016-2020 Afterpay https://www.afterpay.com
  */
 namespace Afterpay\Afterpay\Model\Config;
 
@@ -320,9 +320,9 @@ public function isDebugEnabled()
     /**
      * @return bool
      */
-    public function isActive()
+    public function isActive($override = [])
     {
-        return (bool)(int)$this->_getConfigData(self::ACTIVE);
+        return (bool)(int)$this->_getConfigData(self::ACTIVE,$override);
     }
 
     /**

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

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

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