ACP2E-1200: fixed email order notification sending without being checked

Author: aplapana

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -593,6 +593,10 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
             $order->setIncrementId($quote->getReservedOrderId());
         }
 
+        if (array_key_exists('send_confirmation', $orderData) && false === $orderData['send_confirmation']) {
+            $order->setCanSendNewEmailFlag(false);
+        }
+
         $this->submitQuoteValidator->validateOrder($order);
 
         $this->eventManager->dispatch(

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -732,7 +732,7 @@ public function testAssignCustomer(): void
      */
     public function testSubmit(): void
     {
-        $orderData = [];
+        $orderData = ['send_confirmation' => false];
         $isGuest = true;
         $isVirtual = false;
         $customerId = 1;
@@ -827,7 +827,8 @@ public function testSubmit(): void
                 ]
             );
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quote);
-        $this->assertEquals($order, $this->model->submit($quote, $orderData));
+        $test = $this->model->submit($quote, $orderData);
+        $this->assertEquals($order, $test);
     }
 
     /**

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -1982,9 +1982,10 @@ public function createOrder()
         $this->_prepareCustomer();
         $this->_validate();
         $quote = $this->getQuote();
+
         $this->_prepareQuoteItems();
 
-        $orderData = [];
+        $orderData = ['send_confirmation' => (bool)$this->getSendConfirmation()];
         if ($this->getSession()->getOrder()->getId()) {
             $oldOrder = $this->getSession()->getOrder();
             $originalId = $oldOrder->getOriginalIncrementId();
@@ -1996,7 +1997,8 @@ public function createOrder()
                 'relation_parent_id' => $oldOrder->getId(),
                 'relation_parent_real_id' => $oldOrder->getIncrementId(),
                 'edit_increment' => $oldOrder->getEditIncrement() + 1,
-                'increment_id' => $originalId . '-' . ($oldOrder->getEditIncrement() + 1)
+                'increment_id' => $originalId . '-' . ($oldOrder->getEditIncrement() + 1),
+                'send_confirmation' => (bool)$this->getSendConfirmation()
             ];
             $quote->setReservedOrderId($orderData['increment_id']);
         }
@@ -2010,6 +2012,7 @@ public function createOrder()
             $this->orderManagement->cancel($oldOrder->getEntityId());
             $order->save();
         }
+
         if ($this->getSendConfirmation() && !$order->getEmailSent()) {
             $this->emailSender->send($order);
         }

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -419,6 +419,7 @@ public function testCreateOrderNewCustomerDifferentAddresses()
         self::assertEquals($this->model->getQuote()->getCustomerLastname(), $newBillAddress->getLastname());
         self::assertEquals($order->getCustomerFirstname(), $newBillAddress->getFirstname());
         self::assertEquals($order->getCustomerLastname(), $newBillAddress->getLastname());
+        self::assertTrue($order->getEmailSent());
         $this->verifyCreatedOrder($order, $shippingMethod);
         /** @var Customer $customer */
         $customer = $this->objectManager->create(Customer::class);
@@ -462,6 +463,7 @@ public function testCreateOrderNewCustomer()
             $paymentMethod
         );
         $order = $this->model->createOrder();
+        self::assertNull($order->getEmailSent());
         //Check, order considering decimal qty in product.
         foreach ($order->getItems() as $orderItem) {
             self::assertTrue($orderItem->getIsQtyDecimal());
@@ -533,6 +535,7 @@ public function testCreateOrderNewCustomerWithFailedFirstPlaceOrderAction(
         );
 
         $order = $this->model->createOrder();
+        self::assertNull($order->getEmailSent());
         $this->verifyCreatedOrder($order, $shippingMethod);
     }
 
@@ -593,6 +596,7 @@ public function testCreateOrderExistingCustomerDifferentAddresses()
 
         $this->model->getQuote()->setCustomer($customerMock);
         $order = $this->model->createOrder();
+        self::assertNull($order->getEmailSent());
         $this->verifyCreatedOrder($order, $shippingMethod);
         $this->objectManager->get(CustomerRegistry::class)
             ->remove($order->getCustomerId());
@@ -644,6 +648,7 @@ public function testCreateOrderExistingCustomer()
 
         $this->model->getQuote()->setCustomer($customerMock);
         $order = $this->model->createOrder();
+        self::assertNull($order->getEmailSent());
         if ($this->model->getSendConfirmation() && !$order->getEmailSent()) {
             $this->emailSenderMock->expects($this->once())
                 ->method('send')
@@ -966,6 +971,7 @@ public function testCreateOrderExistingCustomerWhenDefaultAddressDiffersWithNew(
         $this->model->setBillingAddress($orderData['billing_address']);
         try {
             $order =$this->model->createOrder();
+            self::assertNull($order->getEmailSent());
             $orderData = $order->getData();
             self::assertNotEmpty($orderData['increment_id'], 'Order increment ID is empty.');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {