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

🔥 Remove redundant checks from SmartButton

Browse source 
Most checks are already implemented in the CardPaymentsConfiguration class.
This commit is contained in:
Philipp Stracker 2025-03-14 16:27:01 +01:00
parent 752dae1408
commit 433e7f7c8b
No known key found for this signature in database
1 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -720,9 +720,7 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
* Whether DCC fields can be rendered.
*/
public function can_render_dcc() : bool {
return $this->dcc_configuration->is_enabled()
&& $this->settings->has( 'client_id' ) && $this->settings->get( 'client_id' )
&& $this->dcc_applies->for_country_currency()
return $this->dcc_configuration->is_acdc_enabled()
&& in_array(
$this->context(),
apply_filters( 'woocommerce_paypal_payments_can_render_dcc_contexts', array( 'checkout', 'pay-now', 'add-payment-method' ) ),
@ -1126,7 +1124,7 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
'client_id' => $this->client_id,
'currency' => $this->currency->get(),
'data_client_id' => array(
'set_attribute' => ( is_checkout() && $this->dcc_is_enabled() ) || $this->can_save_vault_token(),
'set_attribute' => $this->dcc_is_enabled() || $this->can_save_vault_token(),
'endpoint' => \WC_AJAX::get_endpoint( DataClientIdEndpoint::ENDPOINT ),
'nonce' => wp_create_nonce( DataClientIdEndpoint::nonce() ),
'user' => get_current_user_id(),
@ -1595,31 +1593,12 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
}
/**
* Whether DCC is enabled or not.
* Whether ACDC is available on the current page.
*
* @return bool
*/
private function dcc_is_enabled() : bool {
// Card payments are only available on the checkout page, and for certain seller countries.
if ( ! is_checkout() || ! $this->dcc_applies->for_country_currency() ) {
return false;
}
try {
// Bail, if the merchant is not fully onboarded yet.
if (
! $this->settings->get( 'client_id' )
|| ! $this->settings->get( 'client_secret' )
) {
return false;
}
// The actual condition that must be met.
return $this->dcc_configuration->is_enabled();
} catch ( NotFoundException $e ) {
// Bail, if the settings DB entries are missing.
return false;
}
return is_checkout() && $this->dcc_configuration->is_acdc_enabled();
}
/**