Merge remote-tracking branch 'origin/MC-33117' into 2.4-develop-pr22

Author: serhii-balko

app/code/Magento/Paypal/Model/Payflow/Transparent.php

@@ -61,7 +61,7 @@ class Transparent extends Payflowpro implements TransparentInterface
      *
      * @var bool
      */
-    protected $_canFetchTransactionInfo = false;
+    protected $_canFetchTransactionInfo = true;
 
     /**
      * @var ResponseValidator
@@ -355,11 +355,11 @@ public function capture(InfoInterface $payment, $amount)
      *
      * @param InfoInterface $payment
      * @return bool
-     * @throws InvalidTransitionException
      * @throws LocalizedException
      */
     public function acceptPayment(InfoInterface $payment)
     {
+        $this->validatePaymentTransaction($payment);
         if ($this->getConfigPaymentAction() === MethodInterface::ACTION_AUTHORIZE_CAPTURE) {
             $invoices = iterator_to_array($payment->getOrder()->getInvoiceCollection());
             $invoice = count($invoices) ? reset($invoices) : null;
@@ -387,6 +387,20 @@ public function denyPayment(InfoInterface $payment)
         return true;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
+    {
+        $result = parent::fetchTransactionInfo($payment, $transactionId);
+        $this->_canFetchTransactionInfo = false;
+        if ($payment->getIsTransactionApproved()) {
+            $this->acceptPayment($payment);
+        }
+
+        return $result;
+    }
+
     /**
      * Marks payment as fraudulent.
      *
@@ -444,4 +458,24 @@ private function getZeroAmountAuthorizationId(InfoInterface $payment): string
     {
         return (string)$payment->getAdditionalInformation(self::PNREF);
     }
+
+    /**
+     * Validates payment transaction status on PayPal.
+     *
+     * @param InfoInterface $payment
+     * @throws LocalizedException
+     */
+    private function validatePaymentTransaction(InfoInterface $payment): void
+    {
+        if ($payment->canFetchTransactionInfo()) {
+            $transactionId = $payment->getLastTransId();
+            parent::fetchTransactionInfo($payment, $transactionId);
+            $this->_canFetchTransactionInfo = false;
+            if ($payment->getIsTransactionDenied()) {
+                throw new LocalizedException(
+                    __('Payment can\'t be accepted since transaction was rejected by merchant.')
+                );
+            }
+        }
+    }
 }

app/code/Magento/Paypal/i18n/en_US.csv

@@ -739,3 +739,4 @@ User,User
 "Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
 "Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"
 "Order is suspended as an account verification transaction is suspected to be fraudulent.","Order is suspended as an account verification transaction is suspected to be fraudulent."
+"Payment can't be accepted since transaction was rejected by merchant.","Payment can't be accepted since transaction was rejected by merchant."

app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php

@@ -8,7 +8,6 @@
 
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
 /**
@@ -63,17 +62,20 @@ public function execute()
                 }
                 $this->orderRepository->save($order);
                 $this->messageManager->addSuccessMessage($message);
-                $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getEntityId()]);
-            } else {
-                $resultRedirect->setPath('sales/*/');
-                return $resultRedirect;
             }
             // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->messageManager->addErrorMessage(__('We can\'t update the payment right now.'));
             $this->logger->critical($e);
+        }
+
+        if ($order) {
+            $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getEntityId()]);
+        } else {
             $resultRedirect->setPath('sales/*/');
         }
+
         return $resultRedirect;
     }
 }