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 11

Merge branch 'master' into PCP-30-add-dcc-wc-gateway

Browse source
This commit is contained in:
David Remer 2020-08-18 14:33:42 +03:00
commit f277f77ddf
2 changed files with 88 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -288,12 +288,14 @@ class SmartButton implements SmartButtonInterface
'color' => $this->styleForContext('color', 'mini-cart'),
'shape' => $this->styleForContext('shape', 'mini-cart'),
'label' => $this->styleForContext('label', 'mini-cart'),
'tagline' => $this->styleForContext('tagline', 'mini-cart'),
],
'style' => [
'layout' => $this->styleForContext('layout', $this->context()),
'color' => $this->styleForContext('color', $this->context()),
'shape' => $this->styleForContext('shape', $this->context()),
'label' => $this->styleForContext('label', $this->context()),
'tagline' => $this->styleForContext('tagline', $this->context()),
],
],
'hosted_fields' => [
@ -319,6 +321,13 @@ class SmartButton implements SmartButtonInterface
],
];
if ($this->styleForContext('layout', 'mini-cart') !== 'horizontal') {
unset($localize['button']['mini_cart_style']['tagline']);
}
if ($this->styleForContext('layout', $this->context()) !== 'horizontal') {
unset($localize['button']['style']['tagline']);
}
$this->requestData->dequeueNonceFix();
return $localize;
}
@ -451,6 +460,7 @@ class SmartButton implements SmartButtonInterface
'color' => 'gold',
'shape' => 'pill',
'label' => 'paypal',
'tagline' => true,
];
$value = isset($defaults[$style]) ?
@ -459,6 +469,10 @@ class SmartButton implements SmartButtonInterface
$this->settings->get('button_' . $style) : $value;
$value = $this->settings->has('button_' . $context . '_' . $style) ?
$this->settings->get('button_' . $context . '_' . $style) : $value;
if (is_bool($value)) {
$value = $value ? 'true' : 'false';
}
return $value;
}
}

84
modules.local/ppcp-wc-gateway/services.php
View file

@ -430,7 +430,7 @@ return [
'default' => 'vertical',
'desc_tip' => true,
'description' => __(
'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
'If additional funding sources are available to the buyer through PayPal, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
'woocommerce-paypal-commerce-gateway'
),
'options' => [
@ -444,6 +444,22 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_tagline' => [
'title' => __('Tagline', 'woocommerce-paypal-commerce-gateway'),
'type' => 'checkbox',
'default' => true,
'label' => __('Enable tagline', 'woocommerce-paypal-commerce-gateway'),
'desc_tip' => true,
'description' => __(
'Add the tagline. This line will only show up, if you select a horizontal layout.',
'woocommerce-paypal-commerce-gateway'
),
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
],
'button_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
@ -513,7 +529,7 @@ return [
],
//Single product page
'button_single_product_heading' => [
'button_product_heading' => [
'heading' => __('Single Product page', 'woocommerce-paypal-commerce-gateway'),
'type' => 'ppcp-heading',
'screens' => [
@ -523,7 +539,7 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_enabled' => [
'button_product_enabled' => [
'title' => __('Enable buttons on Single Product', 'woocommerce-paypal-commerce-gateway'),
'type' => 'checkbox',
'label' => __('Enable on Single Product', 'woocommerce-paypal-commerce-gateway'),
@ -535,11 +551,11 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_layout' => [
'button_product_layout' => [
'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'vertical',
'default' => 'horizontal',
'desc_tip' => true,
'description' => __(
'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
@ -556,7 +572,23 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_label' => [
'button_product_tagline' => [
'title' => __('Tagline', 'woocommerce-paypal-commerce-gateway'),
'type' => 'checkbox',
'label' => __('Enable tagline', 'woocommerce-paypal-commerce-gateway'),
'default' => true,
'desc_tip' => true,
'description' => __(
'Add the tagline. This line will only show up, if you select a horizontal layout.',
'woocommerce-paypal-commerce-gateway'
),
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
],
'button_product_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
@ -579,7 +611,7 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_color' => [
'button_product_color' => [
'title' => __('Color', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
@ -602,7 +634,7 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_shape' => [
'button_product_shape' => [
'title' => __('Shape', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
@ -651,7 +683,7 @@ return [
'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'vertical',
'default' => 'horizontal',
'desc_tip' => true,
'description' => __(
'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
@ -668,6 +700,22 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_mini-cart_tagline' => [
'title' => __('Tagline', 'woocommerce-paypal-commerce-gateway'),
'type' => 'checkbox',
'label' => __('Enable tagline', 'woocommerce-paypal-commerce-gateway'),
'default' => false,
'desc_tip' => true,
'description' => __(
'Add the tagline. This line will only show up, if you select a horizontal layout.',
'woocommerce-paypal-commerce-gateway'
),
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
],
'button_mini-cart_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
@ -763,7 +811,7 @@ return [
'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'vertical',
'default' => 'horizontal',
'desc_tip' => true,
'description' => __(
'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
@ -780,6 +828,22 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_cart_tagline' => [
'title' => __('Tagline', 'woocommerce-paypal-commerce-gateway'),
'type' => 'checkbox',
'label' => __('Enable tagline', 'woocommerce-paypal-commerce-gateway'),
'default' => true,
'desc_tip' => true,
'description' => __(
'Add the tagline. This line will only show up, if you select a horizontal layout.',
'woocommerce-paypal-commerce-gateway'
),
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
],
'button_cart_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',