Merge remote-tracking branch 'borg/MAGETWO-94269' into 2.3-regression-pr-HB

Author: cpartica

app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php

@@ -68,6 +68,7 @@ public function execute()
             if ($order->getIncrementId()) {
                 if ($this->checkOrderState($order)) {
                     $redirectBlock->setData('goto_success_page', true);
+                    $this->_eventManager->dispatch('paypal_checkout_success', ['order' => $order]);
                 } else {
                     if ($this->checkPaymentMethod($order)) {
                         $gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));

app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Test\Unit\Controller\Payflow;
 
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Checkout\Block\Onepage\Success;
 use Magento\Checkout\Model\Session;
@@ -96,6 +97,11 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase
      */
     private $paymentFailures;
 
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManagerMock;
+
     /**
      * @inheritdoc
      */
@@ -148,25 +154,31 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->context->expects($this->any())->method('getView')->willReturn($this->view);
-        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
-
         $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->context->method('getView')
             ->willReturn($this->view);
         $this->context->method('getRequest')
             ->willReturn($this->request);
-
-        $this->returnUrl = $this->objectManager->getObject(ReturnUrl::class, [
-            'context' => $this->context,
-            'checkoutSession' => $this->checkoutSession,
-            'orderFactory' => $this->orderFactory,
-            'checkoutHelper' => $this->checkoutHelper,
-            'paymentFailures' => $this->paymentFailures,
-        ]);
+        $this->context->method('getEventManager')
+            ->willReturn($this->eventManagerMock);
+
+        $this->returnUrl = $this->objectManager->getObject(
+            ReturnUrl::class,
+            [
+                'context' => $this->context,
+                'checkoutSession' => $this->checkoutSession,
+                'orderFactory' => $this->orderFactory,
+                'checkoutHelper' => $this->checkoutHelper,
+                'paymentFailures' => $this->paymentFailures,
+            ]
+        );
     }
 
     /**
@@ -187,6 +199,10 @@ public function testExecuteAllowedOrderState($state)
             ->with('goto_success_page', true)
             ->willReturnSelf();
 
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('paypal_checkout_success', $this->arrayHasKey('order'));
+
         $result = $this->returnUrl->execute();
         $this->assertNull($result);
     }

app/code/Magento/Signifyd/Observer/PlaceOrder.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
 use Magento\Signifyd\Api\CaseCreationServiceInterface;
 use Magento\Signifyd\Model\Config;
 use Psr\Log\LoggerInterface;
@@ -80,7 +81,9 @@ public function execute(Observer $observer)
     private function createCaseForOrder($order)
     {
         $orderId = $order->getEntityId();
-        if (null === $orderId || $order->getPayment()->getMethodInstance()->isOffline()) {
+        if (null === $orderId
+            || $order->getPayment()->getMethodInstance()->isOffline()
+            || $order->getState() === Order::STATE_PENDING_PAYMENT) {
             return;
         }
 

app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Signifyd\Api\CaseCreationServiceInterface;
 use Magento\Signifyd\Model\Config;
@@ -193,6 +194,23 @@ public function testExecute()
         $this->placeOrder->execute($this->observer);
     }
 
+    public function testExecuteWithOrderPendingPayment()
+    {
+        $orderId = 1;
+        $storeId = 2;
+
+        $this->withActiveSignifydIntegration(true, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+        $this->orderEntity->method('getState')
+            ->willReturn(Order::STATE_PENDING_PAYMENT);
+        $this->withAvailablePaymentMethod(true);
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
     /**
      * Specifies order entity mock execution.
      *

app/code/Magento/Signifyd/etc/events.xml

@@ -12,4 +12,7 @@
     <event name="paypal_express_place_order_success">
         <observer name="signifyd_place_order_paypal_express_observer" instance="Magento\Signifyd\Observer\PlaceOrder"/>
     </event>
+    <event name="paypal_checkout_success">
+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
+    </event>
 </config>