Merge pull request #33 from magento-firedrakes/MAGETWO-31593

[Firedrakes] Sales Quote as Standalone Magento Module

Author: vpelipenko

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -10,7 +10,7 @@
 /**
  * Grid widget massaction block
  *
- * @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
+ * @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
  * @method boolean getHideFormElement()
  * @author      Magento Core Team <core@magentocommerce.com>
  */

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -8,7 +8,7 @@
 /**
  * Grid widget massaction block
  *
- * @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
+ * @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
  * @method boolean getHideFormElement()
  * @author      Magento Core Team <core@magentocommerce.com>
  * @deprecated support Magento 1.x grid massaction implementation

app/code/Magento/Backend/Model/Session/Quote.php

@@ -28,7 +28,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
     /**
      * Quote model object
      *
-     * @var \Magento\Sales\Model\Quote
+     * @var \Magento\Quote\Model\Quote
      */
     protected $_quote;
 
@@ -59,7 +59,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
     /**
      * Sales quote repository
      *
-     * @var \Magento\Sales\Model\QuoteRepository
+     * @var \Magento\Quote\Model\QuoteRepository
      */
     protected $quoteRepository;
 
@@ -83,7 +83,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param CustomerRepositoryInterface $customerRepository
-     * @param \Magento\Sales\Model\QuoteRepository $quoteRepository
+     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GroupManagementInterface $groupManagement
@@ -98,7 +98,7 @@ public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         CustomerRepositoryInterface $customerRepository,
-        \Magento\Sales\Model\QuoteRepository $quoteRepository,
+        \Magento\Quote\Model\QuoteRepository $quoteRepository,
         \Magento\Sales\Model\OrderFactory $orderFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         GroupManagementInterface $groupManagement
@@ -127,7 +127,7 @@ public function __construct(
     /**
      * Retrieve quote model object
      *
-     * @return \Magento\Sales\Model\Quote
+     * @return \Magento\Quote\Model\Quote
      */
     public function getQuote()
     {

app/code/Magento/Backend/composer.json

@@ -11,6 +11,7 @@
         "magento/module-theme": "0.42.0-beta3",
         "magento/module-reports": "0.42.0-beta3",
         "magento/module-sales": "0.42.0-beta3",
+        "magento/module-quote": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-user": "0.42.0-beta3",
         "magento/module-backup": "0.42.0-beta3",

app/code/Magento/Bundle/Model/Plugin/QuoteItem.php

@@ -12,19 +12,21 @@ class QuoteItem
     /**
      * Add bundle attributes to order data
      *
-     * @param \Magento\Sales\Model\Convert\Quote $subject
-     * @param Closure $proceed
-     * @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
+     * @param \Magento\Quote\Model\Quote\Item\ToOrderItem $subject
+     * @param callable $proceed
+     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * @param array $additional
      * @return \Magento\Sales\Model\Order\Item
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundItemToOrderItem(
-        \Magento\Sales\Model\Convert\Quote $subject,
+    public function aroundConvert(
+        \Magento\Quote\Model\Quote\Item\ToOrderItem $subject,
         Closure $proceed,
-        \Magento\Sales\Model\Quote\Item\AbstractItem $item
+        \Magento\Quote\Model\Quote\Item\AbstractItem $item,
+        $additional
     ) {
         /** @var $orderItem \Magento\Sales\Model\Order\Item */
-        $orderItem = $proceed($item);
+        $orderItem = $proceed($item, $additional);
 
         if ($attributes = $item->getProduct()->getCustomOption('bundle_selection_attributes')) {
             $productOptions = $orderItem->getProductOptions();

app/code/Magento/Bundle/Model/Resource/Bundle.php

@@ -85,7 +85,7 @@ public function dropAllQuoteChildItems($productId)
     {
         $quoteItemIds = $this->_getReadAdapter()->fetchCol(
             $this->_getReadAdapter()->select()->from(
-                $this->getTable('sales_quote_item'),
+                $this->getTable('quote_item'),
                 ['item_id']
             )->where(
                 'product_id = :product_id'
@@ -95,7 +95,7 @@ public function dropAllQuoteChildItems($productId)
 
         if ($quoteItemIds) {
             $this->_getWriteAdapter()->delete(
-                $this->getTable('sales_quote_item'),
+                $this->getTable('quote_item'),
                 ['parent_item_id IN(?)' => $quoteItemIds]
             );
         }

app/code/Magento/Bundle/composer.json

@@ -17,6 +17,7 @@
         "magento/module-gift-message": "0.42.0-beta3",
         "magento/framework": "0.42.0-beta3",
         "magento/module-webapi": "0.42.0-beta3",
+        "magento/module-quote": "0.42.0-beta3",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",

app/code/Magento/Bundle/etc/adminhtml/di.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Sales\Model\Convert\Quote">
+    <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
         <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
     </type>
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">

app/code/Magento/Bundle/etc/catalog_attributes.xml

@@ -10,7 +10,7 @@
         <attribute name="price_view"/>
         <attribute name="price_type"/>
     </group>
-    <group name="sales_quote_item">
+    <group name="quote_item">
         <attribute name="price_view"/>
         <attribute name="price_type"/>
         <attribute name="shipment_type"/>

app/code/Magento/Bundle/etc/frontend/di.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Sales\Model\Convert\Quote">
+    <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
         <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
     </type>
 </config>