Skip to content

[Forwardport] Fix sending duplicate emails #17714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2018
Merged

[Forwardport] Fix sending duplicate emails #17714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7ab99d
Fix sending duplicate emails
iGerchak Aug 14, 2018
1333114
Fix failed test EmailSenderHandlerTest
Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/code/Magento/Sales/Model/EmailSenderHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ 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->setPageSize(
$this->globalConfig->getValue('sales_email/general/sending_limit')
);

/** @var \Magento\Store\Api\Data\StoreInterface[] $stores */
$stores = $this->getStores(clone $this->entityCollection);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Unit/Model/EmailSenderHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
$path = 'sales_email/general/async_sending';

$this->globalConfig
->expects($this->once())
->expects($this->at(0))
->method('getValue')
->with($path)
->willReturn($configValue);
Expand Down
8 changes: 8 additions & 0 deletions app/code/Magento/Sales/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
<backend_model>Magento\Sales\Model\Config\Backend\Email\AsyncSending</backend_model>
</field>
<field id="sending_limit" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<label>Limit per cron run</label>
<comment>Limit how many entities (orders/shipments/etc) will be processed during one cron run.</comment>
<validate>required-number validate-number validate-greater-than-zero</validate>
<depends>
<field id="async_sending">1</field>
</depends>
</field>
</group>
<group id="order" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Order</label>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Sales/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<sales_email>
<general>
<async_sending>0</async_sending>
<sending_limit>50</sending_limit>
</general>
<order>
<enabled>1</enabled>
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/Sales/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,43 +354,43 @@

<virtualType name="SalesOrderSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
</arguments>
</virtualType>
<virtualType name="SalesOrderInvoiceSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
</arguments>
</virtualType>
<virtualType name="SalesOrderShipmentSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
</arguments>
</virtualType>
<virtualType name="SalesOrderCreditmemoSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
</arguments>
</virtualType>

<virtualType name="SalesOrderSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
</arguments>
</virtualType>
<virtualType name="SalesInvoiceSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
</arguments>
</virtualType>
<virtualType name="SalesShipmentSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
</arguments>
</virtualType>
<virtualType name="SalesCreditmemoSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
<arguments>
<argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
</arguments>
</virtualType>
<type name="Magento\SalesSequence\Model\EntityPool">
Expand Down