Skip to content

Commit ba9b6fe

Browse files
sverasvera
authored
Merge branch '2.4-develop' into eav-graphql
2 parents a4b4007 + 3218b12 commit ba9b6fe

File tree

53 files changed

+1274
-228
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

+1274
-228
lines changed

‎app/code/Magento/Checkout/view/frontend/web/js/model/quote.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,13 @@ define([
141141
});
142142

143143
return total;
144+
},
145+
146+
/**
147+
* @return {Boolean}
148+
*/
149+
isPersistent: function () {
150+
return !!Number(quoteData['is_persistent']);
144151
}
145152
};
146153
});

‎app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-processor/new-address.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ define([
5252
shippingService.setShippingRates(cache);
5353
shippingService.isLoading(false);
5454
} else {
55+
let async = quote.isPersistent() ? false : true;
56+
5557
storage.post(
56-
serviceUrl, payload, false
58+
serviceUrl, payload, false, 'application/json', {}, async
5759
).done(function (result) {
5860
rateRegistry.set(address.getCacheKey(), result);
5961
shippingService.setShippingRates(result);

‎app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<body>
1313
<referenceContainer name="content">
1414
<block class="Magento\Contact\Block\ContactForm" name="contactForm" template="Magento_Contact::form.phtml">
15+
<arguments>
16+
<argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
17+
</arguments>
1518
<container name="form.additional.info" label="Form Additional Info"/>
1619
</block>
1720
</referenceContainer>

‎app/code/Magento/Contact/view/frontend/templates/form.phtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ $viewModel = $block->getViewModel();
8080
<div class="actions-toolbar">
8181
<div class="primary">
8282
<input type="hidden" name="hideit" id="hideit" value="" />
83-
<button type="submit" title="<?= $block->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary">
83+
<button type="submit" title="<?= $block->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary"
84+
id="send2"
85+
<?php if ($block->getButtonLockManager()->isDisabled('contact_us_form_submit')): ?>
86+
disabled="disabled"
87+
<?php endif; ?>>
8488
<span><?= $block->escapeHtml(__('Submit')) ?></span>
8589
</button>
8690
</div>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<element name="errorMessage" type="input" selector="[data-ui-id='checkout-cart-validationmessages-message-error']"/>
1212
<element name="email" type="input" selector="#customer-email"/>
1313
<element name="password" type="input" selector="#pass"/>
14-
<element name="signIn" type="button" selector="#send2" timeout="30"/>
14+
<element name="signIn" type="button" selector="(//button[@id='send2'][contains(@class, 'login')])[1]" timeout="30"/>
1515
<element name="forgotYourPassword" type="button" selector="//a[@class='action']//span[contains(text(),'Forgot Your Password?')]" timeout="30"/>
1616
<element name="createAnAccount" type="button" selector="//div[contains(@class,'actions-toolbar')]//a[contains(.,'Create an Account')]" timeout="30"/>
1717
</section>

‎app/code/Magento/Customer/ViewModel/CreateAccountButton.php

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

‎app/code/Magento/Customer/ViewModel/ForgotPasswordButton.php

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

‎app/code/Magento/Customer/ViewModel/LoginButton.php

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<arguments>
1919
<argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
2020
<argument name="region_provider" xsi:type="object">Magento\Customer\ViewModel\Address\RegionProvider</argument>
21-
<argument name="create_account_button_view_model" xsi:type="object">Magento\Customer\ViewModel\CreateAccountButton</argument>
21+
<argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
2222
</arguments>
2323
<container name="form.additional.info" as="form_additional_info"/>
2424
<container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
</referenceBlock>
2222
<referenceContainer name="content">
2323
<block class="Magento\Customer\Block\Form\Edit" name="customer_edit" template="Magento_Customer::form/edit.phtml" cacheable="false">
24+
<arguments>
25+
<argument name="button_lock_manager" xsi:type="object">Magento\Framework\View\Element\ButtonLockManager</argument>
26+
</arguments>
2427
<container name="form.additional.info" as="form_additional_info"/>
2528
</block>
2629
</referenceContainer>

0 commit comments

Comments
 (0)