Merge remote-tracking branch 'mpi/MC-19400' into Chaika-PR-2019-09-20

Author: veloraven

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

@@ -5,13 +5,21 @@
  */
 namespace Magento\Quote\Observer;
 
-use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Psr\Log\LoggerInterface;
 
+/**
+ * Class SubmitObserver
+ */
 class SubmitObserver implements ObserverInterface
 {
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -21,27 +29,37 @@ class SubmitObserver implements ObserverInterface
     private $orderSender;
 
     /**
-     * @param \Psr\Log\LoggerInterface $logger
+     * @var InvoiceSender
+     */
+    private $invoiceSender;
+
+    /**
+     * @param LoggerInterface $logger
      * @param OrderSender $orderSender
+     * @param InvoiceSender $invoiceSender
      */
     public function __construct(
-        \Psr\Log\LoggerInterface $logger,
-        OrderSender $orderSender
+        LoggerInterface $logger,
+        OrderSender $orderSender,
+        InvoiceSender $invoiceSender
     ) {
         $this->logger = $logger;
         $this->orderSender = $orderSender;
+        $this->invoiceSender = $invoiceSender;
     }
 
     /**
-     * @param \Magento\Framework\Event\Observer $observer
+     * Sends emails to customer.
+     *
+     * @param Observer $observer
      *
      * @return void
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(Observer $observer)
     {
-        /** @var  \Magento\Quote\Model\Quote $quote */
+        /** @var  Quote $quote */
         $quote = $observer->getEvent()->getQuote();
-        /** @var  \Magento\Sales\Model\Order $order */
+        /** @var  Order $order */
         $order = $observer->getEvent()->getOrder();
 
         /**
@@ -51,6 +69,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if (!$redirectUrl && $order->getCanSendNewEmailFlag()) {
             try {
                 $this->orderSender->send($order);
+                $invoice = current($order->getInvoiceCollection()->getItems());
+                if ($invoice) {
+                    $this->invoiceSender->send($invoice);
+                }
             } catch (\Exception $e) {
                 $this->logger->critical($e);
             }

app/code/Magento/Quote/Test/Unit/Observer/SubmitObserverTest.php

@@ -5,75 +5,116 @@
  */
 namespace Magento\Quote\Test\Unit\Observer;
 
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Payment;
+use Magento\Quote\Observer\SubmitObserver;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class SubmitObserverTest
+ */
 class SubmitObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Observer\SubmitObserver
+     * @var SubmitObserver
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $loggerMock;
+    private $loggerMock;
 
     /**
-     * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderSender|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $orderSenderMock;
+    private $orderSenderMock;
 
     /**
-     * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
+     * @var InvoiceSender|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $observerMock;
+    private $invoiceSender;
 
     /**
-     * @var \Magento\Quote\Model\Quote|\PHPUnit_Framework_MockObject_MockObject
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $quoteMock;
+    private $observerMock;
 
     /**
-     * @var \Magento\Sales\Model\Order|\PHPUnit_Framework_MockObject_MockObject
+     * @var Quote|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $orderMock;
+    private $quoteMock;
 
     /**
-     * @var \Magento\Quote\Model\Quote\Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Order|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $paymentMock;
+    private $orderMock;
+
+    /**
+     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentMock;
 
     protected function setUp()
     {
-        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $this->orderMock = $this->createMock(\Magento\Sales\Model\Order::class);
-        $this->paymentMock = $this->createMock(\Magento\Quote\Model\Quote\Payment::class);
-        $this->orderSenderMock =
-            $this->createMock(\Magento\Sales\Model\Order\Email\Sender\OrderSender::class);
-        $eventMock = $this->getMockBuilder(\Magento\Framework\Event::class)
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->quoteMock = $this->createMock(Quote::class);
+        $this->orderMock = $this->createMock(Order::class);
+        $this->paymentMock = $this->createMock(Payment::class);
+        $this->orderSenderMock = $this->createMock(OrderSender::class);
+        $this->invoiceSender = $this->createMock(InvoiceSender::class);
+        $eventMock = $this->getMockBuilder(Event::class)
             ->disableOriginalConstructor()
             ->setMethods(['getQuote', 'getOrder'])
             ->getMock();
-        $this->observerMock = $this->createPartialMock(\Magento\Framework\Event\Observer::class, ['getEvent']);
+        $this->observerMock = $this->createPartialMock(Observer::class, ['getEvent']);
         $this->observerMock->expects($this->any())->method('getEvent')->willReturn($eventMock);
         $eventMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
         $eventMock->expects($this->once())->method('getOrder')->willReturn($this->orderMock);
         $this->quoteMock->expects($this->once())->method('getPayment')->willReturn($this->paymentMock);
-        $this->model = new \Magento\Quote\Observer\SubmitObserver(
+        $this->model = new SubmitObserver(
             $this->loggerMock,
-            $this->orderSenderMock
+            $this->orderSenderMock,
+            $this->invoiceSender
         );
     }
 
+    /**
+     * Tests successful email sending.
+     */
     public function testSendEmail()
     {
-        $this->paymentMock->expects($this->once())->method('getOrderPlaceRedirectUrl')->willReturn('');
-        $this->orderMock->expects($this->once())->method('getCanSendNewEmailFlag')->willReturn(true);
-        $this->orderSenderMock->expects($this->once())->method('send')->willReturn(true);
-        $this->loggerMock->expects($this->never())->method('critical');
+        $this->paymentMock->method('getOrderPlaceRedirectUrl')->willReturn('');
+        $invoice = $this->createMock(Invoice::class);
+        $invoiceCollection = $this->createMock(Collection::class);
+        $invoiceCollection->method('getItems')
+            ->willReturn([$invoice]);
+
+        $this->orderMock->method('getInvoiceCollection')
+            ->willReturn($invoiceCollection);
+        $this->orderMock->method('getCanSendNewEmailFlag')->willReturn(true);
+        $this->orderSenderMock->expects($this->once())
+            ->method('send')->willReturn(true);
+        $this->invoiceSender->expects($this->once())
+            ->method('send')
+            ->with($invoice)
+            ->willReturn(true);
+        $this->loggerMock->expects($this->never())
+            ->method('critical');
+
         $this->model->execute($this->observerMock);
     }
 
+    /**
+     * Tests failing email sending.
+     */
     public function testFailToSendEmail()
     {
         $this->paymentMock->expects($this->once())->method('getOrderPlaceRedirectUrl')->willReturn('');
@@ -85,6 +126,9 @@ public function testFailToSendEmail()
         $this->model->execute($this->observerMock);
     }
 
+    /**
+     * Tests send email when redirect.
+     */
     public function testSendEmailWhenRedirectUrlExists()
     {
         $this->paymentMock->expects($this->once())->method('getOrderPlaceRedirectUrl')->willReturn(false);