remove extra checkout enable checkbox for dcc

This commit is contained in:
David Remer 2020-08-19 16:07:46 +03:00
parent 0bc0d66456
commit 47e5d96f4f
3 changed files with 3 additions and 20 deletions

View file

@ -74,8 +74,8 @@ class SmartButton implements SmartButtonInterface
$this->renderMessageWrapperRegistrar(); $this->renderMessageWrapperRegistrar();
if ( if (
$this->settings->has('dcc_checkout_enabled') $this->settings->has('dcc_gateway_enabled')
&& $this->settings->get('dcc_checkout_enabled') && $this->settings->get('dcc_gateway_enabled')
&& ! $this->sessionHandler->order() && ! $this->sessionHandler->order()
) { ) {
add_action( add_action(
@ -603,10 +603,7 @@ class SmartButton implements SmartButtonInterface
return false; return false;
} }
$keys = [ $keys = [
'dcc_cart_enabled' => 'is_cart', 'dcc_gateway_enabled' => 'is_checkout',
'dcc_mini_cart_enabled' => '__return_true',
'dcc_checkout_enabled' => 'is_checkout',
'dcc_single_product_enabled' => 'is_product',
]; ];
foreach ($keys as $key => $callback) { foreach ($keys as $key => $callback) {
if ($this->settings->has($key) && $this->settings->get($key) && $callback()) { if ($this->settings->has($key) && $this->settings->get($key) && $callback()) {

View file

@ -1436,19 +1436,6 @@ return [
'gateway' => 'paypal', 'gateway' => 'paypal',
], ],
'dcc_checkout_enabled' => [
'title' => __('Enable credit card on checkout', 'woocommerce-paypal-commerce-gateway'),
'type' => 'checkbox',
'label' => __('Allow your customers to pay with credit card in the checkout.', 'woocommerce-paypal-commerce-gateway'),
'default' => true,
'screens' => [
State::STATE_ONBOARDED,
],
'requirements' => [
'dcc',
],
'gateway' => 'dcc',
],
'disable_cards' => [ 'disable_cards' => [
'title' => __('Disable specific credit cards', 'woocommerce-paypal-commerce-gateway'), 'title' => __('Disable specific credit cards', 'woocommerce-paypal-commerce-gateway'),
'type' => 'ppcp-multiselect', 'type' => 'ppcp-multiselect',

View file

@ -82,7 +82,6 @@ class Settings implements ContainerInterface
'button_cart_enabled' => true, 'button_cart_enabled' => true,
'dcc_cart_enabled' => true, 'dcc_cart_enabled' => true,
'dcc_mini_cart_enabled' => true, 'dcc_mini_cart_enabled' => true,
'dcc_checkout_enabled' => true,
'dcc_single_product_enabled' => true, 'dcc_single_product_enabled' => true,
'brand_name' => get_bloginfo('name'), 'brand_name' => get_bloginfo('name'),
]; ];