ACP2E-2734: Emails are failing to send

Author: thiaramus

app/code/Magento/Sales/Model/EmailSenderHandler.php

@@ -132,20 +132,11 @@ public function sendEmails()
 
                 /** @var \Magento\Sales\Model\AbstractModel $item */
                 foreach ($entityCollection->getItems() as $item) {
-                    if ($this->emailSender->send($item, true)) {
-                        $this->entityResource->saveAttribute(
-                            $item->setEmailSent(true),
-                            'email_sent'
-                        );
-                    } else {
-                        // When the email is failed to send, the email_sent attribute
-                        // should be set to false, preventing this email from being
-                        // sent over and over again in the next cron runs.
-                        $this->entityResource->saveAttribute(
-                            $item->setEmailSent(false),
-                            'email_sent'
-                        );
-                    }
+                    $isEmailSent = $this->emailSender->send($item, true);
+                    $this->entityResource->saveAttribute(
+                        $item->setEmailSent($isEmailSent),
+                        'email_sent'
+                    );
                 }
             }
         }

app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php

@@ -245,24 +245,16 @@ public function testExecute(
                     ->method('isEnabled')
                     ->willReturn(true);
 
-                if ($emailSendingResult) {
-                    $collectionItem
-                        ->expects($this->once())
-                        ->method('setEmailSent')
-                        ->with(true)
-                        ->willReturn($collectionItem);
-
-                    $this->entityResource
-                        ->expects($this->once())
-                        ->method('saveAttribute')
-                        ->with($collectionItem);
-                } else {
-                    $collectionItem
-                        ->expects($this->once())
-                        ->method('setEmailSent')
-                        ->with(false)
-                        ->willReturn($collectionItem);
-                }
+                $collectionItem
+                    ->expects($this->once())
+                    ->method('setEmailSent')
+                    ->with($emailSendingResult)
+                    ->willReturn($collectionItem);
+
+                $this->entityResource
+                    ->expects($this->once())
+                    ->method('saveAttribute')
+                    ->with($collectionItem);
             }
         }