Skip to content

Commit 08021cf

Browse files
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop expedited
Accepted Community Pull Requests: - #27586: #27337: GraphQl. Add a mutation for subscribe feature (by @atwixfirster) - #28034: magento/magento2#: GraphQL. Mutation: sendEmailToFriend. Test coverage for “Please provide Email of sender.” (by @atwixfirster) - #28105: [GraphQl] Gift Message coverage for customer order (by @Usik2203) - #27956: GraphQL GiftMessageGraphQl add coverage for cart (by @Usik2203) - #28418: MFTF: Refactoring AdminUrlRewritesForProductInAnchorCategoriesTestWithConfi… (by @kate-kyzyma) - #28391: Refactoring create product with several websites and check url rewrites test (by @kate-kyzyma) - #28466: Remove redundant argument in method useProductItem (by @Usik2203) - #28450: [integration] Refactoring AdvancedPricingImportExport fixture (by @Usik2203) - #28449: [Integration] Refactoring AdminNotification fixture (by @Usik2203) - #28408: MFTF: Refactoring AdminUrlRewritesForProductInAnchorCategoriesTest (by @kate-kyzyma) - #28304: magento/magento2#: Add additional test coverage to “updateCustomer” mutation (by @atwixfirster) - #28287: Action Groups for Check exist/not exist Category in Category list on Product Edit page. (by @engcom-Kilo) - #28361: MFTF: Refactoring AdminUpdateCustomURLRewritesPermanentTest (by @kate-kyzyma) - #28330: MFTF: Share wishlist with not valid email address (by @DmitryTsymbal) - #27357: Newsletter subscription emails should also use paragraph tags (by @ptylek) - #27373: magento/magento2#: Remove oauthUserContext from app/code/Magento/GraphQl/etc/graphql/di.xml (by @atwixfirster) - #27902: Improve Interceptor generator (by @lbajsarowicz) - #27903: Improve performance of InterfaceValidator (by @lbajsarowicz) - #27871: Prevent product gallery elements from blinking when they load (by @krzksz) - #27690: Fix handling of mixins for modules with no dependencies defined (by @krzksz) - #27839: [MFTF] Fixed file name violations (by @elevinskii) - #27619: Load storage polyfill conditionally (by @krzksz) - #27618: [PERF Improvements]Load polyfills for browsers that don't support certain features (by @krzksz) - #27481: Fixed issue #19481: After composer installation sample data can't be installed from command line (by @andrewbess) - #27260: Clean expired quotes - Fix out of memory on huge quotes list (by @ihor-sviziev) - #27356: Fix duplicated footer in Magento_Customer emails (by @ptylek) Fixed GitHub Issues: - #27337: GraphQl. Add a mutation for subscribe feature (reported by @atwixfirster) has been fixed in #27586 by @atwixfirster in 2.4-develop branch Related commits: 1. 2c812ba 2. 670d0b1 3. eefac70 4. 863eb5c 5. d0d744f 6. 59c5d42 7. a0a5c24 - #28138: [Issue] magento/magento2#: GraphQL. Mutation: sendEmailToFriend. Test coverage for �Please provide Email of sender.� (reported by @m2-backlog[bot]) has been fixed in #28034 by @atwixfirster in 2.4-develop branch Related commits: 1. bac11ae 2. fbabac7 3. d78be13 - #253: PHP Extension 0 must be loaded - XML Parse mistake? (reported by @ScreamingDev) has been fixed in #28105 by @Usik2203 in 2.4-develop branch Related commits: 1. dbaf8a5 2. 9479c3a 3. 9d42238 4. 003162a 5. 689bbea 6. 74a95e1 7. e4d9a05 8. b059e51 9. 56b5ab6 10. 6287c86 11. b7897f1 12. ca9078c 13. e3555dc 14. 709440b 15. 6084502 - #253: PHP Extension 0 must be loaded - XML Parse mistake? (reported by @ScreamingDev) has been fixed in #27956 by @Usik2203 in 2.4-develop branch Related commits: 1. dbaf8a5 2. 9479c3a 3. 9d42238 4. 003162a 5. 689bbea 6. 74a95e1 7. e4d9a05 8. b059e51 - #28394: [Issue] magento/magento2#: Add additional test coverage to �updateCustomer� mutation (reported by @m2-backlog[bot]) has been fixed in #28304 by @atwixfirster in 2.4-develop branch Related commits: 1. 62f5c32 - #28392: [Issue] Action Groups for Check exist/not exist Category in Category list on Product Edit page. (reported by @m2-backlog[bot]) has been fixed in #28287 by @engcom-Kilo in 2.4-develop branch Related commits: 1. fbfbc61 2. 4a8afd8 - #28393: [Issue] MFTF: Refactoring AdminUpdateCustomURLRewritesPermanentTest (reported by @m2-backlog[bot]) has been fixed in #28361 by @kate-kyzyma in 2.4-develop branch Related commits: 1. 7bb812a - #28377: [Issue] MFTF: Share wishlist with not valid email address (reported by @m2-backlog[bot]) has been fixed in #28330 by @DmitryTsymbal in 2.4-develop branch Related commits: 1. 8727fb9 2. fe64579 3. 01b3edd - #28166: [Issue] Newsletter subscription emails should also use paragraph tags (reported by @m2-backlog[bot]) has been fixed in #27357 by @ptylek in 2.4-develop branch Related commits: 1. 414b897 2. 2f0bbe9 3. a216e7f 4. 0e4e419 5. 3038b9b 6. 3721999 - #28040: GraphQl. Retrieve customer's shopping cart without an authorization token (reported by @atwixfirster) has been fixed in #27373 by @atwixfirster in 2.4-develop branch Related commits: 1. b96c8e9 2. 41f6a6e - #28383: [Issue] Improve Interceptor generator (reported by @m2-backlog[bot]) has been fixed in #27902 by @lbajsarowicz in 2.4-develop branch Related commits: 1. a375e13 2. 3057ffa - #28339: [Issue] Prevent product gallery elements from blinking when they load (reported by @m2-backlog[bot]) has been fixed in #27871 by @krzksz in 2.4-develop branch Related commits: 1. ce001b0 2. c10d0a1 3. de944ad 4. 7858941 5. 2b64912 6. f0e7cfd 7. 15860ab - #28340: [Issue] Fix handling of mixins for modules with no dependencies defined (reported by @m2-backlog[bot]) has been fixed in #27690 by @krzksz in 2.4-develop branch Related commits: 1. 97f0a1f 2. 16444d0 - #28305: [Issue] [MFTF] Fixed file name violations (reported by @m2-backlog[bot]) has been fixed in #27839 by @elevinskii in 2.4-develop branch Related commits: 1. c49ad32 2. 7592e8d 3. a3a5df6 4. acc729f - #28381: [Issue] Load storage polyfill conditionally (reported by @m2-backlog[bot]) has been fixed in #27619 by @krzksz in 2.4-develop branch Related commits: 1. cba9d46 2. f81f12e 3. e1a98e2 4. f58a127 5. e8b245e 6. fbbd5ae - #28382: [Issue] [PERF Improvements]Load polyfills for browsers that don't support certain features (reported by @m2-backlog[bot]) has been fixed in #27618 by @krzksz in 2.4-develop branch Related commits: 1. 2c1daf3 2. bb53575 3. e3b03d4 4. 645b0bf - #19481: Magento 2.3.0: After composer installation sampledata can't be installed from command line (reported by @dverkade) has been fixed in #27481 by @andrewbess in 2.4-develop branch Related commits: 1. b0c3ead 2. 7fec913 3. a24cc81 4. a17f104 5. 2bfb191 6. be5fe83 7. b429fda 8. 952d2a9 - #28342: [Issue] Clean expired quotes - Fix out of memory on huge quotes list (reported by @m2-backlog[bot]) has been fixed in #27260 by @ihor-sviziev in 2.4-develop branch Related commits: 1. 1031b3b 2. 4cd55f5 3. 76f3ed4 4. 7e9fd80 5. 939e1de 6. c40b3ee - #28433: [Issue] Fix duplicated footer in Magento_Customer emails (reported by @m2-backlog[bot]) has been fixed in #27356 by @ptylek in 2.4-develop branch Related commits: 1. a18eecc 2. 7fa9dd7 3. 179f02c 4. 03aeb89
2 parents d8ca81c + 056ebcf commit 08021cf

File tree

99 files changed

+2986
-687
lines changed

Some content is hidden

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

99 files changed

+2986
-687
lines changed

app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function getItems()
149149
$this->_compareProduct->setAllowUsedFlat(false);
150150

151151
$this->_items = $this->_itemCollectionFactory->create();
152-
$this->_items->useProductItem(true)->setStoreId($this->_storeManager->getStore()->getId());
152+
$this->_items->useProductItem()->setStoreId($this->_storeManager->getStore()->getId());
153153

154154
if ($this->httpContext->getValue(Context::CONTEXT_AUTH)) {
155155
$this->_items->setCustomerId($this->currentCustomer->getCustomerId());

app/code/Magento/Catalog/Helper/Product/Compare.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public function getItemCollection()
279279
// cannot be placed in constructor because of the cyclic dependency which cannot be fixed with proxy class
280280
// collection uses this helper in constructor when calling isEnabledFlat() method
281281
$this->_itemCollection = $this->_itemCollectionFactory->create();
282-
$this->_itemCollection->useProductItem(true)->setStoreId($this->_storeManager->getStore()->getId());
282+
$this->_itemCollection->useProductItem()->setStoreId($this->_storeManager->getStore()->getId());
283283

284284
if ($this->_customerSession->isLoggedIn()) {
285285
$this->_itemCollection->setCustomerId($this->_customerSession->getCustomerId());
@@ -313,7 +313,7 @@ public function calculate($logout = false)
313313
{
314314
/** @var $collection Collection */
315315
$collection = $this->_itemCollectionFactory->create()
316-
->useProductItem(true);
316+
->useProductItem();
317317
if (!$logout && $this->_customerSession->isLoggedIn()) {
318318
$collection->setCustomerId($this->_customerSession->getCustomerId());
319319
} elseif ($this->_customerId) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminProductFormCategoryExistInCategoryListActionGroup">
12+
<annotations>
13+
<description>Check Category exist in Category list for Assign to Product.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
20+
<fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="{{categoryName}}"
21+
stepKey="fillSearchCategory"/>
22+
<see selector="{{AdminProductFormSection.selectCategory(categoryName)}}" userInput="{{categoryName}}"
23+
stepKey="seeCategory"/>
24+
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
25+
</actionGroup>
26+
</actionGroups>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminProductFormCategoryNotExistInCategoryListActionGroup">
12+
<annotations>
13+
<description>Check Category not exist in Category list for Assign to Product.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="categoryName" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
20+
<fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="{{categoryName}}"
21+
stepKey="fillSearchCategory"/>
22+
<dontSee selector="{{AdminProductFormSection.selectCategory(categoryName)}}" userInput="{{categoryName}}"
23+
stepKey="seeCategory"/>
24+
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
25+
</actionGroup>
26+
</actionGroups>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSubmitCategoriesPopupActionGroup">
12+
<annotations>
13+
<description>Clicks the "Done" button on the Search Categories popup.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneButton" />
17+
</actionGroup>
18+
</actionGroups>

app/code/Magento/Customer/view/frontend/email/change_email.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,5 @@
1818
{{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
1919
{{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
2020
</p>
21-
<br>
22-
23-
<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
2421

2522
{{template config_path="design/email/footer_template"}}

0 commit comments

Comments
 (0)