Merge pull request #64 from Adyen/release-1.4.5

Fixes #63 reactivate quote and show error message when 3D secure failed

Controller/Process/Validate3d.php

@@ -94,10 +94,13 @@ class Validate3d extends \Magento\Framework\App\Action\Action
 
                     try {
                         $result = $order->getPayment()->getMethodInstance()->authorise3d($order->getPayment());
-                    } catch (Exception $e) {
+                    } catch (\Exception $e) {
+                        $this->_adyenLogger->addAdyenResult("Process 3D secure payment was refused");
                         $result = 'Refused';
                     }
 
+                    $this->_adyenLogger->addAdyenResult("Process 3D secure payment result is: " . $result);
+
                     // check if authorise3d was successful
                     if ($result == 'Authorised') {
                         $order->addStatusHistoryComment(__('3D-secure validation was successful'))->save();
@@ -105,6 +108,15 @@ class Validate3d extends \Magento\Framework\App\Action\Action
                     } else {
                         $order->addStatusHistoryComment(__('3D-secure validation was unsuccessful.'))->save();
                         $this->_adyenHelper->cancelOrder($order);
+                        $this->messageManager->addErrorMessage("3D-secure validation was unsuccessful");
+                        
+                        // reactivate the quote
+                        $session = $this->_getCheckout();
+
+                        // restore the quote
+                        $session->restoreQuote();
+
+                        $this->_redirect('checkout/cart');
                     }
                 }
             } else {

Model/Api/PaymentRequest.php

@@ -322,7 +322,7 @@ class PaymentRequest extends DataObject
         try {
             $service = new \Adyen\Service\Payment($this->_client);
             $result = $service->authorise3D($request);
-        } catch(Exception $e) {
+        } catch(\Adyen\AdyenException $e) {
             throw new \Magento\Framework\Exception\LocalizedException(__('3D secure failed'));
         }
 

Model/Method/Cc.php

@@ -371,7 +371,11 @@ class Cc extends \Magento\Payment\Model\Method\Cc
      */
     public function authorise3d($payment)
     {
-        $response = $this->_paymentRequest->authorise3d($payment);
+        try {
+            $response = $this->_paymentRequest->authorise3d($payment);
+        } catch(\Exception $e) {
+            throw $e;
+        }
         $responseCode = $response['resultCode'];
         return $responseCode;
     }