Merge pull request #15 from OnTap/master

Simplify Commerce version 3.1.0
Mastercard-Gateway · May 28, 2020 · ae99932 · ae99932
2 parents fcb4e12 + 0fa9054
commit ae99932
Show file tree

Hide file tree

Showing 58 changed files with 194 additions and 88 deletions.
diff --git a/Block/Customer/CardRenderer.php b/Block/Customer/CardRenderer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Block/Info.php b/Block/Info.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Controller/Simplify/PlaceOrder.php b/Controller/Simplify/PlaceOrder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,13 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 use Zend_Json_Encoder;
 
@@ -66,28 +70,53 @@ class PlaceOrder extends Action
      */
     protected $customerSession;
 
+    /**
+     * @var CookieManagerInterface
+     */
+    protected $cookieManager;
+
+    /**
+     * @var CookieMetadataFactory
+     */
+    protected $cookieMetadataFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    protected $storeManager;
+
     /**
      * Redirect constructor.
      * @param Context $context
      * @param ConfigInterface $config
      * @param CheckoutSession $checkoutSession
      * @param LoggerInterface $logger
      * @param CartManagementInterface $cartManagement
+     * @param CustomerSession $customerSession
+     * @param CookieManagerInterface $cookieManager
+     * @param CookieMetadataFactory $cookieMetadataFactory
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Context $context,
         ConfigInterface $config,
         CheckoutSession $checkoutSession,
         LoggerInterface $logger,
         CartManagementInterface $cartManagement,
-        CustomerSession $customerSession
+        CustomerSession $customerSession,
+        CookieManagerInterface $cookieManager,
+        CookieMetadataFactory $cookieMetadataFactory,
+        StoreManagerInterface $storeManager
     ) {
         parent::__construct($context);
         $this->config = $config;
         $this->checkoutSession = $checkoutSession;
         $this->logger = $logger;
         $this->cartManagement = $cartManagement;
         $this->customerSession = $customerSession;
+        $this->cookieManager = $cookieManager;
+        $this->cookieMetadataFactory = $cookieMetadataFactory;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -120,6 +149,27 @@ protected function validateQuote($quote)
         }
     }
 
+    /**
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException
+     * @throws \Magento\Framework\Stdlib\Cookie\FailureToSendException
+     */
+    protected function setInvalidationCookie()
+    {
+        try {
+            $store = $this->storeManager->getStore();
+            $cookieMeta = $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setHttpOnly(false)
+                ->setDuration(86400) //24h
+                ->setPath($store->getStorePath());
+
+            $this->cookieManager->setPublicCookie('simplify_section_data_clean', '1', $cookieMeta);
+        } catch (\Exception $e) {
+            $this->logger->error('Simplify Commerce could not set Invalidation Cookie:' . $e->getMessage());
+        }
+    }
+
     /**
      * @inheritDoc
      */
@@ -143,6 +193,8 @@ public function execute()
 
             $this->cartManagement->placeOrder($quote->getId());
 
+            $this->setInvalidationCookie();
+
             /** @var Redirect $resultRedirect */
             return $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
         } catch (Exception $e) {

diff --git a/Gateway/Command/AuthorizeStrategyCommand.php b/Gateway/Command/AuthorizeStrategyCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Command/CaptureStrategyCommand.php b/Gateway/Command/CaptureStrategyCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Http/Client/AbstractTransaction.php b/Gateway/Http/Client/AbstractTransaction.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,6 +67,7 @@ public function placeRequest(TransferInterface $transferObject)
         try {
             $response['object'] = $this->process($data);
         } catch (\Simplify_ApiException $e) {
+            $log['detail'] = $e->describe();
             $log['field_errors'] = [];
             $log['exception'] = $e->getMessage();
             if ($e instanceof \Simplify_BadRequestException && $e->hasFieldErrors()) {

diff --git a/Gateway/Http/Client/CustomerCreate.php b/Gateway/Http/Client/CustomerCreate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Http/Client/PaymentAuthorize.php b/Gateway/Http/Client/PaymentAuthorize.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Http/Client/PaymentCapture.php b/Gateway/Http/Client/PaymentCapture.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Http/Client/PaymentRefund.php b/Gateway/Http/Client/PaymentRefund.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Http/Client/PaymentVoid.php b/Gateway/Http/Client/PaymentVoid.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Http/TransferFactory.php b/Gateway/Http/TransferFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/AuthorizationIdBuilder.php b/Gateway/Request/AuthorizationIdBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/CardTokenBuilder.php b/Gateway/Request/CardTokenBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/CustomerBuilder.php b/Gateway/Request/CustomerBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/CustomerIdBuilder.php b/Gateway/Request/CustomerIdBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/PaymentBuilder.php b/Gateway/Request/PaymentBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/PaymentIdBuilder.php b/Gateway/Request/PaymentIdBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Request/VaultTokenBuilder.php b/Gateway/Request/VaultTokenBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Response/AuthorizationHandler.php b/Gateway/Response/AuthorizationHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Response/CaptureHandler.php b/Gateway/Response/CaptureHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Response/CustomerHandler.php b/Gateway/Response/CustomerHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Response/PaymentHandler.php b/Gateway/Response/PaymentHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Response/TokenHandler.php b/Gateway/Response/TokenHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Validator/CustomerValidator.php b/Gateway/Validator/CustomerValidator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Validator/PaymentValidator.php b/Gateway/Validator/PaymentValidator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Gateway/Validator/ValidateTrue.php b/Gateway/Validator/ValidateTrue.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Adminhtml/Source/PaymentAction.php b/Model/Adminhtml/Source/PaymentAction.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Config/Source/FormType.php b/Model/Config/Source/FormType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Config/Source/Order/Status/Pendingpayment.php b/Model/Config/Source/Order/Status/Pendingpayment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/InstantPurchase/AvailabilityChecker.php b/Model/InstantPurchase/AvailabilityChecker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/InstantPurchase/PaymentAdditionalInformationProvider.php b/Model/InstantPurchase/PaymentAdditionalInformationProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/InstantPurchase/TokenFormatter.php b/Model/InstantPurchase/TokenFormatter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Observer/DataAssignObserver.php b/Observer/DataAssignObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * 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/Ui/ConfigProvider.php b/Ui/ConfigProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2013-2019 Mastercard
+ * Copyright (c) 2013-2020 Mastercard
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.