MC-31583: Admin: invoice order for customer

Author: ysapiga

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/ItemsTest.php

@@ -10,7 +10,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutInterface;
-use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -31,7 +31,7 @@ class ItemsTest extends TestCase
     /** @var Items */
     private $block;
 
-    /** @var OrderFactory */
+    /** @var OrderInterfaceFactory */
     private $orderFactory;
 
     /** @var Registry */
@@ -49,7 +49,7 @@ protected function setUp()
 
         $this->objectManager = Bootstrap::getObjectManager();
         $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Items::class);
-        $this->orderFactory = $this->objectManager->get(OrderFactory::class);
+        $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
         $this->registry = $this->objectManager->get(Registry::class);
         $this->invoiceCollectionFactory = $this->objectManager->get(CollectionFactory::class);
     }

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/ViewTest.php

@@ -12,8 +12,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutInterface;
-use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\Xpath;
 use PHPUnit\Framework\TestCase;
@@ -37,7 +36,7 @@ class ViewTest extends TestCase
     /** @var Registry */
     private $registry;
 
-    /** @var OrderFactory */
+    /** @var OrderInterfaceFactory */
     private $orderFactory;
 
     /**
@@ -53,7 +52,7 @@ protected function setUp()
             Authorization::class
         );
         $this->registry = $this->objectManager->get(Registry::class);
-        $this->orderFactory = $this->objectManager->get(OrderFactory::class);
+        $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
         $this->layout = $this->objectManager->get(LayoutInterface::class);
     }
 
@@ -103,7 +102,7 @@ public function testInvoiceButtonIsNotVisible(): void
     /**
      * Register order
      *
-     * @param OrderInterface $order
+     * @param string $orderIncrementId
      * @return void
      */
     private function registerOrder(string $orderIncrementId): void

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

@@ -11,7 +11,7 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Model\OrderRepository;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use Magento\TestFramework\TestCase\AbstractBackendController;
@@ -27,7 +27,7 @@ abstract class AbstractInvoiceControllerTest extends AbstractBackendController
     /** @var string */
     protected $resource = 'Magento_Sales::sales_invoice';
 
-    /** @var OrderRepository */
+    /** @var OrderRepositoryInterface */
     private $orderRepository;
 
     /** @var SearchCriteriaBuilder */
@@ -44,7 +44,7 @@ protected function setUp()
         parent::setUp();
 
         $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
-        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepositoryInterface::class);
         $this->searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
         $this->invoiceCollectionFactory = $this->_objectManager->get(CollectionFactory::class);
     }
@@ -65,12 +65,12 @@ protected function getOrder(string $incrementalId): ?OrderInterface
     }
 
     /**
-     * Get firs order invoice
+     * Get first order invoice
      *
-     * @param OrderInterface|int $order
+     * @param OrderInterface $order
      * @return InvoiceInterface
      */
-    protected function getInvoiceByOrder($order): InvoiceInterface
+    protected function getInvoiceByOrder(OrderInterface $order): InvoiceInterface
     {
         $invoiceCollection = $this->invoiceCollectionFactory->create();
 

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

@@ -36,7 +36,7 @@ public function testSendEmailOnAddInvoiceComment(): void
             ['comment' => ['comment' => $comment, 'is_customer_notified' => true]],
             ['id' => $invoice->getEntityId()]
         );
-        $this->dispatch('backend/sales/order_invoice/addComment');
+        $this->dispatch($this->uri);
 
         $html = $this->getResponse()->getBody();
         $this->assertContains($comment, $html);

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

@@ -10,7 +10,7 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Escaper;
 use Magento\Framework\Message\MessageInterface;
-use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
@@ -23,7 +23,7 @@
  */
 class NewActionTest extends AbstractBackendController
 {
-    /** @var OrderFactory */
+    /** @var OrderInterfaceFactory */
     private $orderFactory;
 
     /** @var Escaper */
@@ -36,7 +36,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
+        $this->orderFactory = $this->_objectManager->get(OrderInterfaceFactory::class);
         $this->escaper = $this->_objectManager->get(Escaper::class);
     }
 

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

@@ -49,7 +49,7 @@ public function testSendEmailOnInvoiceSave(): void
         $itemId = $order->getItemsCollection()->getFirstItem()->getId();
         $post = $this->hydratePost([$itemId => 2]);
         $this->prepareRequest($post, ['order_id' => $order->getEntityId()]);
-        $this->dispatch('backend/sales/order_invoice/save');
+        $this->dispatch($this->uri);
         $invoice = $this->getInvoiceByOrder($order);
         $this->checkSuccess($invoice, 2);
         $message = $this->transportBuilder->getSentMessage();
@@ -81,7 +81,7 @@ public function testSendEmailOnInvoiceSaveWithDisabledConfig(): void
         $order = $this->getOrder('100000001');
         $post = $this->hydratePost([$order->getItemsCollection()->getFirstItem()->getId() => 2]);
         $this->prepareRequest($post, ['order_id' => $order->getEntityId()]);
-        $this->dispatch('backend/sales/order_invoice/save');
+        $this->dispatch($this->uri);
         $this->checkSuccess($this->getInvoiceByOrder($order), 2);
         $this->assertNull($this->transportBuilder->getSentMessage());
     }
@@ -108,7 +108,7 @@ public function testSuccessfulInvoice(
             $doShipment
         );
         $this->prepareRequest($post, ['order_id' => $order->getEntityId()]);
-        $this->dispatch('backend/sales/order_invoice/save');
+        $this->dispatch($this->uri);
         $this->checkSuccess($this->getInvoiceByOrder($order), $invoicedItemsQty, $commentMessage, $doShipment);
     }
 
@@ -140,7 +140,7 @@ public function testWitNoExistingOrder(): void
     {
         $expectedMessage = (string)__('The order no longer exists.');
         $this->prepareRequest(['order_id' => 899989]);
-        $this->dispatch('backend/sales/order_invoice/save');
+        $this->dispatch($this->uri);
         $this->assertErrorResponse($expectedMessage);
     }
 
@@ -154,7 +154,7 @@ public function testCanNotInvoiceOrder(): void
         $expectedMessage = (string)__('The order does not allow an invoice to be created.');
         $order = $this->getOrder('100000001');
         $this->prepareRequest([], ['order_id' => $order->getEntityId()]);
-        $this->dispatch('backend/sales/order_invoice/save');
+        $this->dispatch($this->uri);
         $this->assertErrorResponse($expectedMessage);
     }
 
@@ -169,7 +169,7 @@ public function testInvoiceWithoutQty(): void
         $order = $this->getOrder('100000001');
         $post = $this->hydratePost([$order->getItemsCollection()->getFirstItem()->getId() => '0']);
         $this->prepareRequest($post, ['order_id' => $order->getEntityId()]);
-        $this->dispatch('backend/sales/order_invoice/save');
+        $this->dispatch($this->uri);
         $this->assertErrorResponse($this->escaper->escapeHtml($expectedMessage));
     }
 

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

@@ -9,7 +9,7 @@
 
 use Magento\Backend\Model\Session;
 use Magento\Framework\App\Request\Http;
-use Magento\Sales\Model\OrderFactory;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
@@ -22,7 +22,7 @@
  */
 class StartTest extends AbstractBackendController
 {
-    /** @var OrderFactory */
+    /** @var OrderInterfaceFactory */
     private $orderFactory;
 
     /** @var Session */
@@ -35,7 +35,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->orderFactory = $this->_objectManager->get(OrderFactory::class);
+        $this->orderFactory = $this->_objectManager->get(OrderInterfaceFactory::class);
         $this->session = $this->_objectManager->get(Session::class);
     }