Check if copy method is copy before sending comment email

Author: Jeroen

app/code/Magento/Sales/Model/Order/Email/NotifySender.php

@@ -35,7 +35,7 @@ protected function checkAndSend(Order $order, $notify = true)
 
         if ($notify) {
             $sender->send();
-        } else {
+        } elseif ($this->identityContainer->getCopyMethod() === 'copy') {
             // Email copies are sent as separated emails if their copy method
             // is 'copy' or a customer should not be notified
             $sender->sendCopyTo();

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

@@ -192,7 +192,7 @@ public function stepIdentityContainerInit($identityMockClassName)
     {
         $this->identityContainerMock = $this->getMockBuilder($identityMockClassName)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'])
+            ->onlyMethods(['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod'])
             ->getMock();
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')

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

@@ -97,7 +97,7 @@ public function testSendVirtualOrder()
         $this->assertFalse($result);
     }
 
-    public function testSendTrueWithCustomerCopy()
+    public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -140,7 +140,7 @@ public function testSendTrueWithCustomerCopy()
         $this->assertTrue($result);
     }
 
-    public function testSendTrueWithoutCustomerCopy()
+    public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -161,6 +161,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(true);
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(

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

@@ -65,7 +65,7 @@ public function testSendFalse()
         $this->assertFalse($result);
     }
 
-    public function testSendTrueWithCustomerCopy()
+    public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $this->stepAddressFormat($billingAddress);
@@ -110,7 +110,7 @@ public function testSendTrueWithCustomerCopy()
         $this->assertTrue($result);
     }
 
-    public function testSendTrueWithoutCustomerCopy()
+    public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $customerName = 'Test Customer';
@@ -132,6 +132,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(true);
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(

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

@@ -58,7 +58,7 @@ public function testSendFalse()
         $this->assertFalse($result);
     }
 
-    public function testSendTrueWithCustomerCopy()
+    public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -101,7 +101,7 @@ public function testSendTrueWithCustomerCopy()
         $this->assertTrue($result);
     }
 
-    public function testSendTrueWithoutCustomerCopy()
+    public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -116,6 +116,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(true);
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
         $this->orderMock->expects($this->any())
             ->method('getCustomerName')
             ->willReturn($customerName);