Merge remote-tracking branch 'origin/MC-16590' into 2.2-develop-pr105

Author: svitja

app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php

@@ -22,12 +22,19 @@ class CloseTransactionHandler implements HandlerInterface
      */
     private $subjectReader;
 
+    /**
+     * @var bool
+     */
+    private $closeTransaction;
+
     /**
      * @param SubjectReader $subjectReader
+     * @param bool $closeTransaction
      */
-    public function __construct(SubjectReader $subjectReader)
+    public function __construct(SubjectReader $subjectReader, bool $closeTransaction = true)
     {
         $this->subjectReader = $subjectReader;
+        $this->closeTransaction = $closeTransaction;
     }
 
     /**
@@ -39,7 +46,7 @@ public function handle(array $handlingSubject, array $response)
         $payment = $paymentDO->getPayment();
 
         if ($payment instanceof Payment) {
-            $payment->setIsTransactionClosed(true);
+            $payment->setIsTransactionClosed($this->closeTransaction);
             $payment->setShouldCloseParentTransaction(true);
         }
     }

app/code/Magento/AuthorizenetAcceptjs/etc/di.xml

@@ -188,10 +188,15 @@
             </argument>
         </arguments>
     </virtualType>
+    <virtualType name="CloseCaptureTransactionHandler" type="Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler">
+        <arguments>
+            <argument name="closeTransaction" xsi:type="boolean">false</argument>
+        </arguments>
+    </virtualType>
     <virtualType name="AuthorizenetAcceptjsCaptureTransactionHandler" type="Magento\Payment\Gateway\Response\HandlerChain">
         <arguments>
             <argument name="handlers" xsi:type="array">
-                <item name="close_parent_transaction" xsi:type="string">Magento\AuthorizenetAcceptjs\Gateway\Response\CloseParentTransactionHandler</item>
+                <item name="close_transaction" xsi:type="string">CloseCaptureTransactionHandler</item>
             </argument>
         </arguments>
     </virtualType>

dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandlerTest.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AuthorizenetAcceptjs\Gateway\Response;
+
+use Magento\AuthorizenetAcceptjs\Gateway\AbstractTest;
+
+/**
+ * Test for Magento\AuthorizenetAcceptjs\Gateway\Response\CloseTransactionHandler class.
+ */
+class CloseTransactionHandlerTest extends AbstractTest
+{
+    /**
+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/environment sandbox
+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/login someusername
+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_key somepassword
+     * @magentoConfigFixture default_store payment/authorizenet_acceptjs/trans_signature_key abc
+     * @magentoDataFixture Magento/AuthorizenetAcceptjs/Fixture/order_auth_only.php
+     *
+     * @return void
+     */
+    public function testTransactionCloseStatus()
+    {
+        $commandPool = $this->objectManager->get('AuthorizenetAcceptjsCommandPool');
+        $command = $commandPool->get('settle');
+        $order = $this->getOrderWithIncrementId('100000002');
+        $payment = $order->getPayment();
+        $paymentDO = $this->paymentFactory->create($payment);
+
+        $expectedRequest = include __DIR__ . '/../../_files/expected_request/settle.php';
+        $response = include __DIR__ . '/../../_files/response/settle.php';
+
+        $this->clientMock->method('setRawData')
+            ->with(json_encode($expectedRequest), 'application/json');
+        $this->responseMock->method('getBody')
+            ->willReturn(json_encode($response));
+
+        $command->execute(['payment' => $paymentDO]);
+
+        $this->assertFalse($payment->getIsTransactionClosed());
+    }
+}