Merge remote-tracking branch 'origin/MC-39135' into 2.4-develop-pr46

Author: serhii-balko

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

@@ -5,10 +5,13 @@
  */
 namespace Magento\Sales\Model\AdminOrder;
 
-use Psr\Log\LoggerInterface as Logger;
+use Magento\Framework\Exception\MailException;
 use Magento\Framework\Message\ManagerInterface;
 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 Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class EmailSender
@@ -30,21 +33,31 @@ class EmailSender
      */
     protected $orderSender;
 
+    /**
+     * @var InvoiceSender
+     */
+    private $invoiceSender;
+
     /**
      * @param ManagerInterface $messageManager
      * @param Logger $logger
      * @param OrderSender $orderSender
+     * @param InvoiceSender $invoiceSender
      */
-    public function __construct(ManagerInterface $messageManager, Logger $logger, OrderSender $orderSender)
-    {
+    public function __construct(
+        ManagerInterface $messageManager,
+        Logger $logger,
+        OrderSender $orderSender,
+        InvoiceSender $invoiceSender
+    ) {
         $this->messageManager = $messageManager;
         $this->logger = $logger;
         $this->orderSender = $orderSender;
+        $this->invoiceSender = $invoiceSender;
     }
 
     /**
-     * Send email about new order.
-     * Process mail exception
+     * Send email about new order and handle mail exception
      *
      * @param Order $order
      * @return bool
@@ -53,7 +66,8 @@ public function send(Order $order)
     {
         try {
             $this->orderSender->send($order);
-        } catch (\Magento\Framework\Exception\MailException $exception) {
+            $this->sendInvoiceEmail($order);
+        } catch (MailException $exception) {
             $this->logger->critical($exception);
             $this->messageManager->addWarningMessage(
                 __('You did not email your customer. Please check your email settings.')
@@ -63,4 +77,19 @@ public function send(Order $order)
 
         return true;
     }
+
+    /**
+     * Send email about invoice paying
+     *
+     * @param Order $order
+     */
+    private function sendInvoiceEmail(Order $order): void
+    {
+        foreach ($order->getInvoiceCollection()->getItems() as $invoice) {
+            /** @var Invoice $invoice */
+            if ($invoice->getState() === Invoice::STATE_PAID) {
+                $this->invoiceSender->send($invoice);
+            }
+        }
+    }
 }

app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php

@@ -11,66 +11,89 @@
 use Magento\Framework\Message\Manager;
 use Magento\Sales\Model\AdminOrder\EmailSender;
 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 as InvoiceCollection;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Tests to sent order emails
+ */
 class EmailSenderTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var LoggerInterface|MockObject
      */
-    protected $orderMock;
+    private $loggerMock;
 
     /**
-     * @var MockObject
+     * @var Manager|MockObject
      */
-    protected $loggerMock;
+    private $messageManagerMock;
 
     /**
-     * @var MockObject
+     * @var OrderSender|MockObject
      */
-    protected $messageManagerMock;
+    private $orderSenderMock;
 
     /**
-     * @var EmailSender
+     * @var InvoiceSender|MockObject
      */
-    protected $emailSender;
+    private $invoiceSenderMock;
 
     /**
-     * @var OrderSender
+     * @var EmailSender
      */
-    protected $orderSenderMock;
+    private $emailSender;
 
     /**
-     * Test setup
+     * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->messageManagerMock = $this->createMock(Manager::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
-        $this->orderMock = $this->createMock(Order::class);
         $this->orderSenderMock = $this->createMock(OrderSender::class);
+        $this->invoiceSenderMock = $this->createMock(InvoiceSender::class);
 
-        $this->emailSender = new EmailSender($this->messageManagerMock, $this->loggerMock, $this->orderSenderMock);
+        $this->emailSender = new EmailSender(
+            $this->messageManagerMock,
+            $this->loggerMock,
+            $this->orderSenderMock,
+            $this->invoiceSenderMock
+        );
     }
 
     /**
-     * testSendSuccess
+     * Test to send order emails
      */
     public function testSendSuccess()
     {
+        $invoicePaid = $this->createMock(Invoice::class);
+        $invoicePaid->method('getState')->willReturn(Invoice::STATE_PAID);
+        $invoiceOpen = $this->createMock(Invoice::class);
+        $invoiceOpen->method('getState')->willReturn(Invoice::STATE_OPEN);
+        $order = $this->createOrderMock([$invoiceOpen, $invoicePaid]);
+
         $this->orderSenderMock->expects($this->once())
-            ->method('send');
-        $this->assertTrue($this->emailSender->send($this->orderMock));
+            ->method('send')
+            ->with($order);
+        $this->invoiceSenderMock->expects($this->once())
+            ->method('send')
+            ->with($invoicePaid);
+
+        $this->assertTrue($this->emailSender->send($order));
     }
 
     /**
      * testSendFailure
      */
     public function testSendFailure()
     {
+        $orderMock = $this->createOrderMock();
         $this->orderSenderMock->expects($this->once())
             ->method('send')
             ->willThrowException(new MailException(__('test message')));
@@ -79,6 +102,22 @@ public function testSendFailure()
         $this->loggerMock->expects($this->once())
             ->method('critical');
 
-        $this->assertFalse($this->emailSender->send($this->orderMock));
+        $this->assertFalse($this->emailSender->send($orderMock));
+    }
+
+    /**
+     * Create order mock
+     *
+     * @param array $invoiceCollection
+     * @return MockObject|Order
+     */
+    private function createOrderMock(array $invoiceCollection = []): MockObject
+    {
+        $collection = $this->createMock(InvoiceCollection::class);
+        $collection->method('getItems')->willReturn($invoiceCollection);
+        $order = $this->createMock(Order::class);
+        $order->method('getInvoiceCollection')->willReturn($collection);
+
+        return $order;
     }
 }