Skip to content

Commit 9f21d21

Browse files
vpelipenkovpelipenko
committed
Merge pull request #33 from magento-firedrakes/MAGETWO-31593
[Firedrakes] Sales Quote as Standalone Magento Module
2 parents 3de5edb + 6ca8249 commit 9f21d21

File tree

594 files changed

+6857
-5301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+6857
-5301
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Grid widget massaction block
1212
*
13-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
13+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1414
* @method boolean getHideFormElement()
1515
* @author Magento Core Team <core@magentocommerce.com>
1616
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Grid widget massaction block
1010
*
11-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
11+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1212
* @method boolean getHideFormElement()
1313
* @author Magento Core Team <core@magentocommerce.com>
1414
* @deprecated support Magento 1.x grid massaction implementation

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
2828
/**
2929
* Quote model object
3030
*
31-
* @var \Magento\Sales\Model\Quote
31+
* @var \Magento\Quote\Model\Quote
3232
*/
3333
protected $_quote;
3434

@@ -59,7 +59,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
5959
/**
6060
* Sales quote repository
6161
*
62-
* @var \Magento\Sales\Model\QuoteRepository
62+
* @var \Magento\Quote\Model\QuoteRepository
6363
*/
6464
protected $quoteRepository;
6565

@@ -83,7 +83,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
8383
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
8484
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
8585
* @param CustomerRepositoryInterface $customerRepository
86-
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
86+
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
8787
* @param \Magento\Sales\Model\OrderFactory $orderFactory
8888
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
8989
* @param GroupManagementInterface $groupManagement
@@ -98,7 +98,7 @@ public function __construct(
9898
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
9999
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
100100
CustomerRepositoryInterface $customerRepository,
101-
\Magento\Sales\Model\QuoteRepository $quoteRepository,
101+
\Magento\Quote\Model\QuoteRepository $quoteRepository,
102102
\Magento\Sales\Model\OrderFactory $orderFactory,
103103
\Magento\Store\Model\StoreManagerInterface $storeManager,
104104
GroupManagementInterface $groupManagement
@@ -127,7 +127,7 @@ public function __construct(
127127
/**
128128
* Retrieve quote model object
129129
*
130-
* @return \Magento\Sales\Model\Quote
130+
* @return \Magento\Quote\Model\Quote
131131
*/
132132
public function getQuote()
133133
{

‎app/code/Magento/Backend/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"magento/module-theme": "0.42.0-beta3",
1212
"magento/module-reports": "0.42.0-beta3",
1313
"magento/module-sales": "0.42.0-beta3",
14+
"magento/module-quote": "0.42.0-beta3",
1415
"magento/module-catalog": "0.42.0-beta3",
1516
"magento/module-user": "0.42.0-beta3",
1617
"magento/module-backup": "0.42.0-beta3",

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@ class QuoteItem
1212
/**
1313
* Add bundle attributes to order data
1414
*
15-
* @param \Magento\Sales\Model\Convert\Quote $subject
16-
* @param Closure $proceed
17-
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
15+
* @param \Magento\Quote\Model\Quote\Item\ToOrderItem $subject
16+
* @param callable $proceed
17+
* @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
18+
* @param array $additional
1819
* @return \Magento\Sales\Model\Order\Item
1920
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
2021
*/
21-
public function aroundItemToOrderItem(
22-
\Magento\Sales\Model\Convert\Quote $subject,
22+
public function aroundConvert(
23+
\Magento\Quote\Model\Quote\Item\ToOrderItem $subject,
2324
Closure $proceed,
24-
\Magento\Sales\Model\Quote\Item\AbstractItem $item
25+
\Magento\Quote\Model\Quote\Item\AbstractItem $item,
26+
$additional
2527
) {
2628
/** @var $orderItem \Magento\Sales\Model\Order\Item */
27-
$orderItem = $proceed($item);
29+
$orderItem = $proceed($item, $additional);
2830

2931
if ($attributes = $item->getProduct()->getCustomOption('bundle_selection_attributes')) {
3032
$productOptions = $orderItem->getProductOptions();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function dropAllQuoteChildItems($productId)
8585
{
8686
$quoteItemIds = $this->_getReadAdapter()->fetchCol(
8787
$this->_getReadAdapter()->select()->from(
88-
$this->getTable('sales_quote_item'),
88+
$this->getTable('quote_item'),
8989
['item_id']
9090
)->where(
9191
'product_id = :product_id'
@@ -95,7 +95,7 @@ public function dropAllQuoteChildItems($productId)
9595

9696
if ($quoteItemIds) {
9797
$this->_getWriteAdapter()->delete(
98-
$this->getTable('sales_quote_item'),
98+
$this->getTable('quote_item'),
9999
['parent_item_id IN(?)' => $quoteItemIds]
100100
);
101101
}

‎app/code/Magento/Bundle/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"magento/module-gift-message": "0.42.0-beta3",
1818
"magento/framework": "0.42.0-beta3",
1919
"magento/module-webapi": "0.42.0-beta3",
20+
"magento/module-quote": "0.42.0-beta3",
2021
"magento/magento-composer-installer": "*"
2122
},
2223
"type": "magento2-module",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9-
<type name="Magento\Sales\Model\Convert\Quote">
9+
<type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
1010
<plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
1111
</type>
1212
<type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<attribute name="price_view"/>
1111
<attribute name="price_type"/>
1212
</group>
13-
<group name="sales_quote_item">
13+
<group name="quote_item">
1414
<attribute name="price_view"/>
1515
<attribute name="price_type"/>
1616
<attribute name="shipment_type"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9-
<type name="Magento\Sales\Model\Convert\Quote">
9+
<type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
1010
<plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
1111
</type>
1212
</config>

‎app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@
88
class QuoteItemProductOption
99
{
1010
/**
11-
* @param \Magento\Sales\Model\Convert\Quote $subject
11+
* @param \Magento\Quote\Model\Quote\Item\ToOrderItem $subject
1212
* @param callable $proceed
13-
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
14-
*
13+
* @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
14+
* @param array $additional
1515
* @return \Magento\Sales\Model\Order\Item
1616
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
1717
*/
18-
public function aroundItemToOrderItem(
19-
\Magento\Sales\Model\Convert\Quote $subject,
18+
public function aroundConvert(
19+
\Magento\Quote\Model\Quote\Item\ToOrderItem $subject,
2020
\Closure $proceed,
21-
\Magento\Sales\Model\Quote\Item\AbstractItem $item
21+
\Magento\Quote\Model\Quote\Item\AbstractItem $item,
22+
$additional
2223
) {
2324
/** @var $orderItem \Magento\Sales\Model\Order\Item */
24-
$orderItem = $proceed($item);
25+
$orderItem = $proceed($item, $additional);
2526

2627
if (is_array($item->getOptions())) {
2728
foreach ($item->getOptions() as $itemOption) {

‎app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function getConfigurationItemOption()
134134
}
135135

136136
// Back compatibility with quote specific keys to set configuration item options
137-
if ($this->_getData('quote_item_option') instanceof \Magento\Sales\Model\Quote\Item\Option) {
137+
if ($this->_getData('quote_item_option') instanceof \Magento\Quote\Model\Quote\Item\Option) {
138138
return $this->_getData('quote_item_option');
139139
}
140140

@@ -157,7 +157,7 @@ public function getConfigurationItem()
157157
}
158158

159159
// Back compatibility with quote specific keys to set configuration item
160-
if ($this->_getData('quote_item') instanceof \Magento\Sales\Model\Quote\Item) {
160+
if ($this->_getData('quote_item') instanceof \Magento\Quote\Model\Quote\Item) {
161161
return $this->_getData('quote_item');
162162
}
163163

‎app/code/Magento/Catalog/Model/Product/Option/Type/File.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
5353
/**
5454
* Item option factory
5555
*
56-
* @var \Magento\Sales\Model\Quote\Item\OptionFactory
56+
* @var \Magento\Quote\Model\Quote\Item\OptionFactory
5757
*/
5858
protected $_itemOptionFactory;
5959

@@ -70,7 +70,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
7070
/**
7171
* @param \Magento\Checkout\Model\Session $checkoutSession
7272
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
73-
* @param \Magento\Sales\Model\Quote\Item\OptionFactory $itemOptionFactory
73+
* @param \Magento\Quote\Model\Quote\Item\OptionFactory $itemOptionFactory
7474
* @param \Magento\Catalog\Model\Product\Option\UrlBuilder $urlBuilder
7575
* @param \Magento\Framework\Escaper $escaper
7676
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
@@ -82,7 +82,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
8282
public function __construct(
8383
\Magento\Checkout\Model\Session $checkoutSession,
8484
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
85-
\Magento\Sales\Model\Quote\Item\OptionFactory $itemOptionFactory,
85+
\Magento\Quote\Model\Quote\Item\OptionFactory $itemOptionFactory,
8686
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
8787
\Magento\Catalog\Model\Product\Option\Type\File\ValidatorInfo $validatorInfo,
8888
\Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile $validatorFile,

‎app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ public function prepareQuoteItemQty($qty, $product)
903903
* For example if product which was added to option already removed from catalog.
904904
*
905905
* @param \Magento\Catalog\Model\Product $optionProduct
906-
* @param \Magento\Sales\Model\Quote\Item\Option $option
906+
* @param \Magento\Quote\Model\Quote\Item\Option $option
907907
* @param \Magento\Catalog\Model\Product $product
908908
* @return $this
909909
*/

‎app/code/Magento/Catalog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"magento/module-catalog-inventory": "0.42.0-beta3",
2121
"magento/module-directory": "0.42.0-beta3",
2222
"magento/module-catalog-rule": "0.42.0-beta3",
23-
"magento/module-sales": "0.42.0-beta3",
2423
"magento/module-product-alert": "0.42.0-beta3",
2524
"magento/module-url-rewrite": "0.42.0-beta3",
2625
"magento/module-catalog-url-rewrite": "0.42.0-beta3",
2726
"magento/module-page-cache": "0.42.0-beta3",
27+
"magento/module-quote": "0.42.0-beta3",
2828
"magento/framework": "0.42.0-beta3",
2929
"magento/magento-composer-installer": "*"
3030
},

‎app/code/Magento/Catalog/etc/frontend/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<argument name="fetchStrategy" xsi:type="object">Magento\Framework\Data\Collection\Db\FetchStrategy\Cache</argument>
1212
</arguments>
1313
</type>
14-
<type name="Magento\Sales\Model\Convert\Quote">
14+
<type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
1515
<plugin name="copy_quote_files_to_order" type="Magento\Catalog\Model\Plugin\QuoteItemProductOption"/>
1616
</type>
1717
<type name="Magento\Catalog\Model\Indexer\AbstractFlatState">

‎app/code/Magento/CatalogInventory/Model/Observer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\CatalogInventory\Api\StockRegistryInterface;
1313
use Magento\CatalogInventory\Model\Stock\Item;
1414
use Magento\Framework\Event\Observer as EventObserver;
15-
use Magento\Sales\Model\Quote\Item as QuoteItem;
15+
use Magento\Quote\Model\Quote\Item as QuoteItem;
1616

1717
/**
1818
* Catalog inventory module observer
@@ -333,7 +333,7 @@ public function updateItemsStockUponConfigChange($observer)
333333
*/
334334
public function subtractQuoteInventory(EventObserver $observer)
335335
{
336-
/** @var \Magento\Sales\Model\Quote $quote */
336+
/** @var \Magento\Quote\Model\Quote $quote */
337337
$quote = $observer->getEvent()->getQuote();
338338

339339
// Maybe we've already processed this quote in some event during order placement

‎app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct(
6060
*/
6161
public function validate(\Magento\Framework\Event\Observer $observer)
6262
{
63-
/* @var $quoteItem \Magento\Sales\Model\Quote\Item */
63+
/* @var $quoteItem \Magento\Quote\Model\Quote\Item */
6464
$quoteItem = $observer->getEvent()->getItem();
6565

6666
if (!$quoteItem ||
@@ -197,7 +197,7 @@ public function validate(\Magento\Framework\Event\Observer $observer)
197197
/**
198198
* Removes error statuses from quote and item, set by this observer
199199
*
200-
* @param \Magento\Sales\Model\Quote\Item $item
200+
* @param \Magento\Quote\Model\Quote\Item $item
201201
* @param int $code
202202
* @return void
203203
*/

‎app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ public function __construct(
4444
/**
4545
* Init stock item
4646
*
47-
* @param \Magento\Sales\Model\Quote\Item\Option $option
48-
* @param \Magento\Sales\Model\Quote\Item $quoteItem
47+
* @param \Magento\Quote\Model\Quote\Item\Option $option
48+
* @param \Magento\Quote\Model\Quote\Item $quoteItem
4949
*
5050
* @return \Magento\CatalogInventory\Model\Stock\Item
5151
* @throws \Magento\Framework\Model\Exception
5252
*/
5353
public function getStockItem(
54-
\Magento\Sales\Model\Quote\Item\Option $option,
55-
\Magento\Sales\Model\Quote\Item $quoteItem
54+
\Magento\Quote\Model\Quote\Item\Option $option,
55+
\Magento\Quote\Model\Quote\Item $quoteItem
5656
) {
5757
$stockItem = $this->stockRegistry->getStockItem(
5858
$option->getProduct()->getId(),
@@ -76,16 +76,16 @@ public function getStockItem(
7676
/**
7777
* Initialize item option
7878
*
79-
* @param \Magento\Sales\Model\Quote\Item\Option $option
80-
* @param \Magento\Sales\Model\Quote\Item $quoteItem
79+
* @param \Magento\Quote\Model\Quote\Item\Option $option
80+
* @param \Magento\Quote\Model\Quote\Item $quoteItem
8181
* @param int $qty
8282
*
8383
* @return \Magento\Framework\Object
8484
* @throws \Magento\Framework\Model\Exception
8585
*/
8686
public function initialize(
87-
\Magento\Sales\Model\Quote\Item\Option $option,
88-
\Magento\Sales\Model\Quote\Item $quoteItem,
87+
\Magento\Quote\Model\Quote\Item\Option $option,
88+
\Magento\Quote\Model\Quote\Item $quoteItem,
8989
$qty
9090
) {
9191
$optionValue = $option->getValue();

‎app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer;
77

88
use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\QuoteItemQtyList;
9-
use Magento\Sales\Model\Quote\Item;
9+
use Magento\Quote\Model\Quote\Item;
1010

1111
/**
1212
* Class QtyProcessor

‎app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public function __construct(
4545
* Initialize stock item
4646
*
4747
* @param \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem
48-
* @param \Magento\Sales\Model\Quote\Item $quoteItem
48+
* @param \Magento\Quote\Model\Quote\Item $quoteItem
4949
* @param int $qty
5050
*
5151
* @return \Magento\Framework\Object
5252
* @throws \Magento\Framework\Model\Exception
5353
*/
5454
public function initialize(
5555
\Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem,
56-
\Magento\Sales\Model\Quote\Item $quoteItem,
56+
\Magento\Quote\Model\Quote\Item $quoteItem,
5757
$qty
5858
) {
5959
/**

‎app/code/Magento/CatalogInventory/Model/Stock/Item.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,14 +462,14 @@ public function getManageStock()
462462
/**
463463
* Add error to Quote Item
464464
*
465-
* @param \Magento\Sales\Model\Quote\Item $item
465+
* @param \Magento\Quote\Model\Quote\Item $item
466466
* @param string $itemError
467467
* @param string $quoteError
468468
* @param string $errorIndex
469469
* @return $this
470470
*/
471471
protected function _addQuoteItemError(
472-
\Magento\Sales\Model\Quote\Item $item,
472+
\Magento\Quote\Model\Quote\Item $item,
473473
$itemError,
474474
$quoteError,
475475
$errorIndex = 'error'

‎app/code/Magento/CatalogInventory/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"magento/module-customer": "0.42.0-beta3",
99
"magento/module-backend": "0.42.0-beta3",
1010
"magento/module-indexer": "0.42.0-beta3",
11-
"magento/module-sales": "0.42.0-beta3",
1211
"magento/module-eav": "0.42.0-beta3",
12+
"magento/module-quote": "0.42.0-beta3",
1313
"magento/framework": "0.42.0-beta3",
1414
"magento/magento-composer-installer": "*"
1515
},

‎app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
3333
/**
3434
* Return payment model
3535
*
36-
* @return \Magento\Sales\Model\Quote\Payment
36+
* @return \Magento\Quote\Model\Quote\Payment
3737
*/
3838
protected function _getPayment()
3939
{

0 commit comments

Comments
 (0)