Merge remote-tracking branch 'origin/ACP2E-4157' into PR_2025_09_15_muntianu

Author: katmoon

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
@@ -10,7 +10,13 @@
 use Magento\Sales\Helper\Data as SalesData;
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Sales\Model\Order\Creditmemo\Item;
+use Magento\Catalog\Model\Product\Type;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
@@ -155,6 +161,9 @@ private function adjustCreditMemoItemQuantities(Creditmemo $creditMemo): void
         $parentQuantities = [];
         foreach ($items as $item) {
             if ($parentId = $item->getOrderItem()->getParentItemId()) {
+                if ($this->shouldSkipQuantityAccumulation($item)) {
+                    continue;
+                }
                 if (empty($parentQuantities[$parentId])) {
                     $parentQuantities[$parentId] = $item->getQty();
                 } else {
@@ -171,4 +180,21 @@ private function adjustCreditMemoItemQuantities(Creditmemo $creditMemo): void
             }
         }
     }
+
+    /**
+     * Check if the quantity adjustment should be skipped
+     *
+     * @param Item $item
+     * @return bool
+     */
+    private function shouldSkipQuantityAccumulation(Item $item): bool
+    {
+        $parentOrderItem = $item->getOrderItem()->getParentItem();
+        if (!$parentOrderItem || $parentOrderItem->getProductType() !== Type::TYPE_BUNDLE) {
+            return false;
+        }
+        $parentOptions = $parentOrderItem->getProductOptions();
+        return isset($parentOptions['product_calculations']) &&
+            $parentOptions['product_calculations'] === AbstractType::CALCULATE_PARENT;
+    }
 }

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -29,6 +29,7 @@
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Creditmemo\Item;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
+use Magento\Catalog\Model\Product\Type\AbstractType;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -413,4 +414,57 @@ public function testExecuteEmails(
         }
         $this->assertEquals($this->resultRedirectMock, $this->_controller->execute());
     }
+
+    /**
+     * Test execute method with bundle products
+     */
+    public function testExecuteWithBundleProductCreditMemo()
+    {
+        $orderId = 1;
+        $creditmemoId = 2;
+        $invoiceId = 3;
+        $creditmemoData = ['items' => [], 'comment_text' => ''];
+        $this->_requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                ['order_id', null, $orderId],
+                ['creditmemo_id', null, $creditmemoId],
+                ['creditmemo', null, $creditmemoData],
+                ['invoice_id', null, $invoiceId]
+            ]);
+
+        $this->_requestMock->expects($this->once())
+            ->method('getPost')
+            ->with('creditmemo')
+            ->willReturn($creditmemoData);
+        $orderMock = $this->createMock(Order::class);
+        $parentOrderItemMock = $this->createMock(Order\Item::class);
+        $parentOrderItemMock->expects($this->any())->method('getProductType')->willReturn('bundle');
+        $parentOrderItemMock->expects($this->any())
+            ->method('getProductOptions')
+            ->willReturn([
+                'product_calculations' => AbstractType::CALCULATE_PARENT
+            ]);
+        $childOrderItemMock = $this->createMock(Order\Item::class);
+        $childOrderItemMock->expects($this->any())->method('getParentItemId')->willReturn(1);
+        $childOrderItemMock->expects($this->any())->method('getParentItem')->willReturn($parentOrderItemMock);
+        $creditMemoItemMock = $this->createMock(Item::class);
+        $creditMemoItemMock->expects($this->any())->method('getOrderItem')->willReturn($childOrderItemMock);
+        $creditMemoItemMock->expects($this->never())->method('setQty');
+        $creditmemoMock = $this->createMock(Creditmemo::class);
+        $creditmemoMock->expects($this->once())->method('isValidGrandTotal')->willReturn(true);
+        $creditmemoMock->expects($this->once())->method('getOrder')->willReturn($orderMock);
+        $creditmemoMock->expects($this->once())->method('getOrderId')->willReturn($orderId);
+        $creditmemoMock->expects($this->once())->method('getAllItems')->willReturn([$creditMemoItemMock]);
+        $this->memoLoaderMock->expects($this->once())->method('load')->willReturn($creditmemoMock);
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('sales/order/view', ['order_id' => $orderId])
+            ->willReturnSelf();
+        $result = $this->_controller->execute();
+        $this->assertEquals($this->resultRedirectMock, $result);
+    }
 }