Merge branch 'develop' into PW-2383

Controller/Process/Result.php

@@ -107,7 +107,14 @@ class Result extends \Magento\Framework\App\Action\Action
                 $session->getQuote()->setIsActive(false)->save();
                 $this->_redirect('checkout/onepage/success', ['_query' => ['utm_nooverride' => '1']]);
             } else {
-                $this->_cancel($response);
+                $this->_adyenLogger->addAdyenResult(
+                    sprintf(
+                        'Payment for order %s was unsuccessful, ' .
+                        'it will be cancelled when the OFFER_CLOSED notification has been processed.',
+                        $this->_order->getIncrementId()
+                    )
+                );
+                $this->restoreCart($response);
                 $failReturnPath = $this->_adyenHelper->getAdyenAbstractConfigData('return_path');
                 $this->_redirect($failReturnPath);
             }
@@ -121,17 +128,13 @@ class Result extends \Magento\Framework\App\Action\Action
     /**
      * @param $response
      */
-    protected function _cancel($response)
+    protected function restoreCart($response)
     {
         $session = $this->_session;
 
         // restore the quote
         $session->restoreQuote();
 
-        $order = $this->_order;
-
-        $this->_adyenHelper->cancelOrder($order);
-
         if (isset($response['authResult']) && $response['authResult'] == \Adyen\Payment\Model\Notification::CANCELLED) {
             $this->messageManager->addError(__('You have cancelled the order. Please try again'));
         } else {
@@ -270,17 +273,13 @@ class Result extends \Magento\Framework\App\Action\Action
                 $this->_adyenLogger->addAdyenResult('Do nothing wait for the notification');
                 break;
             case Notification::CANCELLED:
-                $this->_adyenLogger->addAdyenResult('Cancel or Hold the order');
+            case Notification::ERROR:
+                $this->_adyenLogger->addAdyenResult('Cancel or Hold the order on OFFER_CLOSED notification');
                 $result = false;
                 break;
             case Notification::REFUSED:
                 // if refused there will be a AUTHORIZATION : FALSE notification send only exception is idea
-                $this->_adyenLogger->addAdyenResult('Cancel or Hold the order');
-                $result = false;
-                break;
-            case Notification::ERROR:
-                //attempt to hold/cancel
-                $this->_adyenLogger->addAdyenResult('Cancel or Hold the order');
+                $this->_adyenLogger->addAdyenResult('Cancel or Hold the order on AUTHORISATION success = false notification');
                 $result = false;
                 break;
             default:

Gateway/Http/Client/TransactionAuthorization.php

@@ -64,14 +64,8 @@ class TransactionAuthorization implements ClientInterface
     public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $transferObject)
     {
         $request = $transferObject->getBody();
-        $headers = $transferObject->getHeaders();
-
         $requestOptions = [];
 
-        if (!empty($headers['idempotencyKey'])) {
-            $requestOptions['idempotencyKey'] = $headers['idempotencyKey'];
-        }
-
         // call lib
         $service = new \Adyen\Service\Payment($this->client);
 

Gateway/Http/Client/TransactionPayment.php

@@ -63,7 +63,6 @@ class TransactionPayment implements ClientInterface
     public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $transferObject)
     {
         $request = $transferObject->getBody();
-        $headers = $transferObject->getHeaders();
 
         // If the payments call is already done return the request
         if (!empty($request['resultCode'])) {
@@ -77,10 +76,6 @@ class TransactionPayment implements ClientInterface
 
         $requestOptions = [];
 
-        if (!empty($headers['idempotencyKey'])) {
-            $requestOptions['idempotencyKey'] = $headers['idempotencyKey'];
-        }
-
         $request = $this->applicationInfo->addMerchantApplicationIntoRequest($request);
 
         try {

Gateway/Request/PaymentDataBuilder.php

@@ -63,9 +63,7 @@ class PaymentDataBuilder implements BuilderInterface
         $paymentMethod = $payment->getMethod();
 
         $request['body'] = $this->adyenRequestsHelper->buildPaymentData([], $amount, $currencyCode, $reference, $paymentMethod);
-
-        $request['headers'] = $this->adyenRequestsHelper->addIdempotencyKey([], $paymentMethod, $reference);
-
+        
         return $request;
     }
 }

Helper/Requests.php

@@ -492,21 +492,4 @@ class Requests extends AbstractHelper
 
         return $address;
     }
-
-    /**
-     * Only adds idempotency key if payment method is adyen_hpp for now
-     *
-     * @param array $request
-     * @param $paymentMethod
-     * @param $idempotencyKey
-     * @return array
-     */
-    public function addIdempotencyKey($request = [], $paymentMethod, $idempotencyKey)
-    {
-        if (!empty($paymentMethod) && $paymentMethod == 'adyen_hpp') {
-            $request['idempotencyKey'] = $idempotencyKey;
-        }
-
-        return $request;
-    }
 }