woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 11

Merge pull request #2474 from woocommerce/PCP-3493-validation-on-classic-checkout-page-automatically-triggered-when-google-pay-is-enabled

Browse source 
Google Pay: Prevent field validation from being triggered on checkout page load (3493)
This commit is contained in:
Emili Castells 2024-07-30 17:06:44 +02:00 • committed by GitHub
commit 9fbeaf56be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/ppcp-googlepay/resources/js/Context/CheckoutHandler.js
View file

@ -4,7 +4,7 @@ import CheckoutActionHandler from '../../../../ppcp-button/resources/js/modules/
import FormValidator from '../../../../ppcp-button/resources/js/modules/Helper/FormValidator';
class CheckoutHandler extends BaseHandler {
transactionInfo() {
validateForm() {
return new Promise( async ( resolve, reject ) => {
try {
const spinner = new Spinner();
@ -23,7 +23,7 @@ class CheckoutHandler extends BaseHandler {
: null;
if ( ! formValidator ) {
resolve( super.transactionInfo() );
resolve();
return;
}
@ -42,7 +42,7 @@ class CheckoutHandler extends BaseHandler {
reject();
} else {
resolve( super.transactionInfo() );
resolve();
}
} );
} catch ( error ) {

25
modules/ppcp-googlepay/resources/js/GooglepayButton.js
View file

@ -292,17 +292,24 @@ class GooglepayButton {
onButtonClick() {
this.log( 'onButtonClick', this.context );
const paymentDataRequest = this.paymentDataRequest();
this.contextHandler.validateForm().then(
() => {
window.ppcpFundingSource = 'googlepay';
this.log(
'onButtonClick: paymentDataRequest',
paymentDataRequest,
this.context
const paymentDataRequest = this.paymentDataRequest();
this.log(
'onButtonClick: paymentDataRequest',
paymentDataRequest,
this.context
);
this.paymentsClient.loadPaymentData( paymentDataRequest );
},
() => {
console.error( '[GooglePayButton] Form validation failed.' );
}
);
window.ppcpFundingSource = 'googlepay'; // Do this on another place like on create order endpoint handler.
this.paymentsClient.loadPaymentData( paymentDataRequest );
}
paymentDataRequest() {