Merge remote-tracking branch 'origin/MC-35740' into 2.4-develop-pr44

Author: serhii-balko

app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Plugin\Model\Service\Invoice;
+
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\Service\InvoiceService;
+
+/**
+ * Plugin to add transaction comment after capture invoice
+ */
+class AddTransactionCommentAfterCapture
+{
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var TransactionFactory
+     */
+    private $transactionFactory;
+
+    /**
+     * @param InvoiceRepositoryInterface $invoiceRepository
+     * @param TransactionFactory $transactionFactory
+     */
+    public function __construct(
+        InvoiceRepositoryInterface $invoiceRepository,
+        TransactionFactory $transactionFactory
+    ) {
+        $this->transactionFactory = $transactionFactory;
+        $this->invoiceRepository = $invoiceRepository;
+    }
+
+    /**
+     * Add transaction comment to the order after capture invoice
+     *
+     * @param InvoiceService $subject
+     * @param bool $result
+     * @param int $invoiceId
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSetCapture(InvoiceService $subject, bool $result, $invoiceId): bool
+    {
+        if ($result) {
+            $invoice = $this->invoiceRepository->get($invoiceId);
+            $invoice->getOrder()->setIsInProcess(true);
+            $this->transactionFactory->create()
+                ->addObject($invoice)
+                ->addObject($invoice->getOrder())
+                ->save();
+        }
+
+        return $result;
+    }
+}

app/code/Magento/Sales/Test/Unit/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCaptureTest.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Plugin\Model\Service\Invoice;
+
+use Magento\Framework\DB\Transaction;
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\Service\InvoiceService;
+use Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test to add transaction comment to the order after capture invoice
+ */
+class AddTransactionCommentAfterCaptureTest extends TestCase
+{
+    /**
+     * @var InvoiceRepositoryInterface|MockObject
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var TransactionFactory|MockObject
+     */
+    private $transactionFactory;
+
+    /**
+     * @var AddTransactionCommentAfterCapture
+     */
+    private $plugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->invoiceRepository = $this->createMock(InvoiceRepositoryInterface::class);
+        $this->transactionFactory = $this->createMock(TransactionFactory::class);
+
+        $this->plugin = new AddTransactionCommentAfterCapture(
+            $this->invoiceRepository,
+            $this->transactionFactory
+        );
+    }
+
+    /**
+     * Test to add transaction comment after capture invoice
+     */
+    public function testPlugin(): void
+    {
+        $result = true;
+        $invoiceId = 3;
+
+        $orderMock = $this->createMock(Order::class);
+        $invoiceMock = $this->createMock(Invoice::class);
+        $invoiceMock->method('getOrder')->willReturn($orderMock);
+        $this->invoiceRepository->method('get')->with($invoiceId)->willReturn($invoiceMock);
+
+        $transactionMock = $this->createMock(Transaction::class);
+        $transactionMock->expects($this->at(0))->method('addObject')->with($invoiceMock)->willReturnSelf();
+        $transactionMock->expects($this->at(1))->method('addObject')->with($orderMock)->willReturnSelf();
+        $transactionMock->expects($this->once())->method('save');
+        $this->transactionFactory->method('create')->willReturn($transactionMock);
+
+        /** @var InvoiceService $invoiceService */
+        $invoiceService = $this->createMock(InvoiceService::class);
+
+        $this->assertEquals(
+            $result,
+            $this->plugin->afterSetCapture($invoiceService, $result, $invoiceId)
+        );
+    }
+}

app/code/Magento/Sales/etc/webapi_rest/di.xml

@@ -19,4 +19,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Service\InvoiceService">
+        <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
+    </type>
 </config>

app/code/Magento/Sales/etc/webapi_soap/di.xml

@@ -19,4 +19,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Service\InvoiceService">
+        <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
+    </type>
 </config>