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 7

Merge pull request #1360 from woocommerce/PCP-1543-acdc-validation

Browse source 
Improve ACDC error message when empty fields
This commit is contained in:
Emili Castells 2023-06-27 11:36:09 +02:00 • committed by GitHub
commit bb39a86466
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/ppcp-button/resources/js/modules/Renderer/CreditCardRenderer.js
View file

@ -10,6 +10,7 @@ class CreditCardRenderer {
this.spinner = spinner; this.spinner = spinner;
this.cardValid = false; this.cardValid = false;
this.formValid = false; this.formValid = false;
this.emptyFields = new Set(['number', 'cvv', 'expirationDate']);
this.currentHostedFieldsInstance = null; this.currentHostedFieldsInstance = null;
} }
@ -130,7 +131,7 @@ class CreditCardRenderer {
return event.fields[key].isValid; return event.fields[key].isValid;
}); });
const className = this._cardNumberFiledCLassNameByCardType(event.cards[0].type); const className = event.cards.length ? this._cardNumberFiledCLassNameByCardType(event.cards[0].type) : '';
event.fields.number.isValid event.fields.number.isValid
? cardNumber.classList.add(className) ? cardNumber.classList.add(className)
: this._recreateElementClassAttribute(cardNumber, cardNumberField.className); : this._recreateElementClassAttribute(cardNumber, cardNumberField.className);
@ -138,6 +139,12 @@ class CreditCardRenderer {
this.formValid = formValid; this.formValid = formValid;
}); });
hostedFields.on('empty', (event) => {
this.emptyFields.add(event.emittedBy);
});
hostedFields.on('notEmpty', (event) => {
this.emptyFields.delete(event.emittedBy);
});
show(buttonSelector); show(buttonSelector);
@ -249,7 +256,16 @@ class CreditCardRenderer {
}); });
} else { } else {
this.spinner.unblock(); this.spinner.unblock();
const message = ! this.cardValid ? this.defaultConfig.hosted_fields.labels.card_not_supported : this.defaultConfig.hosted_fields.labels.fields_not_valid;
let message = this.defaultConfig.labels.error.generic;
if (this.emptyFields.size > 0) {
message = this.defaultConfig.hosted_fields.labels.fields_empty;
} else if (!this.cardValid) {
message = this.defaultConfig.hosted_fields.labels.card_not_supported;
} else if (!this.formValid) {
message = this.defaultConfig.hosted_fields.labels.fields_not_valid;
}
this.errorHandler.message(message); this.errorHandler.message(message);
} }
} }

4
modules/ppcp-button/src/Assets/SmartButton.php
View file

@ -893,6 +893,10 @@ class SmartButton implements SmartButtonInterface {
'credit_card_number' => '', 'credit_card_number' => '',
'cvv' => '', 'cvv' => '',
'mm_yy' => __( 'MM/YY', 'woocommerce-paypal-payments' ), 'mm_yy' => __( 'MM/YY', 'woocommerce-paypal-payments' ),
'fields_empty' => __(
'Card payment details are missing. Please fill in all required fields.',
'woocommerce-paypal-payments'
),
'fields_not_valid' => __( 'fields_not_valid' => __(
'Unfortunately, your credit card details are not valid.', 'Unfortunately, your credit card details are not valid.',
'woocommerce-paypal-payments' 'woocommerce-paypal-payments'