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

add setting and manage availability of dcc gateway

Browse source
This commit is contained in:
David Remer 2020-09-02 13:52:40 +03:00
parent f9e64abe14
commit 57a6f8b85c
7 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-button/services.php
View file

@ -60,7 +60,7 @@ return array(
}
$settings = $container->get( 'wcgateway.settings' );
$paypal_disabled = ! $settings->has( 'enabled' ) || ! $settings->get( 'enabled' );
$credit_card_disabled = ! $settings->has( 'dcc_gateway_enabled' ) || ! $settings->get( 'dcc_gateway_enabled' );
$credit_card_disabled = ! $settings->has( 'dcc_enabled' ) || ! $settings->get( 'dcc_enabled' );
if ( $paypal_disabled && $credit_card_disabled ) {
return new DisabledSmartButton();
}

6
modules/ppcp-button/src/Assets/class-smartbutton.php
View file

@ -165,8 +165,8 @@ class SmartButton implements SmartButtonInterface {
}
if (
$this->settings->has( 'dcc_gateway_enabled' )
&& $this->settings->get( 'dcc_gateway_enabled' )
$this->settings->has( 'dcc_enabled' )
&& $this->settings->get( 'dcc_enabled' )
&& ! $this->session_handler->order()
) {
add_action(
@ -772,7 +772,7 @@ class SmartButton implements SmartButtonInterface {
return false;
}
$keys = array(
'dcc_gateway_enabled' => 'is_checkout',
'dcc_enabled' => 'is_checkout',
);
foreach ( $keys as $key => $callback ) {
if ( $this->settings->has( $key ) && $this->settings->get( $key ) && $callback() ) {

12
modules/ppcp-wc-gateway/services.php
View file

@ -288,6 +288,16 @@ return array(
'requirements' => array(),
'gateway' => 'paypal',
),
'dcc_enabled' => array(
'title' => __( 'Enable/Disable' ),
'type' => 'checkbox',
'default' => false,
'gateway' => 'dcc',
'requirements' => array(),
'screens' => array(
State::STATE_ONBOARDED,
),
),
'dcc_gateway_title' => array(
'title' => __( 'Title', 'paypal-for-woocommerce' ),
'type' => 'text',
@ -298,7 +308,6 @@ return array(
'default' => __( 'Credit Cards', 'paypal-for-woocommerce' ),
'desc_tip' => true,
'screens' => array(
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
),
'requirements' => array(),
@ -336,7 +345,6 @@ return array(
'paypal-for-woocommerce'
),
'screens' => array(
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
),
'requirements' => array(),

4
modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
View file

@ -197,4 +197,8 @@ class CreditCardGateway extends PayPalGateway {
),
);
}
public function is_available() : bool {
return $this->config->has('dcc_enabled') && $this->config->get('dcc_enabled');
}
}

2
modules/ppcp-wc-gateway/src/Settings/class-settings.php
View file

@ -81,7 +81,7 @@ class Settings implements ContainerInterface {
$this->load();
$fields_to_reset = array(
'enabled',
'dcc_gateway_enabled',
'dcc_enabled',
'intent',
'client_id',
'client_secret',

4
modules/ppcp-wc-gateway/src/Settings/class-settingslistener.php
View file

@ -122,13 +122,13 @@ class SettingsListener {
if ( ! isset( $_GET[ SectionsRenderer::KEY ] ) || PayPalGateway::ID === $_GET[ SectionsRenderer::KEY ] ) {
$settings['enabled'] = isset( $_POST['woocommerce_ppcp-gateway_enabled'] )
&& 1 === absint( $_POST['woocommerce_ppcp-gateway_enabled'] );
$this->maybe_register_webhooks( $settings );
}
if ( isset( $_GET[ SectionsRenderer::KEY ] ) && CreditCardGateway::ID === $_GET[ SectionsRenderer::KEY ] ) {
$dcc_enabled_post_key = 'woocommerce_ppcp-credit-card-gateway_enabled';
$settings['dcc_gateway_enabled'] = isset( $_POST[ $dcc_enabled_post_key ] )
$settings['dcc_enabled'] = isset( $_POST[ $dcc_enabled_post_key ] )
&& 1 === absint( $_POST[ $dcc_enabled_post_key ] );
}
$this->maybe_register_webhooks( $settings );
foreach ( $settings as $id => $value ) {
$this->settings->set( $id, $value );

2
modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php
View file

@ -144,7 +144,7 @@ class WcGatewayModule implements ModuleInterface {
$settings = $container->get( 'wcgateway.settings' );
$key = PayPalGateway::ID === $_POST['gateway_id'] ? 'enabled' : '';
if ( CreditCardGateway::ID === $_POST['gateway_id'] ) {
$key = 'dcc_gateway_enabled';
$key = 'dcc_enabled';
}
if ( ! $key ) {
return;