Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 3559460

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - magento/magento2#17593: Fixing the address checkbox being unchecked on payment step. (by @eduard13) - magento/magento2#17484: Fix sending duplicate emails (by @iGerchak) - magento/magento2#17013: Fixed #16929 - Incorrect displaying Product Image Watermarks on Magento 2.2.5 (by @ronak2ram) Fixed GitHub Issues: - magento/magento2#14819: Custom Payment Method doesn't uncheck 'My billing and shipping address are the same' (reported by @eduard13) has been fixed in magento/magento2#17593 by @eduard13 in 2.2-develop branch Related commits: 1. 8739f8e - magento/magento2#16929: Incorrect displaying Product Image Watermarks on Magento 2.2.5 (reported by @chizhov13) has been fixed in magento/magento2#17013 by @ronak2ram in 2.2-develop branch Related commits: 1. 3259f5a 2. ae24b01
2 parents 7c852d1 + 41e1a08 commit 3559460

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

‎app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ define([
247247
*/
248248
setShippingInformation: function () {
249249
if (this.validateShippingInformation()) {
250+
checkoutDataResolver.resolveBillingAddress();
250251
setShippingInformationAction().done(
251252
function () {
252253
stepNavigator.next();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ public function sendEmails()
8989
if ($this->globalConfig->getValue('sales_email/general/async_sending')) {
9090
$this->entityCollection->addFieldToFilter('send_email', ['eq' => 1]);
9191
$this->entityCollection->addFieldToFilter('email_sent', ['null' => true]);
92+
$this->entityCollection->setPageSize(
93+
$this->globalConfig->getValue('sales_email/general/sending_limit')
94+
);
9295

9396
/** @var \Magento\Store\Api\Data\StoreInterface[] $stores */
9497
$stores = $this->getStores(clone $this->entityCollection);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function testExecute($configValue, $collectionItems, $emailSendingResult)
118118
$path = 'sales_email/general/async_sending';
119119

120120
$this->globalConfig
121-
->expects($this->once())
121+
->expects($this->at(0))
122122
->method('getValue')
123123
->with($path)
124124
->willReturn($configValue);

‎app/code/Magento/Sales/etc/adminhtml/system.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@
132132
<source_model>Magento\Config\Model\Config\Source\Enabledisable</source_model>
133133
<backend_model>Magento\Sales\Model\Config\Backend\Email\AsyncSending</backend_model>
134134
</field>
135+
<field id="sending_limit" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
136+
<label>Limit per cron run</label>
137+
<comment>Limit how many entities (orders/shipments/etc) will be processed during one cron run.</comment>
138+
<validate>required-number validate-number validate-greater-than-zero</validate>
139+
<depends>
140+
<field id="async_sending">1</field>
141+
</depends>
142+
</field>
135143
</group>
136144
<group id="order" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
137145
<label>Order</label>

‎app/code/Magento/Sales/etc/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<sales_email>
3030
<general>
3131
<async_sending>0</async_sending>
32+
<sending_limit>50</sending_limit>
3233
</general>
3334
<order>
3435
<enabled>1</enabled>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,43 +354,43 @@
354354

355355
<virtualType name="SalesOrderSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
356356
<arguments>
357-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
357+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
358358
</arguments>
359359
</virtualType>
360360
<virtualType name="SalesOrderInvoiceSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
361361
<arguments>
362-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
362+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
363363
</arguments>
364364
</virtualType>
365365
<virtualType name="SalesOrderShipmentSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
366366
<arguments>
367-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
367+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
368368
</arguments>
369369
</virtualType>
370370
<virtualType name="SalesOrderCreditmemoSendEmailsObserver" type="Magento\Sales\Observer\Virtual\SendEmails">
371371
<arguments>
372-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
372+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
373373
</arguments>
374374
</virtualType>
375375

376376
<virtualType name="SalesOrderSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
377377
<arguments>
378-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderSendEmails</argument>
378+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderSendEmails</argument>
379379
</arguments>
380380
</virtualType>
381381
<virtualType name="SalesInvoiceSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
382382
<arguments>
383-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderInvoiceSendEmails</argument>
383+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderInvoiceSendEmails</argument>
384384
</arguments>
385385
</virtualType>
386386
<virtualType name="SalesShipmentSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
387387
<arguments>
388-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderShipmentSendEmails</argument>
388+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderShipmentSendEmails</argument>
389389
</arguments>
390390
</virtualType>
391391
<virtualType name="SalesCreditmemoSendEmailsCron" type="Magento\Sales\Cron\SendEmails">
392392
<arguments>
393-
<argument name="emailSenderHandler" xsi:type="object">SalesOrderCreditmemoSendEmails</argument>
393+
<argument name="emailSenderHandler" xsi:type="object" shared="false">SalesOrderCreditmemoSendEmails</argument>
394394
</arguments>
395395
</virtualType>
396396
<type name="Magento\SalesSequence\Model\EntityPool">

‎lib/internal/Magento/Framework/Image/Adapter/Gd2.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
425425
$col = imagecolorallocate($newWatermark, 255, 255, 255);
426426
imagecolortransparent($newWatermark, $col);
427427
imagefilledrectangle($newWatermark, 0, 0, $this->getWatermarkWidth(), $this->getWatermarkHeight(), $col);
428-
imagealphablending($newWatermark, true);
429428
imagesavealpha($newWatermark, true);
430429
imagecopyresampled(
431430
$newWatermark,
@@ -450,7 +449,6 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
450449
$col = imagecolorallocate($newWatermark, 255, 255, 255);
451450
imagecolortransparent($newWatermark, $col);
452451
imagefilledrectangle($newWatermark, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight, $col);
453-
imagealphablending($newWatermark, true);
454452
imagesavealpha($newWatermark, true);
455453
imagecopyresampled(
456454
$newWatermark,

0 commit comments

Comments
 (0)