fix(payment): fixed the issue with triggering BraintreePaypalCreditBanner for BigCommercePayments provider and made made a little refactoring of customTitles #2631
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,19 +66,50 @@ export function getPaymentMethodTitle( | |
| logoUrl: '', | ||
| titleText: methodName, | ||
| }, | ||
| [PaymentMethodType.GooglePay]: { | ||
| logoUrl: cdnPath('/img/payment-providers/google-pay.png'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodType.PayWithGoogle]: { | ||
| logoUrl: cdnPath('/img/payment-providers/google-pay.png'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodType.Barclaycard]: { | ||
| logoUrl: cdnPath( | ||
| `/img/payment-providers/barclaycard_${method.id.toLowerCase()}.png`, | ||
| ), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.AdyenV2]: { | ||
| logoUrl: `https://checkoutshopper-live.adyen.com/checkoutshopper/images/logos/${ | ||
| method.method === 'scheme' ? 'card' : method.method | ||
| }.svg`, | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.AdyenV3]: { | ||
| logoUrl: `https://checkoutshopper-live.adyen.com/checkoutshopper/images/logos/${ | ||
| method.method === 'scheme' ? 'card' : method.method | ||
| }.svg`, | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.Affirm]: { | ||
| logoUrl: cdnPath('/img/payment-providers/affirm-checkout-header.png'), | ||
| titleText: language.translate('payment.affirm_display_name_text'), | ||
| }, | ||
| [PaymentMethodId.Afterpay]: { | ||
| logoUrl: isExperimentEnabled(checkoutSettings, 'PROJECT-6993.change_afterpay_logo_for_us_stores') && storeCountryCode === 'US' ? cdnPath('/img/payment-providers/afterpay-new-us.svg') : cdnPath('/img/payment-providers/afterpay-badge-blackonmint.png'), | ||
| titleText: methodName, | ||
| }, | ||
| [PaymentMethodId.AmazonPay]: { | ||
| logoUrl: cdnPath('/img/payment-providers/amazon-header.png'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.ApplePay]: { | ||
| logoUrl: cdnPath('/modules/checkout/applepay/images/[email protected]'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.Bolt]: { | ||
| logoUrl: '', | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.BraintreeAch]: { | ||
|
|
@@ -89,78 +120,67 @@ export function getPaymentMethodTitle( | |
| logoUrl: method.logoUrl || '', | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.BraintreePayPal]: { | ||
|
Contributor
Author
There was a problem hiding this comment. This is new. It was added to let only |
||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo_letter.svg'), | ||
| titleText: methodDisplayName, | ||
| subtitle: (props: PaymentMethodSubtitleProps): ReactNode => ( | ||
| <BraintreePaypalCreditBanner containerId='braintree-credit-banner-container' {...props} /> | ||
| ), | ||
| }, | ||
| [PaymentMethodId.BraintreePaypalCredit]: { | ||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo_letter.svg'), | ||
| titleText: methodDisplayName, | ||
| subtitle: (props: PaymentMethodSubtitleProps): ReactNode => ( | ||
| <BraintreePaypalCreditBanner containerId='braintree-credit-banner-container' {...props} /> | ||
| ), | ||
| }, | ||
| [PaymentMethodId.BraintreeVenmo]: { | ||
| logoUrl: method.logoUrl || '', | ||
| titleText: method.logoUrl ? '' : methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.BraintreeVisaCheckout]: { | ||
|
Contributor
Author
There was a problem hiding this comment.
This was made to simplify understanding of the affiliation of the VisaCheckout payment method type. |
||
| logoUrl: cdnPath('/img/payment-providers/visa-checkout.png'), | ||
| titleText: methodName, | ||
| }, | ||
| [PaymentMethodId.BigCommercePaymentsAlternativeMethod]: { | ||
| logoUrl: | ||
| method.id === PaymentMethodId.Klarna | ||
| ? cdnPath('/img/payment-providers/klarna.png') | ||
| : method.logoUrl || '', | ||
| titleText: method.logoUrl ? '' : methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.BigCommercePaymentsVenmo]: { | ||
|
Contributor
Author
There was a problem hiding this comment. This method moved here just to avoid making unnecessary condition in the end of current method. Also the code will be easier to read. |
||
| logoUrl: method.logoUrl || '', | ||
| titleText: method.logoUrl ? '' : methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.BigCommercePaymentsPayPal]: { | ||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo.svg'), | ||
| titleText: '', | ||
| subtitle: (props: PaymentMethodSubtitleProps) => <BigCommercePaymentsPayLaterBanner {...props} /> | ||
| }, | ||
| [PaymentMethodId.BigCommercePaymentsPayLater]: { | ||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo_letter.svg'), | ||
| titleText: methodDisplayName, | ||
| subtitle: (props: PaymentMethodSubtitleProps) => <BigCommercePaymentsPayLaterBanner {...props} /> | ||
| }, | ||
| [PaymentMethodId.Checkoutcom]: { | ||
| logoUrl: ['credit_card', 'card', 'checkoutcom'].includes(method.id) | ||
| ? '' | ||
| : cdnPath(`/img/payment-providers/checkoutcom_${method.id.toLowerCase()}.svg`), | ||
| titleText: methodName, | ||
| }, | ||
| [PaymentMethodId.Clearpay]: { | ||
| logoUrl: cdnPath('/img/payment-providers/clearpay-header.png'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.Humm]: { | ||
| logoUrl: cdnPath('/img/payment-providers/humm-checkout-header.png'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.Klarna]: { | ||
| logoUrl: method.initializationData?.enableBillie | ||
| ? cdnPath('/img/payment-providers/klarna-billie-header.png') | ||
| : cdnPath('/img/payment-providers/klarna-header.png'), | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.Laybuy]: { | ||
|
|
@@ -171,59 +191,50 @@ export function getPaymentMethodTitle( | |
| logoUrl: 'https://masterpass.com/dyn/img/acc/global/mp_mark_hor_blk.svg', | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.Mollie]: { | ||
| logoUrl: | ||
| method.method === 'credit_card' | ||
| ? '' | ||
| : cdnPath(`/img/payment-providers/mollie_${method.method}.svg`), | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.PaypalCommerceAlternativeMethod]: { | ||
| logoUrl: method.logoUrl || '', | ||
| titleText: method.logoUrl ? '' : methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.PaypalCommerceVenmo]: { | ||
|
Contributor
Author
There was a problem hiding this comment. Same as for BigCommercePaymentsVenmo |
||
| logoUrl: method.logoUrl || '', | ||
| titleText: method.logoUrl ? '' : methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.PaypalCommerce]: { | ||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo.svg'), | ||
| titleText: '', | ||
| subtitle: (props: PaymentMethodSubtitleProps) => <PaypalCommerceCreditBanner containerId='paypal-commerce-banner-container' {...props} /> | ||
| }, | ||
| [PaymentMethodId.PaypalCommerceCredit]: { | ||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo_letter.svg'), | ||
| titleText: methodDisplayName, | ||
| subtitle: (props: PaymentMethodSubtitleProps) => <PaypalCommerceCreditBanner containerId='paypal-commerce-credit-banner-container' {...props} /> | ||
| }, | ||
| [PaymentMethodId.PaypalExpress]: { | ||
|
Contributor
Author
There was a problem hiding this comment. New one. It was created instead of PaymentMethodType.PayPal.
|
||
| logoUrl: method.logoUrl ? method.logoUrl : cdnPath('/img/payment-providers/paypalpaymentsprouk.png'), | ||
| titleText: '', | ||
| }, | ||
| [PaymentMethodId.PaypalExpressCredit]: { | ||
|
Contributor
Author
There was a problem hiding this comment. New one. It was created instead of PaymentMethodType.PayPalCredit.
|
||
| logoUrl: cdnPath('/img/payment-providers/paypal_commerce_logo_letter.svg'), | ||
| titleText: methodDisplayName, | ||
| }, | ||
| [PaymentMethodId.Quadpay]: { | ||
| logoUrl: cdnPath('/img/payment-providers/quadpay.png'), | ||
| titleText: language.translate('payment.quadpay_display_name_text'), | ||
| }, | ||
| [PaymentMethodId.Ratepay]: { | ||
|
Contributor
Author
There was a problem hiding this comment. Was moved from condition bellow. Does not know why it was not placed here in the past |
||
| logoUrl: method.logoUrl || '', | ||
| titleText: language.translate('payment.ratepay.payment_method_title'), | ||
| }, | ||
| [PaymentMethodId.Sezzle]: { | ||
| logoUrl: cdnPath('/img/payment-providers/sezzle-checkout-header.png'), | ||
| titleText: language.translate('payment.sezzle_display_name_text'), | ||
| }, | ||
| [PaymentMethodId.StripeV3]: { | ||
| logoUrl: paymentWithLogo.includes(method.id) | ||
|
|
@@ -247,6 +258,10 @@ export function getPaymentMethodTitle( | |
| logoUrl: '', | ||
| titleText: language.translate('payment.credit_debit_card_text'), | ||
| }, | ||
| [PaymentMethodId.Zip]: { | ||
| logoUrl: cdnPath('/img/payment-providers/zip.png'), | ||
| titleText: language.translate('payment.zip_display_name_text'), | ||
| }, | ||
| }; | ||
|
|
||
| if (method.gateway === PaymentMethodId.BlueSnapDirect) { | ||
|
|
@@ -263,24 +278,6 @@ export function getPaymentMethodTitle( | |
| } | ||
| } | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. Moved to |
||
|
Contributor
Author
There was a problem hiding this comment. Moved to |
||
|
Contributor
Author
There was a problem hiding this comment. Moved to |
||
| // KLUDGE: 'paypal' is actually a credit card method. It is the only | ||
| // exception to the rule below. We should probably fix it on API level, | ||
| // but apparently it would break LCO if we are not careful. | ||
|
|
@@ -291,10 +288,6 @@ export function getPaymentMethodTitle( | |
| return customTitles[PaymentMethodType.CreditCard]; | ||
| } | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. Moved to |
||
| return ( | ||
| customTitles[method.gateway || ''] || | ||
| customTitles[method.id] || | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I didn't left a comment for the change, then it was just sorted