Skip to content

Commit 77eb15e

Browse files
gabrieldagamagabrieldagama
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #29923: Fixed issue 29920 - "Item in Cart" not pluralized correctly (by @saphaljha) - #30793: Fix PHPdoc comment to be accurate (by @samuel27m) - #30411: #30408: solved multishipping cart item subtotal updat… (by @sanjay-wagento) - #30391: #30255: Fixed "The coupon code has been accepted." message remains after a Coupon Code was removed (by @shikhamis11) - #30774: Replace 'static::' with 'self::' when accessing private const. (by @vovayatsyuk) - #30681: Fix acl.xml inconsistency. LoginAsCustomerAssistance (by @DiegoSana) - #30632: #24730: Fix Frontend Invoice PDF configured Logo image (by @mozok) - #30010: #30009 Resolve regression from CSP updates (by @mtbottens) - #30400: Fixed Redirect to the store view when trying to save attribute on product creation page (by @shikhamis11) - #27379: Use Logger implementation based on deployment configuration (by @kandy) - #30114: Fix #30073 - Store specific text swatch attribute option label with v… (by @Bartlomiejsz) - #29986: Fix wrong typo function name (by @mrtuvn) - #30895: Removed duplicated action group - AdminOpenCMSBlocksGridActionGroup (by @gabrieldagama) Fixed GitHub Issues: - #29920: "Item in Cart" not pluralized correctly (reported by @joeshelton-wagento) has been fixed in #29923 by @saphaljha in 2.4-develop branch Related commits: 1. 1ea3208 2. f01de6c 3. 8186622 4. 992de7a 5. 6489f07 6. a883b69 7. ce26200 8. ee32160 9. e677767 10. 4c36fad 11. 558b7d5 12. b034b4b 13. 49573eb 14. 15c6380 - #30833: [Issue] Fix PHPdoc comment to be accurate (reported by @m2-assistant[bot]) has been fixed in #30793 by @samuel27m in 2.4-develop branch Related commits: 1. d9ffc76 - #30408: Multishipping does not update cart item subtotal correctly (reported by @sanjay-wagento) has been fixed in #30411 by @sanjay-wagento in 2.4-develop branch Related commits: 1. 043bf81 2. 1e11f7f 3. 54f8132 4. f1a6226 5. 03d0e13 6. 51d8e6c 7. 3869db8 8. 56c4814 - #30255: "The coupon code has been accepted." message remains after a Coupon Code was removed (reported by @magento-engcom-team) has been fixed in #30391 by @shikhamis11 in 2.4-develop branch Related commits: 1. f54561e 2. 16e962d 3. 9c09485 4. 1ee91ca 5. 15fdf8d 6. 2362ad9 7. 28376be 8. d011456 - #197: MoneyBooker -> "Validate email" return "404 Not Found" (reported by @hackin88) has been fixed in #30774 by @vovayatsyuk in 2.4-develop branch Related commits: 1. e4c9861 - #30781: [Issue] Replace 'static::' with 'self::' when accessing private const. (reported by @m2-assistant[bot]) has been fixed in #30774 by @vovayatsyuk in 2.4-develop branch Related commits: 1. e4c9861 - #30680: Magento upgrade 2.4.0 to 2.4.1 - Login As Customer acl.xml title attribute missing (reported by @DiegoSana) has been fixed in #30681 by @DiegoSana in 2.4-develop branch Related commits: 1. 381e2ea 2. 09c125a 3. a97f6c9 - #24730: Invoice PDF on frontend does not use configured logo image (reported by @jigar48) has been fixed in #30632 by @mozok in 2.4-develop branch Related commits: 1. 2389da7 2. 6827503 3. 9181adc 4. 4d0debd 5. 7b7b83a 6. 182a65c 7. 0287723 8. 65bb095 9. f229c75 10. 5855832 - #30009: Users can not assign widgets to individual categories/products (reported by @mtbottens) has been fixed in #30010 by @mtbottens in 2.4-develop branch Related commits: 1. 51096cb 2. fc74196 3. f66bb66 4. d4c8d70 5. bd97b9d 6. 90e7c77 7. e2512fd - #30361: An empty window opens after the second click of the "Add Attribute" button (reported by @Viktorja1) has been fixed in #30400 by @shikhamis11 in 2.4-develop branch Related commits: 1. 6ffb8b1 2. 87d870c 3. 3b0b7ca - #30362: Redirect to the store view when trying to save attribute on product creation page (reported by @Viktorja1) has been fixed in #30400 by @shikhamis11 in 2.4-develop branch Related commits: 1. 6ffb8b1 2. 87d870c 3. 3b0b7ca - #29600: [Issue] Use Logger implementation based on deployment configuration (reported by @m2-assistant[bot]) has been fixed in #27379 by @kandy in 2.4-develop branch Related commits: 1. 28d2a5b - #30073: Store specific text swatch attribute option label with value 0 (zero) can't be saved and automatically replaced with Admin Label value of option (reported by @Stepa4man) has been fixed in #30114 by @Bartlomiejsz in 2.4-develop branch Related commits: 1. 080a349 2. aaab946 3. d552d80 4. 7bdac1b 5. 57ba467 6. 6bc7a61 7. 3b24955 8. 4fccb0c - #29987: [Issue] Fix wrong typo function name (reported by @m2-assistant[bot]) has been fixed in #29986 by @mrtuvn in 2.4-develop branch Related commits: 1. f54cce7 2. 5ec2c82 - #30896: [Issue] Removed duplicated action group - AdminOpenCMSBlocksGridActionGroup (reported by @m2-assistant[bot]) has been fixed in #30895 by @gabrieldagama in 2.4-develop branch Related commits: 1. b891c9a
2 parents 252dd90 + a3928cf commit 77eb15e

File tree

53 files changed

+1139
-293
lines changed

Some content is hidden

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

53 files changed

+1139
-293
lines changed

‎app/code/Magento/Backend/Model/Dashboard/Period.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public function getDatePeriods(): array
4646
public function getPeriodChartUnits(): array
4747
{
4848
return [
49-
static::PERIOD_24_HOURS => static::PERIOD_UNIT_HOUR,
50-
static::PERIOD_7_DAYS => static::PERIOD_UNIT_DAY,
51-
static::PERIOD_1_MONTH => static::PERIOD_UNIT_DAY,
52-
static::PERIOD_1_YEAR => static::PERIOD_UNIT_MONTH,
53-
static::PERIOD_2_YEARS => static::PERIOD_UNIT_MONTH
49+
static::PERIOD_24_HOURS => self::PERIOD_UNIT_HOUR,
50+
static::PERIOD_7_DAYS => self::PERIOD_UNIT_DAY,
51+
static::PERIOD_1_MONTH => self::PERIOD_UNIT_DAY,
52+
static::PERIOD_1_YEAR => self::PERIOD_UNIT_MONTH,
53+
static::PERIOD_2_YEARS => self::PERIOD_UNIT_MONTH
5454
];
5555
}
5656
}

‎app/code/Magento/Backend/ViewModel/ChartDisabled.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct(
5757
public function getConfigUrl(): string
5858
{
5959
return $this->urlBuilder->getUrl(
60-
static::ROUTE_SYSTEM_CONFIG,
60+
self::ROUTE_SYSTEM_CONFIG,
6161
['section' => 'admin', '_fragment' => 'admin_dashboard-link']
6262
);
6363
}
@@ -70,7 +70,7 @@ public function getConfigUrl(): string
7070
public function isChartEnabled(): bool
7171
{
7272
return $this->scopeConfig->isSetFlag(
73-
static::XML_PATH_ENABLE_CHARTS,
73+
self::XML_PATH_ENABLE_CHARTS,
7474
ScopeInterface::SCOPE_STORE
7575
);
7676
}

‎app/code/Magento/Catalog/Model/Config/LayerCategoryConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function isCategoryFilterVisibleInLayerNavigation(
6060
}
6161

6262
return $this->scopeConfig->isSetFlag(
63-
static::XML_PATH_CATALOG_LAYERED_NAVIGATION_DISPLAY_CATEGORY,
63+
self::XML_PATH_CATALOG_LAYERED_NAVIGATION_DISPLAY_CATEGORY,
6464
$scopeType,
6565
$scopeCode
6666
);

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCreateNewProductAttributeSection">
1212
<element name="saveAttribute" type="button" selector="#save" timeout="30"/>
13+
<element name="closeAttribute" type="button" selector="#cancel" timeout="30"/>
1314
<element name="defaultLabel" type="input" selector="input[name='frontend_label[0]']"/>
1415
<element name="inputType" type="select" selector="select[name='frontend_input']" timeout="30"/>
1516
<element name="addValue" type="button" selector="//button[contains(@data-action,'add_new_row')]" timeout="30"/>

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

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
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="AdminVerifyCreateCloseCreateCustomProductAttributeTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Create product Attribute after closing the new attribute window multiple times"/>
15+
<title value="Create Custom Product Attribute Dropdown Field (Not Required) from Product Page after closing the new attribute window multiple times"/>
16+
<description
17+
value="login as admin and create simple product attribute Dropdown field after closing the new attribute window multiple times"/>
18+
<severity value="MAJOR"/>
19+
<testCaseId value="MC-30362"/>
20+
<group value="catalog"/>
21+
</annotations>
22+
<before>
23+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
24+
<createData entity="SimpleProduct" stepKey="createProduct">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
28+
</before>
29+
<after>
30+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
31+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
32+
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteCreatedAttribute">
33+
<argument name="productAttributeLabel" value="{{ProductAttributeFrontendLabel.label}}"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
36+
</after>
37+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPage">
38+
<argument name="productId" value="$createProduct.id$"/>
39+
</actionGroup>
40+
<!-- Attribute creation -->
41+
<click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickOnAddAttribute"/>
42+
<waitForElementVisible selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="waitForCreateBtn"/>
43+
<click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAttributeButton"/>
44+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}"
45+
stepKey="waitForLabelInput"/>
46+
<!-- Close creation window few times -->
47+
<click selector="{{AdminCreateNewProductAttributeSection.closeAttribute}}"
48+
stepKey="clickCloseNewAttributeWindowButton"/>
49+
<waitForElementVisible selector="{{AdminProductFormSection.createNewAttributeBtn}}"
50+
stepKey="waitForCreateBtn2"/>
51+
<click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAttributeButton2"/>
52+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}"
53+
stepKey="waitForLabelInput2"/>
54+
<click selector="{{AdminCreateNewProductAttributeSection.closeAttribute}}"
55+
stepKey="clickCloseNewAttributeWindowButton2"/>
56+
<waitForElementVisible selector="{{AdminProductFormSection.createNewAttributeBtn}}"
57+
stepKey="waitForCreateBtn3"/>
58+
<click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAttributeButton3"/>
59+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}"
60+
stepKey="waitForLabelInput3"/>
61+
<!-- Fill attribute data and save -->
62+
<fillField selector="{{AdminCreateNewProductAttributeSection.defaultLabel}}"
63+
userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillAttributeLabel"/>
64+
<selectOption selector="{{AdminCreateNewProductAttributeSection.inputType}}" userInput="Dropdown"
65+
stepKey="setInputType"/>
66+
<click selector="{{AdminCreateNewProductAttributeSection.advancedAttributeProperties}}"
67+
stepKey="clickOnAdvancedAttributeProperties"/>
68+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.attributeCode}}"
69+
stepKey="waitForAttributeCodeToVisible"/>
70+
<fillField selector="{{AdminCreateNewProductAttributeSection.attributeCode}}"
71+
userInput="{{newProductAttribute.attribute_code}}" stepKey="fillAttributeCode"/>
72+
<scrollTo selector="{{AdminCreateNewProductAttributeSection.storefrontProperties}}"
73+
stepKey="scrollToStorefrontProperties"/>
74+
<click selector="{{AdminCreateNewProductAttributeSection.storefrontProperties}}"
75+
stepKey="clickOnStorefrontProperties"/>
76+
<waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.inSearch}}"
77+
stepKey="waitForStoreFrontProperties"/>
78+
<checkOption selector="{{AdminCreateNewProductAttributeSection.inSearch}}" stepKey="enableInSearchOption"/>
79+
<checkOption selector="{{AdminCreateNewProductAttributeSection.advancedSearch}}"
80+
stepKey="enableAdvancedSearch"/>
81+
<checkOption selector="{{AdminCreateNewProductAttributeSection.visibleOnStorefront}}"
82+
stepKey="enableVisibleOnStorefront"/>
83+
<checkOption selector="{{AdminCreateNewProductAttributeSection.sortProductListing}}"
84+
stepKey="enableSortProductListing"/>
85+
<actionGroup ref="AdminAddOptionForDropdownAttributeActionGroup" stepKey="createDropdownOption">
86+
<argument name="storefrontViewAttributeValue" value="{{ProductAttributeOption8.label}}"/>
87+
<argument name="adminAttributeLabel" value="{{ProductAttributeOption8.label}}"/>
88+
</actionGroup>
89+
<checkOption selector="{{AdminCreateNewProductAttributeSection.defaultRadioButton('1')}}"
90+
stepKey="selectRadioButton"/>
91+
<click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
92+
<!-- Check if the product page after attribute save-->
93+
<seeInCurrentUrl url="{{AdminProductEditPage.url($createProduct.id$)}}" stepKey="seeRedirectToProductPage"/>
94+
</test>
95+
</tests>

‎app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
3030
{
3131
/**
32-
* Attributes that should be exported
32+
* Attributes that shouldn't be exported
3333
*
3434
* @var string[]
3535
*/

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="CheckoutCartSummarySection">
12+
<element name="itemsInCartLabel" type="text" selector="//*[@id='opc-sidebar']/div[1]/div/div[1]/strong/span[2]"/>
1213
<element name="orderTotal" type="input" selector=".grand.totals .amount .price"/>
1314
<element name="subTotal" type="input" selector="span[data-th='Subtotal']"/>
1415
<element name="expandShoppingCartSummary" type="button" selector="//*[contains(@class, 'items-in-cart')][not(contains(@class, 'active'))]"/>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@
4444
<element name="productQuantity" type="input" selector="//*[@id='mini-cart']//a[contains(text(),'{{productName}}')]/../..//div[@class='details-qty qty']//input[@data-item-qty='{{qty}}']" parameterized="true"/>
4545
<element name="productImage" type="text" selector="//ol[@id='mini-cart']//img[@class='product-image-photo']"/>
4646
<element name="productSubTotal" type="text" selector="//div[@class='subtotal']//span/span[@class='price']"/>
47+
<element name="productCountLabel" type="text" selector="//*[@id='minicart-content-wrapper']/div[2]/div[1]/span[2]"/>
4748
</section>
4849
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<!-- Assert Product Count in Mini Cart -->
106106
<actionGroup ref="StorefrontAssertMiniCartItemCountActionGroup" stepKey="assertProductCountAndTextInMiniCart">
107107
<argument name="productCount" value="2"/>
108-
<argument name="productCountText" value="2 Item in Cart"/>
108+
<argument name="productCountText" value="2 Items in Cart"/>
109109
</actionGroup>
110110

111111
<!--Assert Product Items in Mini cart-->

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontCheckoutSummaryItemsInCartLabelPluralizedTest.xml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="StorefrontCheckoutSummaryItemsInCartLabelPluralizedTest">
10+
<annotations>
11+
<features value="Checkout"/>
12+
<stories value="Checkout page order summary section 'Item in Cart' is pluralized correctly or not"/>
13+
<title value="'Item in Cart' is pluralized correctly"/>
14+
<description value="When adding more then 1 item and check checkout page order summary section text 'Items in Cart' is pluralized correctly or not"/>
15+
<severity value="AVERAGE"/>
16+
<group value="Checkout"/>
17+
</annotations>
18+
<before>
19+
<createData entity="_defaultCategory" stepKey="createCategory"/>
20+
<createData entity="ApiSimpleProduct" stepKey="createProduct">
21+
<requiredEntity createDataKey="createCategory"/>
22+
<field key="price">100.00</field>
23+
</createData>
24+
</before>
25+
<after>
26+
<deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
27+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
28+
</after>
29+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
30+
<argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
31+
</actionGroup>
32+
<actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
33+
<argument name="quantity" value="1"/>
34+
</actionGroup>
35+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
36+
<see selector="{{StorefrontMinicartSection.productCountLabel}}" userInput="Item in Cart" stepKey="seeProductCountLabel"/>
37+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
38+
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
39+
<see selector="{{CheckoutCartSummarySection.itemsInCartLabel}}" userInput="Item in Cart" stepKey="seeFirstProductInList"/>
40+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPageAgain">
41+
<argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
42+
</actionGroup>
43+
<actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCartAgain">
44+
<argument name="quantity" value="4"/>
45+
</actionGroup>
46+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCartAgain"/>
47+
<see selector="{{StorefrontMinicartSection.productCountLabel}}" userInput="Items in Cart" stepKey="seeProductCountLabelAgain"/>
48+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPageAgain"/>
49+
<waitForPageLoad stepKey="waitForBundleProductCreatePageToLoadAgain"/>
50+
<see selector="{{CheckoutCartSummarySection.itemsInCartLabel}}" userInput="Items in Cart" stepKey="seeFirstProductInListAgain"/>
51+
</test>
52+
</tests>

‎app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
<span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
3636
<translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
3737
<span class="count" text="getCartParam('summary_count')"/>
38-
<!-- ko if: (getCartLineItemsCount() === 1) -->
39-
<span translate="'Item in Cart'"/>
40-
<!--/ko-->
41-
<!-- ko if: (getCartLineItemsCount() > 1) -->
38+
<!-- ko if: (getCartParam('summary_count') > 1) -->
4239
<span translate="'Items in Cart'"/>
4340
<!--/ko-->
41+
<!-- ko if: (getCartParam('summary_count') === 1) -->
42+
<span translate="'Item in Cart'"/>
43+
<!--/ko-->
4444
</div>
4545

4646
<each args="getRegion('subtotalContainer')" render=""/>

‎app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<translate args="maxCartItemsToDisplay" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
1111
<translate args="'of'" if="maxCartItemsToDisplay < getCartLineItemsCount()"/>
1212
<span data-bind="text: getCartSummaryItemsCount()"></span>
13-
<translate args="'Item in Cart'" if="getCartLineItemsCount() === 1"/>
14-
<translate args="'Items in Cart'" if="getCartLineItemsCount() > 1"/>
13+
<translate args="'Item in Cart'" if="getCartSummaryItemsCount() === 1"/>
14+
<translate args="'Items in Cart'" if="getCartSummaryItemsCount() > 1"/>
1515
</strong>
1616
</div>
1717
<div class="content minicart-items" data-role="content">

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSBlocksGridActionGroup.xml

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

‎app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsBlockTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2626
</after>
2727

28-
<actionGroup ref="AdminOpenCMSBlocksGridActionGroup" stepKey="navigateToCmsBlocksGrid"/>
28+
<actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="navigateToCmsBlocksGrid"/>
2929
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridSearchFilters"/>
3030
<actionGroup ref="AdminSearchCMSBlockInGridByIdentifierActionGroup" stepKey="findCreatedCmsBlock">
3131
<argument name="identifier" value="$$createCMSBlock.identifier$$"/>

‎app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,12 +370,12 @@ protected function isRowValidSample(array $rowData)
370370

371371
foreach ($sampleData as $link) {
372372
if ($this->hasDomainNotInWhitelist($link, 'link_type', 'link_url')) {
373-
$this->_entityModel->addRowError(static::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
373+
$this->_entityModel->addRowError(self::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
374374
$result = true;
375375
}
376376

377377
if ($this->hasDomainNotInWhitelist($link, 'sample_type', 'sample_url')) {
378-
$this->_entityModel->addRowError(static::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
378+
$this->_entityModel->addRowError(self::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
379379
$result = true;
380380
}
381381
}
@@ -406,12 +406,12 @@ protected function isRowValidLink(array $rowData)
406406

407407
foreach ($linkData as $link) {
408408
if ($this->hasDomainNotInWhitelist($link, 'link_type', 'link_url')) {
409-
$this->_entityModel->addRowError(static::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
409+
$this->_entityModel->addRowError(self::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
410410
$result = true;
411411
}
412412

413413
if ($this->hasDomainNotInWhitelist($link, 'sample_type', 'sample_url')) {
414-
$this->_entityModel->addRowError(static::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
414+
$this->_entityModel->addRowError(self::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
415415
$result = true;
416416
}
417417
}

‎app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<resources>
1111
<resource id="Magento_Backend::admin">
1212
<resource id="Magento_Customer::customer">
13-
<resource id="Magento_LoginAsCustomer::login">
13+
<resource id="Magento_LoginAsCustomer::login" title="Login as Customer">
1414
<resource id="Magento_LoginAsCustomer::allow_shopping_assistance" title="Allow remote shopping assistance" sortOrder="20" />
1515
</resource>
1616
</resource>

‎app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="shippingAddressOptions" type="select" selector="#multiship-addresses-table tbody tr:nth-of-type({{addressPosition}}) .col.address select option:nth-of-type({{optionIndex}})" parameterized="true"/>
1616
<element name="selectShippingAddress" type="select" selector="(//table[@id='multiship-addresses-table'] //div[@class='field address'] //select)[{{sequenceNumber}}]" parameterized="true"/>
1717
<element name="removeItemButton" type="button" selector="//a[contains(@title, 'Remove Item')][{{var}}]" parameterized="true"/>
18+
<element name="back" type="button" selector=".action.back"/>
1819
</section>
1920
</sections>

0 commit comments

Comments
 (0)