Merge remote-tracking branch 'origin/MC-20193' into 2.3-develop-pr78

Author: zakdma

app/code/Magento/Quote/Observer/SubmitObserver.php

@@ -14,7 +14,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class SubmitObserver
+ * Class responsive for sending order and invoice emails when it's created through storefront.
  */
 class SubmitObserver implements ObserverInterface
 {
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * Sends emails to customer.
+     * Send order and invoice email.
      *
      * @param Observer $observer
      *

app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php

@@ -16,6 +16,7 @@
 use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Service\InvoiceService;
+use Magento\Sales\Helper\Data as SalesData;
 
 /**
  * Save invoice controller.
@@ -56,28 +57,36 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      */
     private $invoiceService;
 
+    /**
+     * @var SalesData
+     */
+    private $salesData;
+
     /**
      * @param Action\Context $context
      * @param Registry $registry
      * @param InvoiceSender $invoiceSender
      * @param ShipmentSender $shipmentSender
      * @param ShipmentFactory $shipmentFactory
      * @param InvoiceService $invoiceService
+     * @param SalesData $salesData
      */
     public function __construct(
         Action\Context $context,
         Registry $registry,
         InvoiceSender $invoiceSender,
         ShipmentSender $shipmentSender,
         ShipmentFactory $shipmentFactory,
-        InvoiceService $invoiceService
+        InvoiceService $invoiceService,
+        SalesData $salesData = null
     ) {
         $this->registry = $registry;
         $this->invoiceSender = $invoiceSender;
         $this->shipmentSender = $shipmentSender;
         $this->shipmentFactory = $shipmentFactory;
         $this->invoiceService = $invoiceService;
         parent::__construct($context);
+        $this->salesData = $salesData ?? $this->_objectManager->get(SalesData::class);
     }
 
     /**
@@ -204,7 +213,7 @@ public function execute()
 
             // send invoice/shipment emails
             try {
-                if (!empty($data['send_email'])) {
+                if (!empty($data['send_email']) || $this->salesData->canSendNewInvoiceEmail()) {
                     $this->invoiceSender->send($invoice);
                 }
             } catch (\Exception $e) {
@@ -213,7 +222,7 @@ public function execute()
             }
             if ($shipment) {
                 try {
-                    if (!empty($data['send_email'])) {
+                    if (!empty($data['send_email']) || $this->salesData->canSendNewShipmentEmail()) {
                         $this->shipmentSender->send($shipment);
                     }
                 } catch (\Exception $e) {

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php

@@ -28,7 +28,7 @@ class SaveTest extends AbstractInvoiceControllerTest
      */
     public function testSendEmailOnInvoiceSave(): void
     {
-        $order = $this->prepareRequest(['invoice' => ['send_email' => true]]);
+        $order = $this->prepareRequest();
         $this->dispatch('backend/sales/order_invoice/save');
 
         $this->assertSessionMessages(