Merge branch 'MAGETWO-37717' into develop

Conflicts:
	app/code/Magento/Sales/Model/Order/Payment.php

Author: Viktor Tymchynskyi

app/code/Magento/Sales/Model/Order/Payment.php

@@ -944,28 +944,31 @@ public function accept()
     /**
      * Accept order with payment method instance
      *
+     * @param bool $isOnline
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function deny()
+    public function deny($isOnline = true)
     {
-        $transactionId = $this->getLastTransId();
+        $transactionId = $isOnline ? $this->getLastTransId() : $this->getTransactionId();
 
-        /** @var \Magento\Payment\Model\Method\AbstractMethod $method */
-        $method = $this->getMethodInstance();
-        $method->setStore(
-            $this->getOrder()->getStoreId()
-        );
-        if ($method->denyPayment($this)) {
+        $result = $isOnline ?
+            $this->getMethodInstance()->setStore($this->getOrder()->getStoreId())->denyPayment($this) :
+            (bool)$this->getNotificationResult();
+
+        if ($result) {
             $invoice = $this->_getInvoiceForTransactionId($transactionId);
             $message = $this->_appendTransactionToMessage(
                 $transactionId,
                 $this->_prependMessage(__('Denied the payment online'))
             );
             $this->cancelInvoiceAndRegisterCancellation($invoice, $message);
         } else {
+            $txt = $isOnline ?
+                'There is no need to deny this payment.' : 'Registered notification about denied payment.';
             $message = $this->_appendTransactionToMessage(
                 $transactionId,
-                $this->_prependMessage(__('There is no need to deny this payment.'))
+                $this->_prependMessage(__($txt))
             );
             $this->setOrderStatePaymentReview($message, $transactionId);
         }
@@ -975,17 +978,21 @@ public function deny()
     /**
      * Performs registered payment update.
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param bool $isOnline
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function update()
+    public function update($isOnline = true)
     {
-        $transactionId = $this->getLastTransId();
+        $transactionId = $isOnline ? $this->getLastTransId() : $this->getTransactionId();
         $invoice = $this->_getInvoiceForTransactionId($transactionId);
 
-        $method = $this->getMethodInstance();
-        $method->setStore($this->getOrder()->getStoreId());
-        $method->fetchTransactionInfo($this, $transactionId);
+        
+        if ($isOnline) {
+            $method = $this->getMethodInstance();
+            $method->setStore($this->getOrder()->getStoreId());
+            $method->fetchTransactionInfo($this, $transactionId);
+        }
 
         if ($this->getIsTransactionApproved()) {
             $message = $this->_appendTransactionToMessage(
@@ -1459,8 +1466,8 @@ protected function _prependMessage($messagePrependTo)
             if (is_string($preparedMessage)) {
                 return $preparedMessage . ' ' . $messagePrependTo;
             } elseif (is_object(
-                $preparedMessage
-            ) && $preparedMessage instanceof \Magento\Sales\Model\Order\Status\History
+                    $preparedMessage
+                ) && $preparedMessage instanceof \Magento\Sales\Model\Order\Status\History
             ) {
                 $comment = $preparedMessage->getComment() . ' ' . $messagePrependTo;
                 $preparedMessage->setComment($comment);
@@ -1684,8 +1691,8 @@ protected function _getInvoiceForTransactionId($transactionId)
         }
         foreach ($this->getOrder()->getInvoiceCollection() as $invoice) {
             if ($invoice->getState() == \Magento\Sales\Model\Order\Invoice::STATE_OPEN && $invoice->load(
-                $invoice->getId()
-            )
+                    $invoice->getId()
+                )
             ) {
                 $invoice->setTransactionId($transactionId);
                 return $invoice;

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php

@@ -77,7 +77,7 @@ protected function setUp()
 
         $this->paymentMock = $this->getMock(
             'Magento\Sales\Model\Order\Payment',
-            ['registerPaymentReviewAction', 'update'],
+            ['update'],
             [],
             '',
             false

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php

@@ -182,21 +182,21 @@ function ($value) {
 
         $this->transactionFactory = $this->getMock(
             'Magento\Sales\Model\Order\Payment\TransactionFactory',
-            ['create'],
+            [],
             [],
             '',
             false
         );
         $this->transactionCollectionFactory = $this->getMock(
             'Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory',
-            ['create'],
+            [],
             [],
             '',
             false
         );
         $this->serviceOrderFactory = $this->getMock(
             'Magento\Sales\Model\Service\OrderFactory',
-            ['create'],
+            [],
             [],
             '',
             false
@@ -585,6 +585,26 @@ public function testDenyPaymentFalse()
         $this->payment->deny();
     }
 
+    /**
+     * Test offline IPN calls
+     */
+    public function testDenyPaymentIpn()
+    {
+        $isOnline = false;
+        $message = sprintf('Denied the payment online Transaction ID: "%s"', $this->transactionId);
+
+        $this->payment->setTransactionId($this->transactionId);
+        $this->payment->setNotificationResult(true);
+
+        $this->mockInvoice($this->transactionId);
+        $this->mockResultFalseMethods($message);
+
+        $this->helperMock->expects($this->never())
+            ->method('getMethodInstance');
+
+        $this->payment->deny($isOnline);
+    }
+
     /**
      * @dataProvider acceptPaymentFalseProvider
      * @param bool $isFraudDetected
@@ -657,6 +677,44 @@ public function testDenyPaymentNegativeStateReview()
         $this->payment->deny();
     }
 
+    /**
+     * Test offline IPN call, negative
+     */
+    public function testDenyPaymentIpnNegativeStateReview()
+    {
+        $isOnline = false;
+        $message = sprintf('Registered notification about denied payment. Transaction ID: "%s"', $this->transactionId);
+
+        $orderState = Order::STATE_PAYMENT_REVIEW;
+
+        $this->payment->setTransactionId($this->transactionId);
+        $this->payment->setNotificationResult(false);
+
+        $this->orderMock->expects($this->once())
+            ->method('getState')
+            ->willReturn($orderState);
+
+        $this->orderMock->expects($this->never())
+            ->method('setState');
+        $this->orderMock->expects($this->once())
+            ->method('addStatusHistoryComment')
+            ->with($message);
+
+        $this->helperMock->expects($this->never())
+            ->method('getMethodInstance')
+            ->will($this->returnValue($this->paymentMethodMock));
+
+        $this->paymentMethodMock->expects($this->never())
+            ->method('setStore')
+            ->will($this->returnSelf());
+
+        $this->paymentMethodMock->expects($this->never())
+            ->method('denyPayment')
+            ->with($this->payment);
+
+        $this->payment->deny($isOnline);
+    }
+
     /**
      * @param int $transactionId
      * @param int $countCall
@@ -709,6 +767,41 @@ public function testUpdateOnlineTransactionApproved()
         $this->assertEquals($baseGrandTotal, $this->payment->getBaseAmountPaidOnline());
     }
 
+    /**
+     * Test update calls from IPN controller
+     */
+    public function testUpdateOnlineTransactionApprovedIpn()
+    {
+        $isOnline = false;
+        $message = sprintf('Registered update about approved payment. Transaction ID: "%s"', $this->transactionId);
+
+        $storeId = 50;
+        $baseGrandTotal = 299.99;
+
+        $this->payment->setTransactionId($this->transactionId);
+        $this->payment->setData('is_transaction_approved', true);
+
+        $this->mockInvoice($this->transactionId);
+        $this->mockResultTrueMethods($this->transactionId, $baseGrandTotal, $message);
+
+        $this->orderMock->expects($this->never())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $this->helperMock->expects($this->never())
+            ->method('getMethodInstance')
+            ->will($this->returnValue($this->paymentMethodMock));
+        $this->paymentMethodMock->expects($this->never())
+            ->method('setStore')
+            ->with($storeId)
+            ->willReturn($this->paymentMethodMock);
+        $this->paymentMethodMock->expects($this->never())
+            ->method('fetchTransactionInfo')
+            ->with($this->payment, $this->transactionId);
+
+        $this->payment->update($isOnline);
+        $this->assertEquals($baseGrandTotal, $this->payment->getBaseAmountPaidOnline());
+    }
+
     public function testUpdateOnlineTransactionDenied()
     {
         $message = sprintf('Registered update about denied payment. Transaction ID: "%s"', $this->transactionId);

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -1679,6 +1679,7 @@
     ['getVisibleOnFrontStates', 'Magento\Sales\Model\Order\Config', 'getVisibleOnFrontStatuses'],
     ['getInvisibleOnFrontStates', 'Magento\Sales\Model\Order\Config', 'getInvisibleOnFrontStatuses'],
     ['_authorize', 'Magento\Sales\Model\Order\Payment'],
+    ['registerPaymentReviewAction', 'Magento\Sales\Model\Order\Payment'],
     ['_shouldBeConverted', 'Magento\Sales\Model\Resource\AbstractResource'],
     ['_beforeSave', 'Magento\Sales\Model\Resource\AbstractResource'],
     ['_afterSave', 'Magento\Sales\Model\Resource\AbstractResource'],