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

resolve merge conflict

Browse source
This commit is contained in:
David Remer 2020-08-18 12:40:24 +03:00
commit 3fdb3d641d
3 changed files with 44 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -444,29 +444,6 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_size' => [
'title' => __('Button Size', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'responsive',
'desc_tip' => true,
'description' => __(
'PayPal offers different sizes of the "PayPal Checkout" buttons, allowing you to select a size that best fits your site\'s theme. This setting will allow you to choose which size button(s) appear on your page. (The "Responsive" option adjusts to container size, and is available and recommended for Smart Payment Buttons.)',
'woocommerce-paypal-commerce-gateway'
),
'options' => [
'small' => __('Small', 'woocommerce-paypal-commerce-gateway'),
'medium' => __('Medium', 'woocommerce-paypal-commerce-gateway'),
'large' => __('Large', 'woocommerce-paypal-commerce-gateway'),
'responsive' => __('Responsive', 'woocommerce-paypal-commerce-gateway'),
],
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
'gateway' => 'paypal',
],
'button_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
@ -579,29 +556,6 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_size' => [
'title' => __('Button Size', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'responsive',
'desc_tip' => true,
'description' => __(
'PayPal offers different sizes of the "PayPal Checkout" buttons, allowing you to select a size that best fits your site\'s theme. This setting will allow you to choose which size button(s) appear on your page. (The "Responsive" option adjusts to container size, and is available and recommended for Smart Payment Buttons.)',
'woocommerce-paypal-commerce-gateway'
),
'options' => [
'small' => __('Small', 'woocommerce-paypal-commerce-gateway'),
'medium' => __('Medium', 'woocommerce-paypal-commerce-gateway'),
'large' => __('Large', 'woocommerce-paypal-commerce-gateway'),
'responsive' => __('Responsive', 'woocommerce-paypal-commerce-gateway'),
],
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
'gateway' => 'paypal',
],
'button_single_product_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
@ -714,29 +668,6 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_mini-cart_size' => [
'title' => __('Button Size', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'responsive',
'desc_tip' => true,
'description' => __(
'PayPal offers different sizes of the "PayPal Checkout" buttons, allowing you to select a size that best fits your site\'s theme. This setting will allow you to choose which size button(s) appear on your page. (The "Responsive" option adjusts to container size, and is available and recommended for Smart Payment Buttons.)',
'woocommerce-paypal-commerce-gateway'
),
'options' => [
'small' => __('Small', 'woocommerce-paypal-commerce-gateway'),
'medium' => __('Medium', 'woocommerce-paypal-commerce-gateway'),
'large' => __('Large', 'woocommerce-paypal-commerce-gateway'),
'responsive' => __('Responsive', 'woocommerce-paypal-commerce-gateway'),
],
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
'gateway' => 'paypal',
],
'button_mini-cart_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
@ -849,29 +780,6 @@ return [
'requirements' => [],
'gateway' => 'paypal',
],
'button_cart_size' => [
'title' => __('Button Size', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',
'class' => ['wc-enhanced-select'],
'default' => 'responsive',
'desc_tip' => true,
'description' => __(
'PayPal offers different sizes of the "PayPal Checkout" buttons, allowing you to select a size that best fits your site\'s theme. This setting will allow you to choose which size button(s) appear on your page. (The "Responsive" option adjusts to container size, and is available and recommended for Smart Payment Buttons.)',
'woocommerce-paypal-commerce-gateway'
),
'options' => [
'small' => __('Small', 'woocommerce-paypal-commerce-gateway'),
'medium' => __('Medium', 'woocommerce-paypal-commerce-gateway'),
'large' => __('Large', 'woocommerce-paypal-commerce-gateway'),
'responsive' => __('Responsive', 'woocommerce-paypal-commerce-gateway'),
],
'screens' => [
State::STATE_PROGRESSIVE,
State::STATE_ONBOARDED,
],
'requirements' => [],
'gateway' => 'paypal',
],
'button_cart_label' => [
'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
'type' => 'select',