Skip to content

Commit 4bc34d8

Browse files
katmoonkatmoon
authored
Merge pull request #109 from magento-commerce/1.1.24-release
1.1.24 QPT Release
2 parents 0baf76d + 2d9e71d commit 4bc34d8

29 files changed

+5676
-7
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/quality-patches",
33
"description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
44
"type": "magento2-component",
5-
"version": "1.1.23",
5+
"version": "1.1.24",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎patches-info.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎patches/commerce/ACSD-45755_2.4.2-p2.patch‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
2+
index 7824cbd9118..210da89863c 100644
3+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
4+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml
5+
@@ -23,6 +23,7 @@
6+
<argument name="code" xsi:type="string">Magento\Customer\Model\Customer</argument>
7+
</action>
8+
<arguments>
9+
+ <argument name="edit_account_button_view_model" xsi:type="object">Magento\Customer\ViewModel\EditAccountButton</argument>
10+
<argument name="view_model" xsi:type="object">CustomerFileAttribute</argument>
11+
</arguments>
12+
</block>
13+
diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
14+
index a8aa1667d47..5cb2769b92d 100644
15+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
16+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml
17+
@@ -11,6 +11,7 @@ use Magento\Customer\Block\Widget\Gender;
18+
use Magento\Customer\Block\Widget\Name;
19+
use Magento\Customer\Block\Widget\Taxvat;
20+
21+
+$editAccountButtonViewModel = $block->getData('edit_account_button_view_model');
22+
?>
23+
<form class="form form-edit-account" action="<?= /* @noEscape */ $block->getUrl('customer/account/editPost') ?>"
24+
method="post" id="form-validate" enctype="multipart/form-data"
25+
@@ -126,7 +127,9 @@ use Magento\Customer\Block\Widget\Taxvat;
26+
27+
<div class="actions-toolbar">
28+
<div class="primary">
29+
- <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>">
30+
+ <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"
31+
+ id="send2"
32+
+ <?php if ($editAccountButtonViewModel->disabled()): ?> disabled="disabled" <?php endif; ?>>
33+
<span><?= $block->escapeHtml(__('Save')) ?></span>
34+
</button>
35+
</div>
36+
diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
37+
index 74e8ca58a6a..ec69945183f 100644
38+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
39+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
40+
@@ -21,6 +21,8 @@
41+
$addressHelper = $block->getData('addressHelper');
42+
/** @var \Magento\Directory\Helper\Data $directoryHelper */
43+
$directoryHelper = $block->getData('directoryHelper');
44+
+/** @var \Magento\Customer\ViewModel\CreateAccountButton $createAccountButtonViewModel */
45+
+$createAccountButtonViewModel = $block->getData('create_account_button_view_model');
46+
?>
47+
<form class="form create account form-create-account"
48+
action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
49+
@@ -294,7 +296,9 @@ $directoryHelper = $block->getData('directoryHelper');
50+
<div class="primary">
51+
<button type="submit"
52+
class="action submit primary"
53+
- title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>">
54+
+ title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"
55+
+ id="send2"
56+
+ <?php if ($createAccountButtonViewModel->disabled()): ?> disabled="disabled" <?php endif; ?>>
57+
<span><?= $block->escapeHtml(__('Create an Account')) ?></span>
58+
</button>
59+
</div>
60+
@@ -310,6 +314,7 @@ $directoryHelper = $block->getData('directoryHelper');
61+
<?php
62+
$displayAllRegions = $block->getConfig("general/region/display_all") ? "true" : "false";
63+
?>
64+
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
65+
<script type="text/x-magento-init">
66+
{
67+
"#country": {
68+
@@ -327,6 +332,7 @@ $directoryHelper = $block->getData('directoryHelper');
69+
}
70+
</script>
71+
<?php endif; ?>
72+
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
73+
<script type="text/x-magento-init">
74+
{
75+
"*": {

‎patches/commerce/ACSD-45755_2.4.3-p2.patch‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
2+
index 626a9b36a64..49168381b27 100644
3+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
4+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml
5+
@@ -23,6 +23,8 @@ $addressHelper = $block->getData('addressHelper');
6+
/** @var \Magento\Directory\Helper\Data $directoryHelper */
7+
$directoryHelper = $block->getData('directoryHelper');
8+
$formData = $block->getFormData();
9+
+/** @var \Magento\Customer\ViewModel\CreateAccountButton $createAccountButtonViewModel */
10+
+$createAccountButtonViewModel = $block->getData('create_account_button_view_model');
11+
?>
12+
<form class="form create account form-create-account"
13+
action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
14+
@@ -316,7 +318,9 @@ $formData = $block->getFormData();
15+
<div class="primary">
16+
<button type="submit"
17+
class="action submit primary"
18+
- title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>">
19+
+ title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"
20+
+ id="send2"
21+
+ <?php if ($createAccountButtonViewModel->disabled()): ?> disabled="disabled" <?php endif; ?>>
22+
<span><?= $block->escapeHtml(__('Create an Account')) ?></span>
23+
</button>
24+
</div>
25+
@@ -332,6 +336,7 @@ $formData = $block->getFormData();
26+
<?php
27+
$displayAllRegions = $block->getConfig("general/region/display_all") ? "true" : "false";
28+
?>
29+
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
30+
<script type="text/x-magento-init">
31+
{
32+
"#country": {
33+
@@ -349,6 +354,7 @@ $formData = $block->getFormData();
34+
}
35+
</script>
36+
<?php endif; ?>
37+
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
38+
<script type="text/x-magento-init">
39+
{
40+
"*": {

0 commit comments

Comments
 (0)