Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update logic to only show additional gateways when other is installed and wcpay isnt eligible

This commit is contained in:
Ilyas Foo 2022-04-14 08:39:55 +08:00
parent 39c57c802f
commit adbc101312
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/woocommerce-admin/client/tasks/fills/PaymentGatewaySuggestions/index.js
View File

@ -214,7 +214,7 @@ export const PaymentGatewaySuggestions = ( { onComplete, query } ) => {
return false; return false;
}, [ countryCode, paymentGateways ] ); }, [ countryCode, paymentGateways ] );
const isEligibleWCPay = const isWCPaySupported =
Array.from( paymentGateways.values() ).findIndex( ( gateway ) => { Array.from( paymentGateways.values() ).findIndex( ( gateway ) => {
return ( return (
gateway.plugins?.length === 1 && gateway.plugins?.length === 1 &&
@ -252,9 +252,6 @@ export const PaymentGatewaySuggestions = ( { onComplete, query } ) => {
offline.push( gateway ); offline.push( gateway );
} else if ( gateway.enabled ) { } else if ( gateway.enabled ) {
// Enabled gateways should be ignored. // Enabled gateways should be ignored.
} else if ( ! isEligibleWCPay ) {
// When WCPay-ineligible, just show all gateways.
additional.push( gateway );
} else if ( isWCPayOrOtherCategoryDoneSetup ) { } else if ( isWCPayOrOtherCategoryDoneSetup ) {
// If WCPay or "other" gateway is enabled in an WCPay-eligible country, only // If WCPay or "other" gateway is enabled in an WCPay-eligible country, only
// allow to list "additional" gateways. // allow to list "additional" gateways.
@ -266,6 +263,9 @@ export const PaymentGatewaySuggestions = ( { onComplete, query } ) => {
) { ) {
additional.push( gateway ); additional.push( gateway );
} }
} else if ( ! isWCPaySupported ) {
// When WCPay-ineligible, just show all gateways.
additional.push( gateway );
} else if ( } else if (
gateway.category_other && gateway.category_other &&
gateway.category_other.indexOf( countryCode ) !== -1 gateway.category_other.indexOf( countryCode ) !== -1
@ -280,7 +280,7 @@ export const PaymentGatewaySuggestions = ( { onComplete, query } ) => {
), ),
[ [
countryCode, countryCode,
isEligibleWCPay, isWCPaySupported,
isWCPayOrOtherCategoryDoneSetup, isWCPayOrOtherCategoryDoneSetup,
paymentGateways, paymentGateways,
] ]