MAGETWO-31593: Sales Quote as Standalone Magento Module

Author: Olexandr Lysenko

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

@@ -98,37 +98,6 @@ public function __construct(
         $this->quotePaymentToOrderPayment = $quotePaymentToOrderPayment;
     }
 
-    /**
-     * @param Quote $quote
-     * @return void
-     */
-    protected function deleteNominalItems(QuoteEntity $quote)
-    {
-        foreach ($quote->getAllVisibleItems() as $item) {
-            if ($item->isNominal()) {
-                $item->isDeleted(true);
-            }
-        }
-    }
-
-    /**
-     * @param Quote $quote
-     * @return void
-     * @throws \Magento\Framework\Model\Exception
-     */
-    public function submitNominalItems(QuoteEntity $quote)
-    {
-        $this->quoteValidator->validateBeforeSubmit($quote);
-        $this->eventManager->dispatch(
-            'sales_model_service_quote_submit_nominal_items',
-            [
-                'quote' => $quote
-            ]
-        );
-        $quote->setIsActive(false);
-        $this->deleteNominalItems($quote);
-    }
-
     /**
      * @param Quote $quote
      * @param array $orderData
@@ -148,7 +117,7 @@ public function submit(QuoteEntity $quote, $orderData = [])
                 'quote' => $quote
             ]
         );
-        $this->deleteNominalItems($quote);
+
         return $this->submitQuote($quote, $orderData);
     }
 

dev/tests/unit/testsuite/Magento/Quote/Model/QuoteManagementTest.php

@@ -116,40 +116,14 @@ protected function setUp()
         );
     }
 
-    public function testSubmitNominalItems()
-    {
-        $quoteItem = $this->getQuoteItem(false);
-        $nominalQuoteItem = $this->getQuoteItem(true);
-        $nominalQuoteItem->expects($this->once())
-            ->method('isDeleted')
-            ->with(true);
-
-        $quote = $this->getMock('Magento\Quote\Model\Quote', ['setIsActive', 'getAllVisibleItems'], [], '', false);
-        $quote->expects($this->once())
-            ->method('setIsActive')
-            ->with(false);
-        $quote->expects($this->once())
-            ->method('getAllVisibleItems')
-            ->willReturn([$quoteItem, $nominalQuoteItem]);
-
-        $this->quoteValidator->expects($this->once())
-            ->method('validateBeforeSubmit')
-            ->with($quote);
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with('sales_model_service_quote_submit_nominal_items', ['quote' => $quote]);
-
-        $this->model->submitNominalItems($quote);
-    }
-
     public function testSubmit()
     {
         $orderData = [];
         $isGuest = true;
         $isVirtual = false;
         $customerId = 1;
         $quoteId = 1;
-        $quoteItem = $this->getQuoteItem(false);
+        $quoteItem = $this->getMock('Magento\Quote\Model\Quote\Item', [], [], '', false);
 
         $billingAddress = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
         $shippingAddress = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
@@ -314,15 +288,6 @@ protected function getQuote(
         return $quote;
     }
 
-    protected function getQuoteItem($isNominal)
-    {
-        $quoteItem = $this->getMock('Magento\Quote\Model\Quote\Item', [], [], '', false);
-        $quoteItem->expects($this->once())
-            ->method('isNominal')
-            ->willReturn($isNominal);
-        return $quoteItem;
-    }
-
     protected function prepareOrderBuilder(
         \Magento\Sales\Api\Data\OrderInterface $baseOrder,
         \Magento\Sales\Api\Data\OrderAddressInterface $billingAddress,

dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -1052,7 +1052,7 @@ public function testGetPaymentIsDeleted()
 
     public function testAddItem()
     {
-        $item = $this->getMock('Magento\Sales\Model\Quote\Item', ['setQuote', 'getId'], [], '', false);
+        $item = $this->getMock('Magento\Quote\Model\Quote\Item', ['setQuote', 'getId'], [], '', false);
         $item->expects($this->once())
             ->method('setQuote');
         $item->expects($this->once())

dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessDataTest.php

@@ -133,7 +133,7 @@ protected function setUp()
     public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCouponCode)
     {
         $quote = $this->getMock(
-            'Magento\Sales\Model\Quote',
+            'Magento\Quote\Model\Quote',
             ['getCouponCode', 'isVirtual', 'getAllItems'],
             [],
             '',
@@ -184,7 +184,7 @@ public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCoup
         $create->expects($this->once())->method('initRuleData')->willReturnSelf();
         $create->expects($this->any())->method('getQuote')->willReturn($quote);
 
-        $address = $this->getMock('Magento\Sales\Model\Quote\Address', [], [], '', false);
+        $address = $this->getMock('Magento\Quote\Model\Quote\Address', [], [], '', false);
         $create->expects($this->once())->method('getBillingAddress')->willReturn($address);
 
         $quote->expects($this->any())->method('isVirtual')->willReturn(true);