Update order state

aune-io · Oct 17, 2018 · f53f59e · f53f59e
1 parent 6fb2462
commit f53f59e
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 2 deletions.
diff --git a/Model/InvoiceProcess.php b/Model/InvoiceProcess.php
@@ -6,6 +6,7 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Invoice as OrderInvoice;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory as OrderStatusCollectionFactory;
 use Magento\Sales\Model\Service\InvoiceServiceFactory;
 
 use Aune\AutoInvoice\Api\InvoiceProcessInterface;
@@ -28,6 +29,11 @@ class InvoiceProcess implements InvoiceProcessInterface
      */
     private $orderCollectionFactory;
 
+    /**
+     * @var OrderStatusCollectionFactory
+     */
+    private $orderStatusCollectionFactory;
+
     /**
      * @var InvoiceProcessItemInterfaceFactory
      */
@@ -43,22 +49,30 @@ class InvoiceProcess implements InvoiceProcessInterface
      */
     private $invoiceServiceFactory;
 
+    /**
+     * @var array
+     */
+    private $orderStatusToStateMap;
+
     /**
      * @param HelperData $helperData
      * @param OrderCollectionFactory $orderCollectionFactory
+     * @param OrderStatusCollectionFactory $orderStatusCollectionFactory
      * @param InvoiceProcessItemInterfaceFactory $invoiceProcessItemFactory
      * @param Transaction $transaction
      * @param InvoiceServiceFactory $invoiceServiceFactory
      */
     public function __construct(
         HelperData $helperData,
         OrderCollectionFactory $orderCollectionFactory,
+        OrderStatusCollectionFactory $orderStatusCollectionFactory,
         InvoiceProcessItemInterfaceFactory $invoiceProcessItemFactory,
         Transaction $transaction,
         InvoiceServiceFactory $invoiceServiceFactory
     ) {
         $this->helperData = $helperData;
         $this->orderCollectionFactory = $orderCollectionFactory;
+        $this->orderStatusCollectionFactory = $orderStatusCollectionFactory;
         $this->invoiceProcessItemFactory = $invoiceProcessItemFactory;
         $this->transaction = $transaction;
         $this->invoiceServiceFactory = $invoiceServiceFactory;
@@ -105,14 +119,48 @@ private function getPaymentMethodCode(Order $order)
         }
     }
 
+    /**
+     * Returns the order status to state map
+     */
+    private function getOrderStatusToStateMap()
+    {
+        if (!is_null($this->orderStatusToStateMap)) {
+            return $this->orderStatusToStateMap;
+        }
+
+        $collection = $this->orderStatusCollectionFactory->create()
+            ->joinStates();
+
+        $this->orderStatusToStateMap = [];
+        foreach ($collection as $status) {
+            $this->orderStatusToStateMap[$status->getStatus()] = $status->getState();
+        }
+
+        return $this->orderStatusToStateMap;
+    }
+
+    /**
+     * Return the order state given a status
+     */
+    private function getOrderStateByStatus(string $status)
+    {
+        $map = $this->getOrderStatusToStateMap();
+        return empty($map[$status]) ? false : $map[$status];
+    }
+
     /**
      * @inheritdoc
      */
     public function invoice(InvoiceProcessItemInterface $item)
     {
         $order = $item->getOrder();
 
-        $order->setStatus($item->getDestinationStatus());
+        $status = $item->getDestinationStatus();
+        $order->setStatus($status);
+
+        if ($state = $this->getOrderStateByStatus($status)) {
+            $order->setState($state);
+        }
 
         $invoice = $this->invoiceServiceFactory->create()
             ->prepareInvoice($order);
@@ -122,7 +170,7 @@ public function invoice(InvoiceProcessItemInterface $item)
         $transactionSave = $this->transaction
             ->addObject($invoice)
             ->addObject($order);
-
+        
         $transactionSave->save();
     }
 }
diff --git a/Test/Unit/Model/InvoiceProcessTest.php b/Test/Unit/Model/InvoiceProcessTest.php
@@ -7,6 +7,8 @@
 use Magento\Sales\Model\Order\Invoice as OrderInvoice;
 use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Status\Collection as OrderStatusCollection;
+use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory as OrderStatusCollectionFactory;
 use Magento\Sales\Model\Service\InvoiceService;
 use Magento\Sales\Model\Service\InvoiceServiceFactory;
 
@@ -31,6 +33,11 @@ class InvoiceProcessTest extends \PHPUnit\Framework\TestCase
      */
     private $orderCollectionFactoryMock;
 
+    /**
+     * @var OrderStatusCollectionFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderStatusCollectionFactoryMock;
+
     /**
      * @var InvoiceProcessItemInterfaceFactory|PHPUnit_Framework_MockObject_MockObject
      */
@@ -61,6 +68,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->orderStatusCollectionFactoryMock = $this->getMockBuilder(OrderStatusCollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
         $this->invoiceProcessItemFactoryMock = $this->getMockBuilder(InvoiceProcessItemInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -78,6 +90,7 @@ protected function setUp()
         $this->invoiceProcess = new InvoiceProcess(
             $this->helperDataMock,
             $this->orderCollectionFactoryMock,
+            $this->orderStatusCollectionFactoryMock,
             $this->invoiceProcessItemFactoryMock,
             $this->transactionMock,
             $this->invoiceServiceFactoryMock
@@ -291,6 +304,30 @@ private function getOrderMock(int $orderId, string $paymentMethod)
     public function testInvoice()
     {
         $status = 'complete';
+
+        $orderStatusCollectionMock = $this->getMockBuilder(OrderStatusCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $orderStatusCollectionMock->expects(self::once())
+            ->method('joinStates')
+            ->willReturn($orderStatusCollectionMock);
+
+        $this->orderStatusCollectionFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($orderStatusCollectionMock);
+
+        $statuses = [
+            $this->getOrderStatusMock('processing', 'processing'),
+            $this->getOrderStatusMock('pending', 'pending'),
+            $this->getOrderStatusMock('complete', 'complete'),
+            $this->getOrderStatusMock('closed', 'closed'),
+        ];
+
+        $orderStatusCollectionMock->expects(self::once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($statuses));
+
         $orderMock = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -300,6 +337,11 @@ public function testInvoice()
             ->with($status)
             ->willReturn($orderMock);
 
+        $orderMock->expects(self::once())
+            ->method('setState')
+            ->with($status)
+            ->willReturn($orderMock);
+
         $itemMock = $this->getMockForAbstractClass(InvoiceProcessItemInterface::class);
 
         $itemMock->expects(self::once())
@@ -344,4 +386,25 @@ public function testInvoice()
 
         $this->invoiceProcess->invoice($itemMock);
     }
+
+    /**
+     * Returns new mock status with given a status/state pair
+     */
+    private function getOrderStatusMock(string $status, string $state)
+    {
+        $orderStatusMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Status::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStatus', 'getState'])
+            ->getMock();
+
+        $orderStatusMock->expects(self::once())
+            ->method('getStatus')
+            ->willReturn($status);
+
+        $orderStatusMock->expects(self::once())
+            ->method('getState')
+            ->willReturn($state);
+
+        return $orderStatusMock;
+    }
 }