Skip to content

Commit c9a246a

Browse files
zakdmazakdma
authored
Merge pull request #5544 from magento-tsg-csl3/2.4-develop-pr21
[TSG-CSL3] For 2.4 (pr21)
2 parents 42e615f + c0ddaff commit c9a246a

File tree

50 files changed

+1092
-319
lines changed

Some content is hidden

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

50 files changed

+1092
-319
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,9 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
17351735
if ($attribute == 'price' && $storeId != 0) {
17361736
$this->addPriceData();
17371737
if ($this->_productLimitationFilters->isUsingPriceIndex()) {
1738-
$this->getSelect()->order("price_index.min_price {$dir}");
1738+
$this->getSelect()->order(
1739+
new \Zend_Db_Expr("price_index.min_price = 0, price_index.min_price {$dir}")
1740+
);
17391741
return $this;
17401742
}
17411743
}

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertNotExistProductInRecentlyComparedWidgetActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<!-- Check the product not exist in recently compared widget -->
10+
<actionGroup name="StorefrontAssertNotExistProductInRecentlyComparedWidgetActionGroup">
11+
<annotations>
12+
<description>Validate that the provided Product does not appear in the Recently Compared Products widget.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="product"/>
16+
</arguments>
17+
18+
<waitForElementVisible selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" stepKey="waitLoadingRecentlyComparedProductsGrid"/>
19+
<dontSee selector="{{StorefrontWidgetsSection.widgetRecentlyComparedProductsGrid}}" userInput="{{product.name}}" stepKey="dontSeeProductInRecentlyComparedWidget"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StoreFrontRecentlyComparedAtWebsiteLevelTest">
11+
<annotations>
12+
<stories value="Recently Compared Product"/>
13+
<title value="Recently Compared Product at website level"/>
14+
<description value="Recently Compared Products widget appears on a page immediately after adding product to compare"/>
15+
<useCaseId value="MC-32763"/>
16+
<testCaseId value="MC-33099"/>
17+
<severity value="MAJOR"/>
18+
<group value="catalog"/>
19+
<group value="widget"/>
20+
</annotations>
21+
<before>
22+
<!--Create Simple Products and Category -->
23+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
24+
<createData entity="SimpleProduct" stepKey="createSimpleProductToCompareFirst">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
<createData entity="SimpleProduct" stepKey="createSimpleProductToCompareSecond">
28+
<requiredEntity createDataKey="createCategory"/>
29+
</createData>
30+
<createData entity="SimpleProduct" stepKey="createSimpleProductNotVisibleFirst">
31+
<requiredEntity createDataKey="createCategory"/>
32+
</createData>
33+
<createData entity="SimpleProduct" stepKey="createSimpleProductNotVisibleSecond">
34+
<requiredEntity createDataKey="createCategory"/>
35+
</createData>
36+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
37+
<!-- Login as admin -->
38+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
39+
<!-- Create product widget -->
40+
<actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyComparedProductsWidget">
41+
<argument name="widget" value="RecentlyComparedProductsWidget"/>
42+
</actionGroup>
43+
<!-- Set Stores > Configurations > Catalog > Recently Viewed/Compared Products > Show for Current = Website -->
44+
<magentoCLI command="config:set {{RecentlyViewedProductScopeWebsite.path}} {{RecentlyViewedProductScopeWebsite.value}}" stepKey="RecentlyViewedProductScopeWebsiteGroup"/>
45+
</before>
46+
<after>
47+
<!-- Customer Logout -->
48+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromCustomer"/>
49+
<!-- Delete product widget -->
50+
<actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteRecentlyComparedProductsWidget">
51+
<argument name="widget" value="RecentlyComparedProductsWidget"/>
52+
</actionGroup>
53+
<!-- Logout Admin -->
54+
<actionGroup ref="logout" stepKey="logout"/>
55+
<!-- Reset Stores > Configurations > Catalog > Recently Viewed/Compared Products > Show for Current = Website-->
56+
<magentoCLI command="config:set {{RecentlyViewedProductScopeWebsite.path}} {{RecentlyViewedProductScopeWebsite.value}}" stepKey="RecentlyViewedProductScopeWebsite"/>
57+
<!-- Delete Products and Category -->
58+
<deleteData createDataKey="createSimpleProductToCompareFirst" stepKey="deleteSimpleProductToCompareFirst"/>
59+
<deleteData createDataKey="createSimpleProductToCompareSecond" stepKey="deleteSimpleProductToCompareSecond"/>
60+
<deleteData createDataKey="createSimpleProductNotVisibleFirst" stepKey="deleteSimpleProductNotVisibleFirst"/>
61+
<deleteData createDataKey="createSimpleProductNotVisibleSecond" stepKey="deleteSimpleProductNotVisibleSecond"/>
62+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
63+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
64+
</after>
65+
<!--Login to storefront from customer-->
66+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
67+
<argument name="Customer" value="$$createCustomer$$"/>
68+
</actionGroup>
69+
<see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!" selector="{{StorefrontPanelHeaderSection.WelcomeMessage}}" stepKey="checkWelcomeMessage"/>
70+
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageAfterAddedProductToCart"/>
71+
<!--Add to compare Simple Product and Simple Product 2-->
72+
<actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProduct1ToCompare" >
73+
<argument name="productVar" value="$$createSimpleProductToCompareFirst$$"/>
74+
</actionGroup>
75+
<actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProduct2ToCompare" >
76+
<argument name="productVar" value="$$createSimpleProductToCompareSecond$$"/>
77+
</actionGroup>
78+
<!--The Compare Products widget displays Simple Product 1 and Simple Product 2-->
79+
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSimpleProduct1InCompareSidebar">
80+
<argument name="productVar" value="$$createSimpleProductToCompareFirst$$"/>
81+
</actionGroup>
82+
<actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSimpleProduct2InCompareSidebar">
83+
<argument name="productVar" value="$$createSimpleProductToCompareSecond$$"/>
84+
</actionGroup>
85+
86+
<!--Click Clear all in the Compare Products widget-->
87+
<actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearCompareList"/>
88+
<!--The Recently Compared widget displays Simple Product 1 and Simple Product 2-->
89+
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="openCategoryPageToCheckProductsInRecentlyComparedSidebar"/>
90+
<actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct1ExistInRecentlyComparedWidget">
91+
<argument name="product" value="$$createSimpleProductToCompareFirst$$"/>
92+
</actionGroup>
93+
<actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct2ExistInRecentlyComparedWidget">
94+
<argument name="product" value="$$createSimpleProductToCompareSecond$$"/>
95+
</actionGroup>
96+
<!--The Recently Compared widget not displays Simple Product 3 and Simple Product 4-->
97+
<actionGroup ref="StorefrontAssertNotExistProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct3NotExistInRecentlyComparedWidget">
98+
<argument name="product" value="$$createSimpleProductNotVisibleFirst$$"/>
99+
</actionGroup>
100+
<actionGroup ref="StorefrontAssertNotExistProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct4NotExistInRecentlyComparedWidget">
101+
<argument name="product" value="$$createSimpleProductNotVisibleSecond$$"/>
102+
</actionGroup>
103+
<amOnPage url="customer/account/logout/" stepKey="logoutCustomer"/>
104+
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
105+
</test>
106+
</tests>

‎app/code/Magento/Catalog/view/frontend/web/js/product/provider-compared.js

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,27 @@ define([
3131
*/
3232
dataFilter: function (data) {
3333
var providerData = this.idsStorage.prepareData(customerData.get(this.identifiersConfig.provider)().items),
34-
result = {};
34+
result = {},
35+
productCurrentScope,
36+
scopeId;
3537

36-
_.each(data, function (value, key) {
37-
if (!providerData[key]) {
38-
result[key] = value;
39-
}
40-
});
38+
if (typeof this.data.productCurrentScope !== 'undefined') {
39+
productCurrentScope = this.data.productCurrentScope;
40+
scopeId = productCurrentScope === 'store' ? window.checkout.storeId :
41+
productCurrentScope === 'group' ? window.checkout.storeGroupId :
42+
window.checkout.websiteId;
43+
_.each(data, function (value, key) {
44+
if (!providerData[productCurrentScope + '-' + scopeId + '-' + key]) {
45+
result[key] = value;
46+
}
47+
});
48+
} else {
49+
_.each(data, function (value, key) {
50+
if (!providerData[key]) {
51+
result[key] = value;
52+
}
53+
});
54+
}
4155

4256
return result;
4357
},

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder.php

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Image;
99

1010
use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
11+
use Magento\Framework\App\Area;
1112
use Magento\Framework\View\Asset\Repository as AssetRepository;
13+
use Magento\Framework\View\DesignInterface;
1214

1315
/**
1416
* Image Placeholder provider
@@ -25,16 +27,24 @@ class Placeholder
2527
*/
2628
private $assetRepository;
2729

30+
/**
31+
* @var DesignInterface
32+
*/
33+
private $themeDesign;
34+
2835
/**
2936
* @param PlaceholderFactory $placeholderFactory
3037
* @param AssetRepository $assetRepository
38+
* @param DesignInterface $themeDesign
3139
*/
3240
public function __construct(
3341
PlaceholderFactory $placeholderFactory,
34-
AssetRepository $assetRepository
42+
AssetRepository $assetRepository,
43+
DesignInterface $themeDesign
3544
) {
3645
$this->placeholderFactory = $placeholderFactory;
3746
$this->assetRepository = $assetRepository;
47+
$this->themeDesign = $themeDesign;
3848
}
3949

4050
/**
@@ -52,8 +62,14 @@ public function getPlaceholder(string $imageType): string
5262
return $imageAsset->getUrl();
5363
}
5464

55-
return $this->assetRepository->getUrl(
56-
"Magento_Catalog::images/product/placeholder/{$imageType}.jpg"
65+
$params = [
66+
'area' => Area::AREA_FRONTEND,
67+
'themeId' => $this->themeDesign->getConfigurationDesignTheme(Area::AREA_FRONTEND),
68+
];
69+
70+
return $this->assetRepository->getUrlWithParams(
71+
"Magento_Catalog::images/product/placeholder/{$imageType}.jpg",
72+
$params
5773
);
5874
}
5975
}

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Image/Placeholder/Theme.php

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)