From dcbfe8f792639041df302c346d0969c2c9ed7335 Mon Sep 17 00:00:00 2001
From: Eduard Melnyk <edmelnyk@ukr.net>
Date: Wed, 9 Sep 2020 19:43:03 +0300
Subject: [PATCH] Publication 2.3.7 (#70)

* Removed exceptions showed to enduser
---
 Controller/Payment/Fallback.php          |  4 ++++
 Model/Exception/AcquireLockException.php | 27 ++++++++++++++++++++++++
 Model/TransactionProcessor.php           |  5 ++++-
 composer.json                            |  2 +-
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 Model/Exception/AcquireLockException.php

diff --git a/Controller/Payment/Fallback.php b/Controller/Payment/Fallback.php
index 5e30b1cc..2d4a41a6 100755
--- a/Controller/Payment/Fallback.php
+++ b/Controller/Payment/Fallback.php
@@ -38,6 +38,7 @@
 use Vipps\Payment\Api\QuoteRepositoryInterface;
 use Vipps\Payment\Gateway\Command\PaymentDetailsProvider;
 use Vipps\Payment\Gateway\Transaction\Transaction;
+use Vipps\Payment\Model\Exception\AcquireLockException;
 use Vipps\Payment\Model\Gdpr\Compliance;
 use Vipps\Payment\Model\TransactionProcessor;
 use Vipps\Payment\Gateway\Exception\VippsException;
@@ -153,6 +154,9 @@ public function execute()
             $this->logger->critical($this->enlargeMessage($e));
             $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('checkout/onepage/failure', ['_secure' => true]);
+        } catch (AcquireLockException $e) {
+            $this->logger->critical($e->getMessage());
+            $resultRedirect->setPath('checkout/onepage/failure', ['_secure' => true]);
         } catch (\Exception $e) {
             $this->logger->critical($this->enlargeMessage($e));
             $this->messageManager->addErrorMessage(
diff --git a/Model/Exception/AcquireLockException.php b/Model/Exception/AcquireLockException.php
new file mode 100644
index 00000000..7420fbd9
--- /dev/null
+++ b/Model/Exception/AcquireLockException.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2018 Vipps
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+namespace Vipps\Payment\Model\Exception;
+
+/**
+ * Aims to mark acquire lock exception in a code to have custom processing
+ *
+ * Class AcquireLockException
+ * @package Vipps\Payment\Model\Exception
+ */
+class AcquireLockException extends \Exception
+{
+}
diff --git a/Model/TransactionProcessor.php b/Model/TransactionProcessor.php
index 4c1c051a..0ec54e09 100644
--- a/Model/TransactionProcessor.php
+++ b/Model/TransactionProcessor.php
@@ -41,6 +41,7 @@
 use Vipps\Payment\Gateway\Transaction\Transaction;
 use Vipps\Payment\Gateway\Exception\WrongAmountException;
 use Vipps\Payment\Model\Adminhtml\Source\PaymentAction;
+use Vipps\Payment\Model\Exception\AcquireLockException;
 use Vipps\Payment\Model\Method\Vipps;
 
 /**
@@ -160,6 +161,7 @@ public function __construct(
      * @throws NoSuchEntityException
      * @throws VippsException
      * @throws WrongAmountException
+     * @throws AcquireLockException
      * @throws \Exception
      */
     public function process(QuoteInterface $vippsQuote, Transaction $transaction)
@@ -269,6 +271,7 @@ private function processAction($action, OrderInterface $order, Transaction $tran
      * @return string
      * @throws AlreadyExistsException
      * @throws InputException
+     * @throws AcquireLockException
      * @throws \Exception
      */
     private function acquireLock($reservedOrderId)
@@ -277,7 +280,7 @@ private function acquireLock($reservedOrderId)
         if ($reservedOrderId && $this->lockManager->lock($lockName, 10)) {
             return $lockName;
         }
-        throw new \Exception(__('Can not acquire lock for order "%1"', $reservedOrderId)); //@codingStandardsIgnoreLine
+        throw new AcquireLockException(__('Can not acquire lock for order "%1"', $reservedOrderId)); //@codingStandardsIgnoreLine
     }
 
     /**
diff --git a/composer.json b/composer.json
index 07a77270..c596310b 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "type": "magento2-module",
     "description": "Vipps Payment Method",
     "license": "proprietary",
-    "version": "2.3.6",
+    "version": "2.3.7",
     "require": {
         "magento/framework": "102.0.*",
         "magento/module-sales": "102.0.*",