Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed #22052 Customer account confirmation is overwritten by backend customer save #22147

Merged
merged 3 commits into from
Apr 29, 2019
Merged

Fixed #22052 Customer account confirmation is overwritten by backend customer save #22147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
887001d
Added Confirmation field in customer form
Apr 3, 2019
4c04f55
Fixed #22052 Customer account confirmation is overwritten by backend …
Apr 3, 2019
e5c1b94
Fixed Unit test failure
Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/code/Magento/Customer/Model/Customer/DataProviderWithDefaultAddresses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\Abstract
private static $forbiddenCustomerFields = [
'password_hash',
'rp_token',
'confirmation',
];

/**
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderWithDefaultAddressesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ public function testGetData(): void
'default_shipping' => 2,
'password_hash' => 'password_hash',
'rp_token' => 'rp_token',
'confirmation' => 'confirmation',
];

$address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
Expand Down
11 changes: 11 additions & 0 deletions app/code/Magento/Customer/view/base/ui_component/customer_form.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@
<visible>false</visible>
</settings>
</field>
<field name="confirmation" formElement="input">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
<item name="source" xsi:type="string">customer</item>
</item>
</argument>
<settings>
<dataType>text</dataType>
<visible>false</visible>
</settings>
</field>
<field name="created_in" formElement="input">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
Expand Down