Skip to content

Commit 2f4d989

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #30340: Allow to cache search results (by @alinalexandru) - #29868: Remove wrong tags (by @Usik2203) - #28172: Issue #27925, moved the submit button to the inside of the <form> (by @vestman) - #28157: Fix #24091 - Selected configurable product attribute options are not displaying in wishlist page. (by @Bartlomiejsz) - #28928: [vcl] don't explicitly hash the host header (by @gquintard) - #27672: Fixed creating shipping labels in part-shipment (by @NikolasSumrak) Fixed GitHub Issues: - #30508: [Issue] Allow to cache search results (reported by @m2-assistant[bot]) has been fixed in #30340 by @alinalexandru in 2.4-develop branch Related commits: 1. 47c21ab - #30061: [Issue] Remove wrong tags (reported by @m2-assistant[bot]) has been fixed in #29868 by @Usik2203 in 2.4-develop branch Related commits: 1. 3efc95a 2. abff48f 3. 61b3c24 4. 199943d 5. da555dd 6. 4666ac0 7. bce4a8c 8. 9e24869 9. ff97fe6 10. 4cde7eb - #27925: Checkout: Placing an order using the enter key causes a redirect to the checkout (reported by @vestman) has been fixed in #28172 by @vestman in 2.4-develop branch Related commits: 1. 4fd92e7 2. cf5d73b 3. 9173df7 4. 2dee565 5. d59c837 6. 16fdccb 7. 08e7e4f 8. cfcd91d 9. b97c6c3 10. eb468d0 11. 2778f76 12. afbdb27 - #22503: Added Wish-list product displaying with wrong configurations (reported by @GrishmaNayee) has been fixed in #28157 by @Bartlomiejsz in 2.4-develop branch Related commits: 1. a128f39 2. e3bad69 3. 536a728 4. 3d69b13 5. 75a5f25 6. 0471e4e 7. 2c07389 8. e3e5a9a 9. e378086 10. 11abbf9 11. ac6be80 12. 8eead95 13. e3fd246 14. 129f451 15. 8d02533 16. 840c99c - #24091: Selected configurable product attribute options are not displaying in wishlist page. (reported by @venugopal-codilar) has been fixed in #28157 by @Bartlomiejsz in 2.4-develop branch Related commits: 1. a128f39 2. e3bad69 3. 536a728 4. 3d69b13 5. 75a5f25 6. 0471e4e 7. 2c07389 8. e3e5a9a 9. e378086 10. 11abbf9 11. ac6be80 12. 8eead95 13. e3fd246 14. 129f451 15. 8d02533 16. 840c99c - #29988: [Issue] [vcl] don't explicitly hash the host header (reported by @m2-assistant[bot]) has been fixed in #28928 by @gquintard in 2.4-develop branch Related commits: 1. 7660725 2. 8920869 - #29552: [Issue] Fixed creating shipping labels in part-shipment (reported by @m2-assistant[bot]) has been fixed in #27672 by @NikolasSumrak in 2.4-develop branch Related commits: 1. eb8cd70 2. b213915 3. 40e4ac0 4. fee7c0c 5. 0694d79 6. 78a897b 7. 25422c2
2 parents 72f9180 + 9b10019 commit 2f4d989

File tree

43 files changed

+617
-140
lines changed

Some content is hidden

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

43 files changed

+617
-140
lines changed

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
* Toolbar entry that shows latest notifications
1111
*
1212
* @api
13-
* @author Magento Core Team <[email protected]>
1413
* @since 100.0.2
1514
*/
1615
class ToolbarEntry extends \Magento\Backend\Block\Template

app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/**
1313
* AdminNotification Feed model
1414
*
15-
* @author Magento Core Team <[email protected]>
1615
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1716
* @api
1817
* @since 100.0.2

app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* AdminNotification Inbox interface
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @api
1312
* @since 100.0.2
1413
*/

app/code/Magento/AdminNotification/Model/NotificationService.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* Notification service model
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @api
1312
* @since 100.0.2
1413
*/

app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* AdminNotification Inbox model
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\AdminNotification\Model\ResourceModel\Grid;
1311

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* AdminNotification Inbox model
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
13-
* @api
1412
* @since 100.0.2
1513
*/
1614
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Collection of unread notifications
9-
*
10-
* @author Magento Core Team <[email protected]>
119
*/
1210
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
1311

app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99

1010
/**
1111
* AdminNotification observer
12-
*
13-
* @author Magento Core Team <[email protected]>
12+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1413
*/
1514
class PredispatchAdminActionControllerObserver implements ObserverInterface
1615
{

app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Search queries relations grid container
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Edit extends \Magento\Backend\Block\Widget\Grid\Container

app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Search query relations edit grid
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Grid extends \Magento\Backend\Block\Widget\Grid

app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* Catalog search recommendations resource model
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @api
1312
* @since 100.0.2
1413
*/

app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -14,8 +12,6 @@
1412

1513
/**
1614
* Abstract action reindex class
17-
*
18-
* @package Magento\CatalogInventory\Model\Indexer\Stock
1915
*/
2016
abstract class AbstractAction
2117
{
@@ -283,6 +279,8 @@ private function doReindex($productIds = [])
283279
}
284280

285281
/**
282+
* Get cache cleaner object
283+
*
286284
* @return CacheCleaner
287285
*/
288286
private function getCacheCleaner()

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -10,8 +8,6 @@
108

119
/**
1210
* Class Row reindex action
13-
*
14-
* @package Magento\CatalogInventory\Model\Indexer\Stock\Action
1511
*/
1612
class Row extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
1713
{

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -10,8 +8,6 @@
108

119
/**
1210
* Class Rows reindex action for mass actions
13-
*
14-
* @package Magento\CatalogInventory\Model\Indexer\Stock\Action
1511
*/
1612
class Rows extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
1713
{

app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -11,7 +9,7 @@
119
class Processor extends \Magento\Framework\Indexer\AbstractProcessor
1210
{
1311
/**
14-
* Indexer ID
12+
* Get Indexer ID for cataloginventory_stock
1513
*/
1614
const INDEXER_ID = 'cataloginventory_stock';
1715
}

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
5-
* @subpackage unit_tests
63
* Copyright © Magento, Inc. All rights reserved.
74
* See COPYING.txt for license details.
85
*/

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
5-
* @subpackage unit_tests
63
* Copyright © Magento, Inc. All rights reserved.
74
* See COPYING.txt for license details.
85
*/

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
5-
* @subpackage unit_tests
63
* Copyright © Magento, Inc. All rights reserved.
74
* See COPYING.txt for license details.
85
*/

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22
/**
3-
* @category Magento
4-
* @package Magento_CatalogInventory
5-
* @subpackage unit_tests
63
* Copyright © Magento, Inc. All rights reserved.
74
* See COPYING.txt for license details.
85
*/
Lines changed: 26 additions & 0 deletions
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="CheckoutSelectPurchaseOrderPaymentActionGroup">
12+
<annotations>
13+
<description>Selects the 'Purchase Order' Payment Method on the Storefront Checkout page.</description>
14+
</annotations>
15+
16+
<arguments>
17+
<argument name="purchaseOrderNumber" type="string"/>
18+
</arguments>
19+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
20+
<waitForPageLoad stepKey="waitForPageLoad"/>
21+
<remove keyForRemoval="checkCheckMoneyOption"/>
22+
<conditionalClick selector="{{CheckoutPaymentSection.purchaseOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.purchaseOrderPayment}}" visible="true" stepKey="checkPurchaseOrderOption"/>
23+
<fillField selector="{{StorefrontCheckoutPaymentMethodSection.purchaseOrderNumber}}" userInput="{{purchaseOrderNumber}}" stepKey="fillPurchaseOrderNumber"/>
24+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
25+
</actionGroup>
26+
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
3333
<element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active" timeout="30"/>
3434
<element name="checkMoneyOrderPayment" type="radio" selector="input#checkmo.radio" timeout="30"/>
35+
<element name="purchaseOrderPayment" type="radio" selector="input#purchaseorder.radio" timeout="30"/>
3536
<element name="placeOrder" type="button" selector=".payment-method._active button.action.primary.checkout" timeout="30"/>
3637
<element name="placeOrderWithoutTimeout" type="button" selector=".payment-method._active button.action.primary.checkout"/>
3738
<element name="paymentSectionTitle" type="text" selector="//*[@id='checkout-payment-method-load']//div[@data-role='title']" />
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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+
11+
<test name="StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Checkout with Purchase Order Payment. Create Order with Press Key Enter."/>
15+
<title value="Create Checkout with purchase order payment method test. Press key Enter on field Purchase Order Number for create Order."/>
16+
<description value="Create Checkout with purchase order payment method. Press key Enter on field Purchase Order Number for create Order."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-37227"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
22+
<before>
23+
<createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
24+
25+
<!-- Enable payment method -->
26+
<magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/>
27+
</before>
28+
29+
<after>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
31+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
32+
33+
<!-- Disable payment method -->
34+
<magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/>
35+
</after>
36+
37+
<!--Go to product page-->
38+
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
39+
<waitForPageLoad stepKey="waitForCatalogPageLoad"/>
40+
41+
<!--Add Product to Shopping Cart-->
42+
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
43+
<argument name="productName" value="$$createSimpleProduct.name$$"/>
44+
</actionGroup>
45+
46+
<!--Go to Checkout-->
47+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
48+
49+
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
50+
<argument name="customerVar" value="CustomerEntityOne"/>
51+
<argument name="customerAddressVar" value="CustomerAddressSimple"/>
52+
</actionGroup>
53+
54+
<!-- Checkout select Purchase Order payment -->
55+
<actionGroup ref="CheckoutSelectPurchaseOrderPaymentActionGroup" stepKey="selectPurchaseOrderPayment">
56+
<argument name="purchaseOrderNumber" value="12345"/>
57+
</actionGroup>
58+
59+
<!--Press Key ENTER-->
60+
<pressKey selector="{{StorefrontCheckoutPaymentMethodSection.purchaseOrderNumber}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
61+
<waitForPageLoad stepKey="waitForPageLoad"/>
62+
63+
<!--See success messages-->
64+
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
65+
<see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
66+
67+
</test>
68+
69+
</tests>
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
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="StorefrontCheckoutWithPurchaseOrderNumberTest">
11+
<annotations>
12+
<features value="Checkout"/>
13+
<stories value="Checkout with Purchase Order Payment"/>
14+
<title value="Create Checkout with purchase order payment method test"/>
15+
<description value="Create Checkout with purchase order payment method"/>
16+
<severity value="MAJOR"/>
17+
<group value="checkout"/>
18+
</annotations>
19+
20+
<before>
21+
<createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
22+
23+
<!-- Enable payment method -->
24+
<magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/>
25+
</before>
26+
27+
<after>
28+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
29+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
30+
31+
<!-- Disable payment method -->
32+
<magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/>
33+
</after>
34+
35+
<!--Go to product page-->
36+
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
37+
<waitForPageLoad stepKey="waitForCatalogPageLoad"/>
38+
39+
<!--Add Product to Shopping Cart-->
40+
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
41+
<argument name="productName" value="$$createSimpleProduct.name$$"/>
42+
</actionGroup>
43+
44+
<!--Go to Checkout-->
45+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
46+
47+
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
48+
<argument name="customerVar" value="CustomerEntityOne"/>
49+
<argument name="customerAddressVar" value="CustomerAddressSimple"/>
50+
</actionGroup>
51+
52+
<!-- Checkout select Purchase Order payment -->
53+
<actionGroup ref="CheckoutSelectPurchaseOrderPaymentActionGroup" stepKey="selectPurchaseOrderPayment">
54+
<argument name="purchaseOrderNumber" value="12345"/>
55+
</actionGroup>
56+
57+
<!--Click Place Order button-->
58+
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
59+
<waitForPageLoad stepKey="waitForPageLoad"/>
60+
61+
<!--See success messages-->
62+
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
63+
<see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
64+
65+
</test>
66+
67+
</tests>

0 commit comments

Comments
 (0)