woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

Directly check if gateway is enabled

Browse source
This commit is contained in:
Narek Zakarian 2025-03-04 20:34:17 +04:00
parent ced161559f
commit 878bf393d7
No known key found for this signature in database
GPG key ID: 07AFD7E7A9C164A7
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/ppcp-compat/src/Settings/PaymentMethodSettingsMapHelper.php
View file

@ -9,7 +9,8 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Compat\Settings;
use WooCommerce\PayPalCommerce\Settings\Data\PaymentSettings;
use WooCommerce\PayPalCommerce\Axo\Gateway\AxoGateway;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
/**
* A map of old to new payment method settings.
@ -26,20 +27,18 @@ class PaymentMethodSettingsMapHelper {
*/
public function map(): array {
return array(
'dcc_enabled' => 'acdc',
'axo_enabled' => 'axo',
'dcc_enabled' => CreditCardGateway::ID,
'axo_enabled' => AxoGateway::ID,
);
}
/**
* Retrieves the value of a mapped key from the new settings.
*
* @param string $old_key The key from the legacy settings.
* @param PaymentSettings $payment_settings The payment settings model.
*
* @param string $old_key The key from the legacy settings.
* @return mixed The value of the mapped setting, (null if not found).
*/
public function mapped_value( string $old_key, PaymentSettings $payment_settings ): ?bool {
public function mapped_value( string $old_key): ?bool {
$payment_method = $this->map()[ $old_key ] ?? false;
@ -47,6 +46,19 @@ class PaymentMethodSettingsMapHelper {
return null;
}
return $payment_settings->is_method_enabled( $payment_method );
return $this->is_gateway_enabled( $payment_method );
}
/**
* Checks if the payment gateway with the given name is enabled.
*
* @param string $gateway_name The gateway name.
* @return bool True if the payment gateway with the given name is enabled, otherwise false.
*/
protected function is_gateway_enabled( string $gateway_name ): bool {
$gateway_settings = get_option( "woocommerce_{$gateway_name}_settings", [] );
$gateway_enabled = $gateway_settings['enabled'] ?? false;
return $gateway_enabled === 'yes';
}
}

2
modules/ppcp-compat/src/Settings/SettingsMapHelper.php
View file

@ -214,7 +214,7 @@ class SettingsMapHelper {
: $this->settings_tab_map_helper->mapped_value( $old_key, $this->model_cache[ $model_id ] );
case $model instanceof PaymentSettings:
return $this->payment_method_settings_map_helper->mapped_value( $old_key, $model );
return $this->payment_method_settings_map_helper->mapped_value( $old_key );
default:
return $this->model_cache[ $model_id ][ $new_key ] ?? null;

6
modules/ppcp-settings/src/Data/PaymentSettings.php
View file

@ -105,12 +105,6 @@ class PaymentSettings extends AbstractDataModel {
return $this->get_paylater_enabled();
default:
if (
! did_filter( 'woocommerce_payment_gateways' )
|| doing_filter( 'woocommerce_payment_gateways' )
) {
return true;
}
$gateway = $this->get_gateway( $method_id );
if ( $gateway ) {