Merge branch 'ACP2E-3460' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-12-05-2024

Author: chittima

app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Sales\Model\Order\Creditmemo\Sender;
 
@@ -104,7 +104,9 @@ public function send(
 
             $transport = [
                 'order' => $order,
+                'order_id' => $order->getId(),
                 'creditmemo' => $creditmemo,
+                'creditmemo_id' => $creditmemo->getId(),
                 'comment' => $comment ? $comment->getComment() : '',
                 'billing' => $order->getBillingAddress(),
                 'payment_html' => $this->getPaymentHtml($order),

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -120,6 +120,10 @@ class EmailSenderTest extends TestCase
      */
     private $senderBuilderFactoryMock;
 
+    private const CREDITMEMO_ID = 1;
+
+    private const ORDER_ID = 1;
+
     /**
      * @inheritDoc
      *
@@ -154,9 +158,11 @@ protected function setUp(): void
 
         $this->creditmemoMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Creditmemo::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['setEmailSent'])
+            ->onlyMethods(['setEmailSent', 'getId'])
             ->addMethods(['setSendEmail'])
             ->getMock();
+        $this->creditmemoMock->method('getId')
+            ->willReturn(self::CREDITMEMO_ID);
 
         $this->commentMock = $this->getMockBuilder(CreditmemoCommentCreationInterface::class)
             ->disableOriginalConstructor()
@@ -192,6 +198,8 @@ protected function setUp(): void
         $this->orderMock->expects($this->any())
             ->method('getPayment')
             ->willReturn($this->paymentInfoMock);
+        $this->orderMock->method('getId')
+            ->willReturn(self::ORDER_ID);
 
         $this->paymentHelperMock = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
@@ -285,7 +293,9 @@ public function testSend(
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
+                'order_id' => self::ORDER_ID,
                 'creditmemo' => $this->creditmemoMock,
+                'creditmemo_id' => self::CREDITMEMO_ID,
                 'comment' => $isComment ? 'Comment text' : '',
                 'billing' => $this->addressMock,
                 'payment_html' => 'Payment Info Block',

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoEmailTest.php

@@ -1,39 +1,40 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Sales\Service\V1;
 
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
- * Class CreditmemoEmailTest
+ * Test API call /creditmemo/{id}/emails
  */
 class CreditmemoEmailTest extends WebapiAbstract
 {
-    const SERVICE_VERSION = 'V1';
+    private const SERVICE_VERSION = 'V1';
 
-    const SERVICE_NAME = 'salesCreditmemoManagementV1';
-
-    const CREDITMEMO_INCREMENT_ID = '100000001';
+    private const SERVICE_NAME = 'salesCreditmemoManagementV1';
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/creditmemo_with_list.php
      */
     public function testCreditmemoEmail()
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
-        /** @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection $creditmemoCollection */
+        /** @var Collection $creditmemoCollection */
         $creditmemoCollection = $objectManager->get(
-            \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection::class
+            Collection::class
         );
         $creditmemo = $creditmemoCollection->getFirstItem();
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/creditmemo/' . $creditmemo->getId() . '/emails',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -42,6 +43,7 @@ public function testCreditmemoEmail()
             ],
         ];
         $requestData = ['id' => $creditmemo->getId()];
-        $this->_webApiCall($serviceInfo, $requestData);
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertTrue($result);
     }
 }