Skip to content

Commit 05b3363

Browse files
nathanjosiahnathanjosiah
committed
Merge branch '2.4-develop' of github.com:magento/magento2ce into MC-30537
2 parents 35cccd5 + 8c1a36a commit 05b3363

File tree

7 files changed

+63
-5
lines changed

7 files changed

+63
-5
lines changed

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurationsByAttributeCodeAndNavigateToOptionsQuantityActionGroup.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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="AdminCreateConfigurationsByAttributeCodeAndNavigateToOptionsQuantityActionGroup" extends="GenerateConfigurationsByAttributeCodeActionGroup">
12+
<annotations>
13+
<description>Selects all Attribute options for the provided Attribute Code and navigates to Options quantity on the Configurable Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="price" type="string" defaultValue="100"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton2" stepKey="waitForNextPageOpened"/>
20+
<click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened" stepKey="clickOnApplySinglePriceToAllSkus"/>
21+
<fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" after="clickOnApplySinglePriceToAllSkus" stepKey="enterAttributePrice"/>
22+
23+
<remove keyForRemoval="clickOnApplySingleQuantityToEachSku"/>
24+
<remove keyForRemoval="enterAttributeQuantity"/>
25+
<remove keyForRemoval="clickOnNextButton3"/>
26+
<remove keyForRemoval="clickOnNextButton4"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525

2626
<after>
2727
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
28+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProductFilteredBySkuAndName">
29+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
30+
</actionGroup>
31+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnProductIndexPage"/>
2832
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
33+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
34+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
2935
</after>
3036

3137
<!-- Create a configurable product via the UI -->

‎app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
</action>
1515
</referenceBlock>
1616
<referenceContainer name="content">
17-
<block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="Magento_Customer::account/dashboard/info.phtml" cacheable="false"/>
17+
<block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="Magento_Customer::account/dashboard/info.phtml" cacheable="false">
18+
<container name="customer.account.dashboard.info.blocks" as="additional_blocks"/>
19+
</block>
1820
<block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="Magento_Customer::account/dashboard/address.phtml" cacheable="false"/>
1921
</referenceContainer>
2022
</body>

‎app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,26 @@
2929
</a>
3030
</div>
3131
</div>
32-
<?php if ($block->isNewsletterEnabled()) : ?>
32+
<?php if ($block->isNewsletterEnabled()): ?>
3333
<div class="box box-newsletter">
3434
<strong class="box-title">
3535
<span><?= $block->escapeHtml(__('Newsletters')) ?></span>
3636
</strong>
3737
<div class="box-content">
3838
<p>
39-
<?php if ($block->getIsSubscribed()) : ?>
39+
<?php if ($block->getIsSubscribed()): ?>
4040
<?= $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
41-
<?php else : ?>
41+
<?php else: ?>
4242
<?= $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
4343
<?php endif; ?>
4444
</p>
4545
</div>
4646
<div class="box-actions">
47-
<a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
47+
<a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>">
48+
<span><?= $block->escapeHtml(__('Edit')) ?></span></a>
4849
</div>
4950
</div>
5051
<?php endif; ?>
52+
<?= $block->getChildHtml('additional_blocks'); ?>
5153
</div>
5254
</div>

‎app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,9 @@
4949
<data key="used_in_product_listing">1</data>
5050
<data key="used_for_sort_by">0</data>
5151
</entity>
52+
<entity name="TextSwatchProductAttributeForm" extends="VisualSwatchProductAttributeForm">
53+
<data key="frontend_label[0]" unique="suffix">TextSwatchAttribute-</data>
54+
<data key="frontend_input">swatch_text</data>
55+
<data key="attribute_code" unique="suffix">text_swatch_attribute_</data>
56+
</entity>
5257
</entities>

‎app/code/Magento/Swatches/Test/Mftf/Metadata/SwatchProductAttributeMeta.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<operation name="CreateSwatchProductAttributeForm" dataType="SwatchProductAttributeForm" type="create"
1212
auth="adminFormKey" url="catalog/product_attribute/save" method="POST" successRegex="/messages-message-success/" returnRegex="">
1313
<contentType>application/x-www-form-urlencoded</contentType>
14+
<field key="attribute_id">string</field>
1415
<field key="frontend_label[0]">string</field>
1516
<field key="frontend_label[1]">string</field>
1617
<field key="frontend_input">string</field>
@@ -43,4 +44,7 @@
4344
<field key="used_in_product_listing">string</field>
4445
<field key="used_for_sort_by">string</field>
4546
</operation>
47+
<operation name="DeleteSwatchProductAttributeForm" dataType="SwatchProductAttributeForm" type="delete" auth="adminOauth" url="/V1/products/attributes/{attribute_code}" method="DELETE">
48+
<contentType>application/json</contentType>
49+
</operation>
4650
</operations>

‎app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,17 @@ define([
292292
return _.isArray(products) ? products[0] : null;
293293
},
294294

295+
/**
296+
* Get chosen product id
297+
*
298+
* @returns int|null
299+
*/
300+
getProductId: function () {
301+
var products = this._CalcProducts();
302+
303+
return _.isArray(products) && products.length === 1 ? products[0] : null;
304+
},
305+
295306
/**
296307
* @private
297308
*/

0 commit comments

Comments
 (0)