MC-42764: Shipment Notify Customer by Email not working

Author: Anna Bukatar

app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php

@@ -75,6 +75,7 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
             'order_data' => [
                 'customer_name' => $order->getCustomerName(),
+                'is_not_virtual' => $order->getIsNotVirtual(),
                 'frontend_status_label' => $order->getFrontendStatusLabel()
             ]
         ];

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php

@@ -62,8 +62,9 @@ public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
-        $customerName='Test Customer';
-        $frontendStatusLabel='Processing';
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Processing';
+        $isNotVirtual = true;
 
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
@@ -76,6 +77,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->orderMock->expects($this->any())
             ->method('getCustomerName')
             ->willReturn($customerName);
+        $this->orderMock->expects($this->any())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
         $this->orderMock->expects($this->once())
             ->method('getFrontendStatusLabel')
             ->willReturn($frontendStatusLabel);
@@ -92,7 +96,8 @@ public function testSendTrueWithoutCustomerCopy()
                     'formattedBillingAddress' => 1,
                     'order_data' => [
                         'customer_name' => $customerName,
-                        'frontend_status_label' => $frontendStatusLabel
+                        'frontend_status_label' => $frontendStatusLabel,
+                        'is_not_virtual' => $isNotVirtual,
                     ]
                 ]
             );
@@ -105,8 +110,9 @@ public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
-        $customerName='Test Customer';
-        $frontendStatusLabel='Processing';
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Processing';
+        $isNotVirtual = true;
 
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
@@ -122,6 +128,9 @@ public function testSendTrueWithCustomerCopy()
         $this->orderMock->expects($this->any())
             ->method('getCustomerName')
             ->willReturn($customerName);
+        $this->orderMock->expects($this->any())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
         $this->orderMock->expects($this->once())
             ->method('getFrontendStatusLabel')
             ->willReturn($frontendStatusLabel);
@@ -138,7 +147,8 @@ public function testSendTrueWithCustomerCopy()
                     'formattedBillingAddress' => 1,
                     'order_data' => [
                         'customer_name' => $customerName,
-                        'frontend_status_label' => $frontendStatusLabel
+                        'frontend_status_label' => $frontendStatusLabel,
+                        'is_not_virtual' => $isNotVirtual,
                     ]
                 ]
             );
@@ -152,15 +162,19 @@ public function testSendVirtualOrder()
         $isVirtualOrder = true;
         $this->orderMock->setData(OrderInterface::IS_VIRTUAL, $isVirtualOrder);
         $this->stepAddressFormat($this->addressMock, $isVirtualOrder);
-        $customerName='Test Customer';
-        $frontendStatusLabel='Complete';
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Complete';
+        $isNotVirtual = false;
 
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(false);
         $this->orderMock->expects($this->any())
             ->method('getCustomerName')
             ->willReturn($customerName);
+        $this->orderMock->expects($this->any())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
         $this->orderMock->expects($this->once())
             ->method('getFrontendStatusLabel')
             ->willReturn($frontendStatusLabel);
@@ -177,7 +191,8 @@ public function testSendVirtualOrder()
                     'formattedBillingAddress' => 1,
                     'order_data' => [
                         'customer_name' => $customerName,
-                        'frontend_status_label' => $frontendStatusLabel
+                        'frontend_status_label' => $frontendStatusLabel,
+                        'is_not_virtual' => $isNotVirtual
                     ]
 
                 ]