Skip to content

Commit 4859ac8

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MC-18402
2 parents c2187b2 + 49b62a4 commit 4859ac8

File tree

62 files changed

+1364
-364
lines changed

Some content is hidden

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

62 files changed

+1364
-364
lines changed

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
2626
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
2727
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
28-
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="11" stepKey="selectAdvancedReportingHour"/>
29-
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="11" stepKey="selectAdvancedReportingMinute"/>
30-
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="00" stepKey="selectAdvancedReportingSeconds"/>
28+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="23" stepKey="selectAdvancedReportingHour"/>
29+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingMinute}}" userInput="59" stepKey="selectAdvancedReportingMinute"/>
30+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingSeconds}}" userInput="59" stepKey="selectAdvancedReportingSeconds"/>
3131
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
3232
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
3333
</test>

‎app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<section name="LocaleOptionsSection">
1212
<element name="sectionHeader" type="text" selector="#general_locale-head"/>
1313
<element name="timezone" type="select" selector="#general_locale_timezone"/>
14+
<element name="locale" type="select" selector="#general_locale_code"/>
15+
<element name="localeEnabled" type="select" selector="#general_locale_code:enabled"/>
16+
<element name="localeDisabled" type="select" selector="#general_locale_code[disabled=disabled]"/>
1417
<element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
1518
</section>
1619
</sections>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest">
12+
<annotations>
13+
<features value="Backend"/>
14+
<title value="Check locale dropdown and developer configuration page are available in developer mode"/>
15+
<description value="Check locale dropdown and developer configuration page are available in developer mode"/>
16+
<group value="backend"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-20374"/>
19+
<group value="developer_mode_only"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
</before>
25+
26+
<!-- Go to the general configuration and make sure the locale dropdown is available and enabled -->
27+
<actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
28+
<scrollTo selector="{{LocaleOptionsSection.sectionHeader}}" stepKey="scrollToLocaleSection" x="0" y="-80" />
29+
<conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
30+
<seeElement selector="{{LocaleOptionsSection.localeEnabled}}" stepKey="seeEnabledLocaleDropdown"/>
31+
32+
<!-- Go to the developer configuration and make sure the page is available -->
33+
<actionGroup ref="AdminOpenStoreConfigDeveloperPageActionGroup" stepKey="goToDeveloperConfigPage"/>
34+
<seeInCurrentUrl url="{{AdminConfigDeveloperPage.url}}" stepKey="seeDeveloperConfigUrl"/>
35+
<seeElement selector="{{AdminConfigSection.navItemByTitle('Developer')}}" stepKey="assertDeveloperNavItemPresent" />
36+
</test>
37+
</tests>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCheckLocaleAndDeveloperConfigInProductionModeTest">
12+
<annotations>
13+
<features value="Backend"/>
14+
<title value="Check locale dropdown and developer configuration page are not available in production mode"/>
15+
<description value="Check locale dropdown and developer configuration page are not available in production mode"/>
16+
<testCaseId value="MC-14106" />
17+
<severity value="MAJOR"/>
18+
<group value="backend"/>
19+
<group value="production_mode_only"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
</before>
25+
26+
<!-- Go to the general configuration and make sure the locale dropdown is disabled -->
27+
<actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
28+
<scrollTo selector="{{LocaleOptionsSection.sectionHeader}}" stepKey="scrollToLocaleSection" x="0" y="-80" />
29+
<conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
30+
<assertElementContainsAttribute selector="{{LocaleOptionsSection.locale}}" attribute="disabled" stepKey="seeDisabledLocaleDropdown" />
31+
32+
<!-- Go to the developer configuration and make sure the redirect to the configuration page takes place -->
33+
<actionGroup ref="AdminOpenStoreConfigDeveloperPageActionGroup" stepKey="goToDeveloperConfigPage"/>
34+
<seeInCurrentUrl url="{{AdminConfigPage.url}}index/" stepKey="seeConfigurationIndexUrl"/>
35+
36+
<actionGroup ref="AdminExpandConfigTabActionGroup" stepKey="expandAdvancedTab">
37+
<argument name="tabName" value="Advanced" />
38+
</actionGroup>
39+
<dontSeeElement selector="{{AdminConfigSection.navItemByTitle('Developer')}}" stepKey="assertDeveloperNavItemAbsent" />
40+
</test>
41+
</tests>

‎app/code/Magento/Catalog/Model/ResourceModel/Category.php

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
*
1010
* @author Magento Core Team <core@magentocommerce.com>
1111
*/
12+
declare(strict_types=1);
13+
1214
namespace Magento\Catalog\Model\ResourceModel;
1315

1416
use Magento\Catalog\Model\Indexer\Category\Product\Processor;
1517
use Magento\Framework\App\ObjectManager;
1618
use Magento\Framework\DataObject;
1719
use Magento\Framework\EntityManager\EntityManager;
18-
use Magento\Catalog\Model\Category as CategoryEntity;
20+
use Magento\Catalog\Setup\CategorySetup;
1921

2022
/**
2123
* Resource model for category entity
@@ -92,6 +94,7 @@ class Category extends AbstractResource
9294
* @var Processor
9395
*/
9496
private $indexerProcessor;
97+
9598
/**
9699
* Category constructor.
97100
* @param \Magento\Eav\Model\Entity\Context $context
@@ -275,7 +278,7 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
275278
if ($object->getPosition() === null) {
276279
$object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
277280
}
278-
$path = explode('/', $object->getPath());
281+
$path = explode('/', (string)$object->getPath());
279282
$level = count($path) - ($object->getId() ? 1 : 0);
280283
$toUpdateChild = array_diff($path, [$object->getId()]);
281284

@@ -314,7 +317,7 @@ protected function _afterSave(\Magento\Framework\DataObject $object)
314317
/**
315318
* Add identifier for new category
316319
*/
317-
if (substr($object->getPath(), -1) == '/') {
320+
if (substr((string)$object->getPath(), -1) == '/') {
318321
$object->setPath($object->getPath() . $object->getId());
319322
$this->_savePath($object);
320323
}
@@ -352,7 +355,7 @@ protected function _getMaxPosition($path)
352355
{
353356
$connection = $this->getConnection();
354357
$positionField = $connection->quoteIdentifier('position');
355-
$level = count(explode('/', $path));
358+
$level = count(explode('/', (string)$path));
356359
$bind = ['c_level' => $level, 'c_path' => $path . '/%'];
357360
$select = $connection->select()->from(
358361
$this->getTable('catalog_category_entity'),
@@ -717,7 +720,7 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
717720
*/
718721
public function getParentCategories($category)
719722
{
720-
$pathIds = array_reverse(explode(',', $category->getPathInStore()));
723+
$pathIds = array_reverse(explode(',', (string)$category->getPathInStore()));
721724
/** @var \Magento\Catalog\Model\ResourceModel\Category\Collection $categories */
722725
$categories = $this->_categoryCollectionFactory->create();
723726
return $categories->setStore(
@@ -1134,4 +1137,44 @@ private function getAggregateCount()
11341137
}
11351138
return $this->aggregateCount;
11361139
}
1140+
1141+
/**
1142+
* Get category with children.
1143+
*
1144+
* @param int $categoryId
1145+
* @return array
1146+
*/
1147+
public function getCategoryWithChildren(int $categoryId): array
1148+
{
1149+
$connection = $this->getConnection();
1150+
1151+
$selectAttributeCode = $connection->select()
1152+
->from(
1153+
['eav_attribute' => $this->getTable('eav_attribute')],
1154+
['attribute_id']
1155+
)->where('entity_type_id = ?', CategorySetup::CATEGORY_ENTITY_TYPE_ID)
1156+
->where('attribute_code = ?', 'is_anchor')
1157+
->limit(1);
1158+
$isAnchorAttributeCode = $connection->fetchOne($selectAttributeCode);
1159+
if (empty($isAnchorAttributeCode) || (int)$isAnchorAttributeCode <= 0) {
1160+
return [];
1161+
}
1162+
1163+
$select = $connection->select()
1164+
->from(
1165+
['cce' => $this->getTable('catalog_category_entity')],
1166+
['entity_id', 'parent_id', 'path']
1167+
)->join(
1168+
['cce_int' => $this->getTable('catalog_category_entity_int')],
1169+
'cce.entity_id = cce_int.entity_id',
1170+
['is_anchor' => 'cce_int.value']
1171+
)->where(
1172+
'cce_int.attribute_id = ?',
1173+
$isAnchorAttributeCode
1174+
)->where(
1175+
"cce.path LIKE '%/{$categoryId}' OR cce.path LIKE '%/{$categoryId}/%'"
1176+
)->order('path');
1177+
1178+
return $connection->fetchAll($select);
1179+
}
11371180
}

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Catalog\Model\ResourceModel\Product;
89

@@ -22,6 +23,7 @@
2223
use Magento\Framework\Indexer\DimensionFactory;
2324
use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
2425
use Magento\Store\Model\Store;
26+
use Magento\Catalog\Model\ResourceModel\Category;
2527

2628
/**
2729
* Product collection
@@ -302,6 +304,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
302304
*/
303305
private $urlFinder;
304306

307+
/**
308+
* @var Category
309+
*/
310+
private $categoryResourceModel;
311+
305312
/**
306313
* Collection constructor
307314
*
@@ -330,6 +337,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
330337
* @param TableMaintainer|null $tableMaintainer
331338
* @param PriceTableResolver|null $priceTableResolver
332339
* @param DimensionFactory|null $dimensionFactory
340+
* @param Category|null $categoryResourceModel
333341
*
334342
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
335343
*/
@@ -358,7 +366,8 @@ public function __construct(
358366
MetadataPool $metadataPool = null,
359367
TableMaintainer $tableMaintainer = null,
360368
PriceTableResolver $priceTableResolver = null,
361-
DimensionFactory $dimensionFactory = null
369+
DimensionFactory $dimensionFactory = null,
370+
Category $categoryResourceModel = null
362371
) {
363372
$this->moduleManager = $moduleManager;
364373
$this->_catalogProductFlatState = $catalogProductFlatState;
@@ -392,6 +401,8 @@ public function __construct(
392401
$this->priceTableResolver = $priceTableResolver ?: ObjectManager::getInstance()->get(PriceTableResolver::class);
393402
$this->dimensionFactory = $dimensionFactory
394403
?: ObjectManager::getInstance()->get(DimensionFactory::class);
404+
$this->categoryResourceModel = $categoryResourceModel ?: ObjectManager::getInstance()
405+
->get(Category::class);
395406
}
396407

397408
/**
@@ -1673,7 +1684,11 @@ public function addFilterByRequiredOptions()
16731684
public function setVisibility($visibility)
16741685
{
16751686
$this->_productLimitationFilters['visibility'] = $visibility;
1676-
$this->_applyProductLimitations();
1687+
if ($this->getStoreId() == Store::DEFAULT_STORE_ID) {
1688+
$this->addAttributeToFilter('visibility', $visibility);
1689+
} else {
1690+
$this->_applyProductLimitations();
1691+
}
16771692

16781693
return $this;
16791694
}
@@ -2053,12 +2068,13 @@ protected function _applyProductLimitations()
20532068
protected function _applyZeroStoreProductLimitations()
20542069
{
20552070
$filters = $this->_productLimitationFilters;
2071+
$categories = $this->getChildrenCategories((int)$filters['category_id']);
20562072

20572073
$conditions = [
20582074
'cat_pro.product_id=e.entity_id',
20592075
$this->getConnection()->quoteInto(
2060-
'cat_pro.category_id=?',
2061-
$filters['category_id']
2076+
'cat_pro.category_id IN (?)',
2077+
$categories
20622078
),
20632079
];
20642080
$joinCond = join(' AND ', $conditions);
@@ -2079,6 +2095,39 @@ protected function _applyZeroStoreProductLimitations()
20792095
return $this;
20802096
}
20812097

2098+
/**
2099+
* Get children categories.
2100+
*
2101+
* @param int $categoryId
2102+
* @return array
2103+
*/
2104+
private function getChildrenCategories(int $categoryId): array
2105+
{
2106+
$categoryIds[] = $categoryId;
2107+
$anchorCategory = [];
2108+
2109+
$categories = $this->categoryResourceModel->getCategoryWithChildren($categoryId);
2110+
if (empty($categories)) {
2111+
return $categoryIds;
2112+
}
2113+
2114+
$firstCategory = array_shift($categories);
2115+
if ($firstCategory['is_anchor'] == 1) {
2116+
$anchorCategory[] = (int)$firstCategory['entity_id'];
2117+
foreach ($categories as $category) {
2118+
if (in_array($category['parent_id'], $categoryIds)
2119+
&& in_array($category['parent_id'], $anchorCategory)) {
2120+
$categoryIds[] = (int)$category['entity_id'];
2121+
if ($category['is_anchor'] == 1) {
2122+
$anchorCategory[] = (int)$category['entity_id'];
2123+
}
2124+
}
2125+
}
2126+
}
2127+
2128+
return $categoryIds;
2129+
}
2130+
20822131
/**
20832132
* Add category ids to loaded items
20842133
*

‎app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ private function getSearchResultApplier(SearchResultInterface $searchResult): Se
393393
/** This variable sets by serOrder method, but doesn't have a getter method. */
394394
'orders' => $this->_orders,
395395
'size' => $this->getPageSize(),
396+
'currentPage' => (int)$this->_curPage,
396397
]
397398
);
398399
}

‎app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ public function testLike()
183183
'searchResult' => $searchResult,
184184
'orders' => [],
185185
'size' => $pageSize,
186+
'currentPage' => 0,
186187
]
187188
)
188189
->willReturn($searchResultApplier);

‎app/code/Magento/Checkout/etc/frontend/sections.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Customer:etc/sections.xsd">
1010
<action name="checkout/cart/add">
1111
<section name="cart"/>
12+
<section name="directory-data"/>
1213
</action>
1314
<action name="checkout/cart/delete">
1415
<section name="cart"/>

‎app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ define([
103103
});
104104

105105
if (
106-
cartData().website_id !== window.checkout.websiteId &&
107-
cartData().website_id !== undefined
106+
cartData().website_id !== window.checkout.websiteId && cartData().website_id !== undefined ||
107+
cartData().storeId !== window.checkout.storeId && cartData().storeId !== undefined
108108
) {
109109
customerData.reload(['cart'], false);
110110
}

0 commit comments

Comments
 (0)