From 45592e234b8ee700b02e82c28c9c7ee94ae13b51 Mon Sep 17 00:00:00 2001
From: Andrea Zambon <azambon@webgriffe.com>
Date: Mon, 2 Dec 2019 12:29:52 +0100
Subject: [PATCH] Sets the order to state processing also if the order is in
 state new or pending_payment

---
 .../RegisterCaptureNotificationCommand.php     | 18 +++++++++++++++---
 .../RegisterCaptureNotificationCommandTest.php | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
index d38e58d7341c1..d8afcc71cc6af 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
@@ -11,6 +11,11 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\StatusResolver;
 
+/**
+ * Class RegisterCaptureNotificationCommand
+ *
+ * @package Magento\Sales\Model\Order\Payment\State
+ */
 class RegisterCaptureNotificationCommand implements CommandInterface
 {
     /**
@@ -23,11 +28,12 @@ class RegisterCaptureNotificationCommand implements CommandInterface
      */
     public function __construct(StatusResolver $statusResolver = null)
     {
-        $this->statusResolver = $statusResolver
-            ? : ObjectManager::getInstance()->get(StatusResolver::class);
+        $this->statusResolver = $statusResolver ?: ObjectManager::getInstance()->get(StatusResolver::class);
     }
 
     /**
+     * Registers a capture event for this payment
+     *
      * @param OrderPaymentInterface $payment
      * @param string|float|int $amount
      * @param OrderInterface $order
@@ -35,7 +41,11 @@ public function __construct(StatusResolver $statusResolver = null)
      */
     public function execute(OrderPaymentInterface $payment, $amount, OrderInterface $order)
     {
-        $state = $order->getState() ?: Order::STATE_PROCESSING;
+        $state = $order->getState();
+        if (!$state || $state === Order::STATE_NEW || $state === Order::STATE_PENDING_PAYMENT) {
+            $state = Order::STATE_PROCESSING;
+        }
+
         $status = null;
         $message = 'Registered notification about captured amount of %1.';
 
@@ -61,6 +71,8 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
     }
 
     /**
+     * Sets the state and status of the order
+     *
      * @deprecated 100.2.0 Replaced by a StatusResolver class call.
      *
      * @param Order $order
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php
index 1b762fafe0b71..c5c333e55a551 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/State/RegisterCaptureNotificationCommandTest.php
@@ -80,6 +80,22 @@ public function commandResultDataProvider()
                 $this->newOrderStatus,
                 'Registered notification about captured amount of %1.',
             ],
+            [
+                false,
+                false,
+                Order::STATE_NEW,
+                Order::STATE_PROCESSING,
+                $this->newOrderStatus,
+                'Registered notification about captured amount of %1.',
+            ],
+            [
+                false,
+                false,
+                Order::STATE_PENDING_PAYMENT,
+                Order::STATE_PROCESSING,
+                $this->newOrderStatus,
+                'Registered notification about captured amount of %1.',
+            ],
             [
                 true,
                 false,