ACP2E-2734: Emails are failing to send

Author: thiaramus

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

@@ -5,11 +5,15 @@
  */
 namespace Magento\Sales\Model;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\ValueFactory;
 use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
+use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\ResourceModel\Collection\AbstractCollection;
+use Magento\Sales\Model\ResourceModel\EntityAbstract;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Sales emails sending
@@ -68,16 +72,18 @@ class EmailSenderHandler
      * @var string
      */
     private $modifyStartFromDate;
+    private int $maxSendAttempts;
 
     /**
-     * @param \Magento\Sales\Model\Order\Email\Sender $emailSender
-     * @param \Magento\Sales\Model\ResourceModel\EntityAbstract $entityResource
+     * @param Sender $emailSender
+     * @param EntityAbstract $entityResource
      * @param AbstractCollection $entityCollection
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
+     * @param ScopeConfigInterface $globalConfig
      * @param IdentityInterface|null $identityContainer
-     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
+     * @param StoreManagerInterface|null $storeManager
      * @param ValueFactory|null $configValueFactory
      * @param string|null $modifyStartFromDate
+     * @param int $maxSendAttempts
      */
     public function __construct(
         \Magento\Sales\Model\Order\Email\Sender $emailSender,
@@ -87,7 +93,8 @@ public function __construct(
         IdentityInterface $identityContainer = null,
         \Magento\Store\Model\StoreManagerInterface $storeManager = null,
         ?ValueFactory $configValueFactory = null,
-        ?string $modifyStartFromDate = null
+        ?string $modifyStartFromDate = null,
+        int $maxSendAttempts = null
     ) {
         $this->emailSender = $emailSender;
         $this->entityResource = $entityResource;
@@ -101,6 +108,7 @@ public function __construct(
 
         $this->configValueFactory = $configValueFactory ?: ObjectManager::getInstance()->get(ValueFactory::class);
         $this->modifyStartFromDate = $modifyStartFromDate ?: $this->modifyStartFromDate;
+        $this->maxSendAttempts = $maxSendAttempts ?? 3;
     }
 
     /**
@@ -112,7 +120,13 @@ public function sendEmails()
     {
         if ($this->globalConfig->getValue('sales_email/general/async_sending')) {
             $this->entityCollection->addFieldToFilter('send_email', ['eq' => 1]);
-            $this->entityCollection->addFieldToFilter('email_sent', ['null' => true]);
+            $this->entityCollection->addFieldToFilter(
+                'email_sent',
+                [
+                    ['null' => true],
+                    ['lteq' => -1]
+                ]
+            );
             $this->filterCollectionByStartFromDate($this->entityCollection);
             $this->entityCollection->setPageSize(
                 $this->globalConfig->getValue('sales_email/general/sending_limit')
@@ -132,9 +146,17 @@ public function sendEmails()
 
                 /** @var \Magento\Sales\Model\AbstractModel $item */
                 foreach ($entityCollection->getItems() as $item) {
+                    $sendAttempts = $item->getEmailSent() ?? -$this->maxSendAttempts;
                     $isEmailSent = $this->emailSender->send($item, true);
+
+                    if ($isEmailSent) {
+                        $sendAttempts = 1;
+                    } else {
+                        $sendAttempts++;
+                    }
+
                     $this->entityResource->saveAttribute(
-                        $item->setEmailSent($isEmailSent),
+                        $item->setEmailSent($sendAttempts),
                         'email_sent'
                     );
                 }

app/code/Magento/Sales/etc/db_schema.xml

@@ -149,7 +149,7 @@
         <column xsi:type="int" name="customer_group_id" unsigned="false" nullable="true" identity="false"/>
         <column xsi:type="int" name="edit_increment" unsigned="false" nullable="true" identity="false"
                 comment="Edit Increment"/>
-        <column xsi:type="smallint" name="email_sent" unsigned="true" nullable="true" identity="false"
+        <column xsi:type="smallint" name="email_sent" unsigned="false" nullable="true" identity="false"
                 comment="Email Sent"/>
         <column xsi:type="smallint" name="send_email" unsigned="true" nullable="true" identity="false"
                 comment="Send Email"/>
@@ -708,7 +708,7 @@
                 comment="Total Weight"/>
         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Total Qty"/>
-        <column xsi:type="smallint" name="email_sent" unsigned="true" nullable="true" identity="false"
+        <column xsi:type="smallint" name="email_sent" unsigned="false" nullable="true" identity="false"
                 comment="Email Sent"/>
         <column xsi:type="smallint" name="send_email" unsigned="true" nullable="true" identity="false"
                 comment="Send Email"/>
@@ -981,7 +981,7 @@
                 identity="false" comment="Is Used For Refund"/>
         <column xsi:type="int" name="order_id" unsigned="true" nullable="false" identity="false"
                 comment="Order ID"/>
-        <column xsi:type="smallint" name="email_sent" unsigned="true" nullable="true" identity="false"
+        <column xsi:type="smallint" name="email_sent" unsigned="false" nullable="true" identity="false"
                 comment="Email Sent"/>
         <column xsi:type="smallint" name="send_email" unsigned="true" nullable="true" identity="false"
                 comment="Send Email"/>
@@ -1278,7 +1278,7 @@
                 comment="Tax Amount"/>
         <column xsi:type="int" name="order_id" unsigned="true" nullable="false" identity="false"
                 comment="Order ID"/>
-        <column xsi:type="smallint" name="email_sent" unsigned="true" nullable="true" identity="false"
+        <column xsi:type="smallint" name="email_sent" unsigned="false" nullable="true" identity="false"
                 comment="Email Sent"/>
         <column xsi:type="smallint" name="send_email" unsigned="true" nullable="true" identity="false"
                 comment="Send Email"/>

app/code/Magento/Sales/etc/di.xml

@@ -220,6 +220,7 @@
     <type name="Magento\Sales\Model\EmailSenderHandler">
         <arguments>
             <argument name="modifyStartFromDate" xsi:type="string">-1 day</argument>
+            <argument name="maxSendAttempts" xsi:type="number">3</argument>
         </arguments>
     </type>
     <virtualType name="SalesOrderIndexGridSyncRemove" type="Magento\Sales\Observer\GridSyncRemoveObserver">