diff --git a/modules/ppcp-api-client/src/Helper/DccApplies.php b/modules/ppcp-api-client/src/Helper/DccApplies.php index 6d694536c..b13399423 100644 --- a/modules/ppcp-api-client/src/Helper/DccApplies.php +++ b/modules/ppcp-api-client/src/Helper/DccApplies.php @@ -77,6 +77,18 @@ class DccApplies { return $applies; } + /** + * Returns whether WooCommerce Payments plugin is available for the store country. + * + * @return bool + */ + public function for_wc_payments(): bool { + $countries = array_keys( $this->allowed_country_currency_matrix ); + array_push( $countries, 'AT', 'BE', 'HK', 'IE', 'NL', 'PL', 'PT', 'SG', 'CH' ); + + return in_array( $this->country, $countries, true ); + } + /** * Returns credit cards, which can be used. * diff --git a/modules/ppcp-onboarding/assets/css/onboarding.css b/modules/ppcp-onboarding/assets/css/onboarding.css index eafbe718a..9441ac5fa 100644 --- a/modules/ppcp-onboarding/assets/css/onboarding.css +++ b/modules/ppcp-onboarding/assets/css/onboarding.css @@ -55,6 +55,7 @@ ul.ppcp-onboarding-options, ul.ppcp-onboarding-options-sublist { ul.ppcp-onboarding-options-sublist { margin-left: 15px; + margin-top: 15px; } .ppcp-muted-text { diff --git a/modules/ppcp-onboarding/assets/js/onboarding.js b/modules/ppcp-onboarding/assets/js/onboarding.js index 5671938e4..64eb9375e 100644 --- a/modules/ppcp-onboarding/assets/js/onboarding.js +++ b/modules/ppcp-onboarding/assets/js/onboarding.js @@ -158,6 +158,8 @@ function ppcp_onboarding_productionCallback(...args) { input.disabled = !cardsChk.checked; }); + document.querySelector('.ppcp-onboarding-cards-options').style.display = !cardsChk.checked ? 'none' : ''; + const basicRb = document.querySelector('#ppcp-onboarding-dcc-basic'); const isExpress = !cardsChk.checked || basicRb.checked; diff --git a/modules/ppcp-onboarding/src/Render/OnboardingOptionsRenderer.php b/modules/ppcp-onboarding/src/Render/OnboardingOptionsRenderer.php index c760b2f2c..3720fe6a6 100644 --- a/modules/ppcp-onboarding/src/Render/OnboardingOptionsRenderer.php +++ b/modules/ppcp-onboarding/src/Render/OnboardingOptionsRenderer.php @@ -56,6 +56,7 @@ class OnboardingOptionsRenderer { * @param bool $is_shop_supports_dcc Whether the shop can use DCC (country, currency). */ public function render( bool $is_shop_supports_dcc ): string { + $checked = $is_shop_supports_dcc ? '' : 'checked'; return '