Skip to content

Commit 294906d

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'origin/2.4-develop' into B2B-582
2 parents 5c7f543 + 6b6f428 commit 294906d

File tree

116 files changed

+2730
-1306
lines changed

Some content is hidden

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

116 files changed

+2730
-1306
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@
3939
<createData entity="CustomerAccountSharingGlobal" stepKey="setConfigCustomerAccountToGlobal"/>
4040
</before>
4141

42-
<!--Create website, Sore adn Store View-->
42+
<!--Create website, Store and Store View-->
4343
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
44-
<argument name="newWebsiteName" value="secondWebsite"/>
45-
<argument name="websiteCode" value="second_website"/>
44+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
45+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
48-
<argument name="website" value="secondWebsite"/>
49-
<argument name="storeGroupName" value="secondStore"/>
50-
<argument name="storeGroupCode" value="second_store"/>
48+
<argument name="website" value="{{customWebsite.name}}"/>
49+
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
50+
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
5151
</actionGroup>
5252
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
53-
<argument name="StoreGroup" value="customStoreTierPrice"/>
54-
<argument name="customStore" value="customStoreView"/>
53+
<argument name="StoreGroup" value="customStoreGroup"/>
54+
<argument name="customStore" value="customStore"/>
5555
</actionGroup>
5656
<!--Set Configuration-->
5757
<createData entity="CatalogPriceScopeWebsite" stepKey="paymentMethodsSettingConfig"/>
@@ -63,10 +63,10 @@
6363
<argument name="product" value="$$product1$$"/>
6464
</actionGroup>
6565
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite">
66-
<argument name="website" value="secondWebsite"/>
66+
<argument name="website" value="{{customWebsite.name}}"/>
6767
</actionGroup>
6868
<actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing1">
69-
<argument name="website" value="secondWebsite"/>
69+
<argument name="website" value="{{customWebsite.name}}"/>
7070
</actionGroup>
7171

7272
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
@@ -76,10 +76,10 @@
7676
<argument name="product" value="$$product2$$"/>
7777
</actionGroup>
7878
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite2">
79-
<argument name="website" value="secondWebsite"/>
79+
<argument name="website" value="{{customWebsite.name}}"/>
8080
</actionGroup>
8181
<actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing2">
82-
<argument name="website" value="secondWebsite"/>
82+
<argument name="website" value="{{customWebsite.name}}"/>
8383
</actionGroup>
8484

8585
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct3">
@@ -89,10 +89,10 @@
8989
<argument name="product" value="$$product3$$"/>
9090
</actionGroup>
9191
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite3">
92-
<argument name="website" value="secondWebsite"/>
92+
<argument name="website" value="{{customWebsite.name}}"/>
9393
</actionGroup>
9494
<actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing3">
95-
<argument name="website" value="secondWebsite"/>
95+
<argument name="website" value="{{customWebsite.name}}"/>
9696
</actionGroup>
9797

9898
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct4">
@@ -102,10 +102,10 @@
102102
<argument name="product" value="$$product4$$"/>
103103
</actionGroup>
104104
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite4">
105-
<argument name="website" value="secondWebsite"/>
105+
<argument name="website" value="{{customWebsite.name}}"/>
106106
</actionGroup>
107107
<actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing4">
108-
<argument name="website" value="secondWebsite"/>
108+
<argument name="website" value="{{customWebsite.name}}"/>
109109
</actionGroup>
110110
<actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
111111

@@ -120,7 +120,7 @@
120120
<click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="ClickOnAccountInformationSection"/>
121121
<waitForPageLoad stepKey="waitForPageOpened1"/>
122122
<selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="Group"/>
123-
<selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="secondStoreView" stepKey="clickToSelectStore"/>
123+
<selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{customStore.name}}" stepKey="clickToSelectStore"/>
124124
<click selector="{{AdminCustomerAccountInformationSection.saveCustomer}}" stepKey="save"/>
125125
<waitForPageLoad stepKey="waitForCustomersPage"/>
126126
<see userInput="You saved the customer." stepKey="CustomerIsSaved"/>
@@ -136,7 +136,7 @@
136136
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
137137
<waitForPageLoad stepKey="waitForPageDiscountPageIsLoaded"/>
138138
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="ship" stepKey="fillRuleName"/>
139-
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="secondWebsite" stepKey="selectWebsites"/>
139+
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{customWebsite.name}}" stepKey="selectWebsites"/>
140140
<selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
141141
<selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
142142
<fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="ship" stepKey="setCode"/>
@@ -152,7 +152,7 @@
152152
<!--Create new order-->
153153
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="CreateNewOrder">
154154
<argument name="customer" value="Simple_US_Customer"/>
155-
<argument name="storeView" value="customStoreView"/>
155+
<argument name="storeView" value="customStore"/>
156156
</actionGroup>
157157

158158
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct"/>
@@ -327,7 +327,7 @@
327327
<argument name="ruleName" value="ship"/>
328328
</actionGroup>
329329
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
330-
<argument name="websiteName" value="secondWebsite"/>
330+
<argument name="websiteName" value="{{customWebsite.name}}"/>
331331
</actionGroup>
332332
<createData entity="CustomerAccountSharingDefault" stepKey="setConfigCustomerAccountDefault"/>
333333
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66

77
namespace Magento\CatalogInventory\Model\ResourceModel;
88

9+
use Magento\Catalog\Model\ResourceModel\Product\Collection;
910
use Magento\CatalogInventory\Api\StockConfigurationInterface;
11+
use Magento\CatalogInventory\Model\Configuration;
12+
use Magento\Framework\App\Config\ScopeConfigInterface;
13+
use Magento\Framework\DB\Select;
14+
use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
15+
use Magento\Framework\Model\ResourceModel\Db\Context;
16+
use Magento\Framework\Stdlib\DateTime\DateTime;
17+
use Magento\Store\Model\ScopeInterface;
1018
use Magento\Store\Model\StoreManagerInterface;
1119

1220
/**
1321
* Stock resource model
1422
*/
15-
class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements QtyCounterInterface
23+
class Stock extends AbstractDb implements QtyCounterInterface
1624
{
1725
/**
1826
* @var StockConfigurationInterface
@@ -64,12 +72,12 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
6472
/**
6573
* Core store config
6674
*
67-
* @var \Magento\Framework\App\Config\ScopeConfigInterface
75+
* @var ScopeConfigInterface
6876
*/
6977
protected $_scopeConfig;
7078

7179
/**
72-
* @var \Magento\Framework\Stdlib\DateTime\DateTime
80+
* @var DateTime
7381
*/
7482
protected $dateTime;
7583

@@ -80,17 +88,17 @@ class Stock extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb impleme
8088
protected $storeManager;
8189

8290
/**
83-
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
84-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
85-
* @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
91+
* @param Context $context
92+
* @param ScopeConfigInterface $scopeConfig
93+
* @param DateTime $dateTime
8694
* @param StockConfigurationInterface $stockConfiguration
8795
* @param StoreManagerInterface $storeManager
8896
* @param string $connectionName
8997
*/
9098
public function __construct(
91-
\Magento\Framework\Model\ResourceModel\Db\Context $context,
92-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
93-
\Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
99+
Context $context,
100+
ScopeConfigInterface $scopeConfig,
101+
DateTime $dateTime,
94102
StockConfigurationInterface $stockConfiguration,
95103
StoreManagerInterface $storeManager,
96104
$connectionName = null
@@ -125,9 +133,18 @@ public function lockProductsStock(array $productIds, $websiteId)
125133
return [];
126134
}
127135
$itemTable = $this->getTable('cataloginventory_stock_item');
128-
$select = $this->getConnection()->select()->from(['si' => $itemTable])
136+
137+
//get indexed entries for row level lock instead of table lock
138+
$itemIds = [];
139+
$preSelect = $this->getConnection()->select()->from($itemTable, 'item_id')
129140
->where('website_id = ?', $websiteId)
130-
->where('product_id IN(?)', $productIds)
141+
->where('product_id IN(?)', $productIds);
142+
foreach ($this->getConnection()->query($preSelect)->fetchAll() as $item) {
143+
$itemIds[] = (int)$item['item_id'];
144+
}
145+
146+
$select = $this->getConnection()->select()->from(['si' => $itemTable])
147+
->where('item_id IN (?)', $itemIds)
131148
->forUpdate(true);
132149

133150
$productTable = $this->getTable('catalog_product_entity');
@@ -147,12 +164,12 @@ public function lockProductsStock(array $productIds, $websiteId)
147164
foreach ($this->getConnection()->fetchAll($selectProducts) as $p) {
148165
$items[$p['product_id']]['type_id'] = $p['type_id'];
149166
}
150-
167+
151168
return $items;
152169
}
153170

154171
/**
155-
* {@inheritdoc}
172+
* @inheritdoc
156173
*/
157174
public function correctItemsQty(array $items, $websiteId, $operator)
158175
{
@@ -185,16 +202,16 @@ protected function _initConfig()
185202
{
186203
if (!$this->_isConfig) {
187204
$configMap = [
188-
'_isConfigManageStock' => \Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
189-
'_isConfigBackorders' => \Magento\CatalogInventory\Model\Configuration::XML_PATH_BACKORDERS,
190-
'_configMinQty' => \Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_QTY,
191-
'_configNotifyStockQty' => \Magento\CatalogInventory\Model\Configuration::XML_PATH_NOTIFY_STOCK_QTY,
205+
'_isConfigManageStock' => Configuration::XML_PATH_MANAGE_STOCK,
206+
'_isConfigBackorders' => Configuration::XML_PATH_BACKORDERS,
207+
'_configMinQty' => Configuration::XML_PATH_MIN_QTY,
208+
'_configNotifyStockQty' => Configuration::XML_PATH_NOTIFY_STOCK_QTY,
192209
];
193210

194211
foreach ($configMap as $field => $const) {
195212
$this->{$field} = (int) $this->_scopeConfig->getValue(
196213
$const,
197-
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
214+
ScopeInterface::SCOPE_STORE
198215
);
199216
}
200217

@@ -317,11 +334,11 @@ public function updateLowStockDate($website)
317334
/**
318335
* Add low stock filter to product collection
319336
*
320-
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
337+
* @param Collection $collection
321338
* @param array $fields
322339
* @return $this
323340
*/
324-
public function addLowStockFilter(\Magento\Catalog\Model\ResourceModel\Product\Collection $collection, $fields)
341+
public function addLowStockFilter(Collection $collection, $fields)
325342
{
326343
$this->_initConfig();
327344
$connection = $collection->getSelect()->getConnection();
@@ -344,14 +361,14 @@ public function addLowStockFilter(\Magento\Catalog\Model\ResourceModel\Product\C
344361

345362
$where = [];
346363
foreach ($conditions as $k => $part) {
347-
$where[$k] = join(' ' . \Magento\Framework\DB\Select::SQL_AND . ' ', $part);
364+
$where[$k] = join(' ' . Select::SQL_AND . ' ', $part);
348365
}
349366

350367
$where = $connection->prepareSqlCondition(
351368
'invtr.low_stock_date',
352369
['notnull' => true]
353-
) . ' ' . \Magento\Framework\DB\Select::SQL_AND . ' ((' . join(
354-
') ' . \Magento\Framework\DB\Select::SQL_OR . ' (',
370+
) . ' ' . Select::SQL_AND . ' ((' . join(
371+
') ' . Select::SQL_OR . ' (',
355372
$where
356373
) . '))';
357374

0 commit comments

Comments
 (0)