Merge remote-tracking branch 'origin/AC-15401' into spartans_pr_10112025

Author: glo60612

app/code/Magento/Sales/Model/Service/InvoiceService.php

@@ -17,7 +17,7 @@
 use Magento\Sales\Model\Order\Invoice;
 
 /**
- * Class InvoiceService
+ * Service for creating and managing invoices
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -153,6 +153,7 @@ public function prepareInvoice(
         $totalQty = 0;
         $invoice = $this->orderConverter->toInvoice($order);
         $preparedItemsQty = $this->prepareItemsQty($order, $orderItemsQtyToInvoice);
+        $originalEntityType = $order->getEntityType() ?? null;
 
         foreach ($order->getAllItems() as $orderItem) {
             if (!$this->canInvoiceItem($orderItem, $preparedItemsQty)) {
@@ -177,6 +178,9 @@ public function prepareInvoice(
 
         $invoice->setTotalQty($totalQty);
         $invoice->collectTotals();
+        if ($originalEntityType) {
+            $order->setHistoryEntityName($originalEntityType);
+        }
         $order->getInvoiceCollection()->addItem($invoice);
 
         return $invoice;
@@ -275,6 +279,7 @@ private function canInvoiceItem(OrderItemInterface $item, array $qtys): bool
         } else {
             return $item->getQtyToInvoice() > 0;
         }
+        return false;
     }
 
     /**

app/code/Magento/Sales/Test/Unit/Model/Service/InvoiceServiceTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2015 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -21,6 +21,10 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class InvoiceServiceTest extends TestCase
 {
     /**
@@ -212,4 +216,59 @@ public function testSetVoid()
 
         $this->assertTrue($this->invoiceService->setVoid($id));
     }
+
+    public function testPrepareInvoiceSetsHistoryEntityNameWhenOriginalEntityTypePresent(): void
+    {
+        $orderRepository   = $this->createMock(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $orderConverter    = $this->getMockBuilder(\Magento\Sales\Model\Convert\Order::class)
+            ->disableOriginalConstructor()->getMock();
+        $serializer   = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+
+        $service = new InvoiceService(
+            $this->repositoryMock,
+            $this->commentRepositoryMock,
+            $this->searchCriteriaBuilderMock,
+            $this->filterBuilderMock,
+            $this->invoiceNotifierMock,
+            $orderRepository,
+            $orderConverter,
+            $serializer
+        );
+
+        $order = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getAllItems', 'getEntityType', 'setHistoryEntityName', 'getInvoiceCollection'])
+            ->getMock();
+
+        $invoice = $this->getMockBuilder(\Magento\Sales\Model\Order\Invoice::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['setTotalQty', 'collectTotals'])
+            ->getMock();
+
+        $invoiceCollection = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['addItem'])
+            ->getMock();
+
+        $order->method('getAllItems')->willReturn([]);
+        $order->method('getEntityType')->willReturn('order');
+        $order->method('getInvoiceCollection')->willReturn($invoiceCollection);
+
+        $order->expects($this->once())
+            ->method('setHistoryEntityName')
+            ->with('order');
+
+        $orderConverter->expects($this->once())
+            ->method('toInvoice')
+            ->with($order)
+            ->willReturn($invoice);
+
+        $invoice->expects($this->once())->method('setTotalQty')->with(0);
+        $invoice->expects($this->once())->method('collectTotals');
+
+        $invoiceCollection->expects($this->once())->method('addItem')->with($invoice);
+
+        $result = $service->prepareInvoice($order, []);
+        $this->assertInstanceOf(\Magento\Sales\Api\Data\InvoiceInterface::class, $result);
+    }
 }