Skip to content

Commit 82869dc

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4-develop into magento-engcom/MC-36526
2 parents acd83aa + be26941 commit 82869dc

File tree

75 files changed

+1795
-92
lines changed

Some content is hidden

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

75 files changed

+1795
-92
lines changed

‎app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
1111
<operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
12+
<field key="assistance_allowed">integer</field>
1213
<field key="is_subscribed">boolean</field>
1314
<field key="extension_attribute">customer_nested_extension_attribute</field>
1415
</operation>
1516
<operation name="UpdateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="update">
17+
<field key="assistance_allowed">integer</field>
1618
<field key="is_subscribed">boolean</field>
1719
<field key="extension_attribute">customer_nested_extension_attribute</field>
1820
</operation>

‎app/code/Magento/Customer/view/frontend/templates/form/edit.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ use Magento\Customer\Block\Widget\Name;
4747
<span><?= $block->escapeHtml(__('Change Password')) ?></span>
4848
</label>
4949
</div>
50+
<?= $block->getChildHtml('fieldset_edit_info_additional') ?>
5051
</fieldset>
5152

5253
<fieldset class="fieldset password" data-container="change-email-password">

‎app/code/Magento/Customer/view/frontend/templates/form/register.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ $formData = $block->getFormData();
6767
<?php if ($_gender->isEnabled()): ?>
6868
<?= $_gender->setGender($formData->getGender())->toHtml() ?>
6969
<?php endif ?>
70+
<?= $block->getChildHtml('fieldset_create_info_additional') ?>
7071
</fieldset>
7172
<?php if ($block->getShowAddressFields()): ?>
7273
<?php $cityValidationClass = $addressHelper->getAttributeValidationClass('city'); ?>

‎app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Magento\LoginAsCustomer\Model\Resolver;
99

10-
use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
10+
use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
1111
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
1212
use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
1313
use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerEnabledResolver implements IsLoginAsCustomerEnabledForCus
2323
private $config;
2424

2525
/**
26-
* @var IsLoginAsCustomerEnabledForCustomerResultFactory
26+
* @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
2727
*/
2828
private $resultFactory;
2929

3030
/**
3131
* @param ConfigInterface $config
32-
* @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
32+
* @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
3333
*/
3434
public function __construct(
3535
ConfigInterface $config,
36-
IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
36+
IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
3737
) {
3838
$this->config = $config;
3939
$this->resultFactory = $resultFactory;

‎app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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="AdminCreateCustomerWithWebSiteAndGroupActionGroup">
12+
<conditionalClick selector="{{AdminCustomerAccountInformationSection.assistanceAllowed}}" dependentSelector="{{AdminCustomerAccountInformationSection.assistanceAllowed}}" visible="true" stepKey="clickAllowAssistance" after="FillEmail"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="Simple_US_Customer_Assistance_Allowed" type="customer" extends="Simple_US_Customer">
12+
<requiredEntity type="customer_extension_attribute">AssistanceAllowed</requiredEntity>
13+
</entity>
14+
<entity name="Simple_US_CA_Customer_Assistance_Allowed" type="customer" extends="Simple_US_CA_Customer">
15+
<requiredEntity type="customer_extension_attribute">AssistanceAllowed</requiredEntity>
16+
</entity>
17+
</entities>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="AssistanceDisallowed" type="customer_extension_attribute">
12+
<data key="assistance_allowed">1</data>
13+
</entity>
14+
<entity name="AssistanceAllowed" type="customer_extension_attribute">
15+
<data key="assistance_allowed">2</data>
16+
</entity>
17+
</entities>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCustomerAccountInformationSection">
12+
<element name="assistanceAllowed" type="button" selector="//input[@name='customer[extension_attributes][assistance_allowed]']/../label"/>
13+
</section>
14+
</sections>

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
2828
stepKey="enableLoginAsCustomerAutoDetection"/>
2929
<magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
30-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
30+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3131
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
3232

3333
<!--Create New Role-->

‎app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
2929
<requiredEntity createDataKey="createCategory"/>
3030
</createData>
31-
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
31+
<createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
3232
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
3333
</before>
3434
<after>

0 commit comments

Comments
 (0)