ENGCOM-8087: Add missing order_data array to EmailSender classes #27454

Author: gabrieldagama

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

@@ -111,6 +111,12 @@ public function send(
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
                 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 

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

@@ -111,6 +111,12 @@ public function send(
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
                 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 

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

@@ -112,7 +112,13 @@ public function send(
                 'payment_html' => $this->getPaymentHtml($order),
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
-                'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
+                'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 

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

@@ -273,6 +273,11 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
             ->method('setSendEmail')
             ->with($emailSendingResult);
 
+        $this->orderMock->method('getCustomerName')->willReturn('Customer name');
+        $this->orderMock->method('getIsNotVirtual')->willReturn(true);
+        $this->orderMock->method('getEmailCustomerNote')->willReturn(null);
+        $this->orderMock->method('getFrontendStatusLabel')->willReturn('Pending');
+
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
@@ -283,6 +288,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => 'Customer name',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => null,
+                    'frontend_status_label' => 'Pending',
+                ],
             ];
             $transport = new DataObject($transport);
 

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

@@ -272,6 +272,11 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
             ->method('setSendEmail')
             ->with($emailSendingResult);
 
+        $this->orderMock->method('getCustomerName')->willReturn('Customer name');
+        $this->orderMock->method('getIsNotVirtual')->willReturn(true);
+        $this->orderMock->method('getEmailCustomerNote')->willReturn(null);
+        $this->orderMock->method('getFrontendStatusLabel')->willReturn('Pending');
+
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
@@ -282,6 +287,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => 'Customer name',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => null,
+                    'frontend_status_label' => 'Pending',
+                ],
             ];
             $transport = new DataObject($transport);
 

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

@@ -284,6 +284,11 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
             ->method('setSendEmail')
             ->with($emailSendingResult);
 
+        $this->orderMock->method('getCustomerName')->willReturn('Customer name');
+        $this->orderMock->method('getIsNotVirtual')->willReturn(true);
+        $this->orderMock->method('getEmailCustomerNote')->willReturn(null);
+        $this->orderMock->method('getFrontendStatusLabel')->willReturn('Pending');
+
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
@@ -296,6 +301,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => 'Customer name',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => null,
+                    'frontend_status_label' => 'Pending',
+                ],
             ];
             $transport = new DataObject($transport);