From 530f34823d4d3961a5febf7f52d7d00c353fb259 Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Fri, 14 Aug 2020 10:03:03 +0300
Subject: [PATCH 1/6] rearrange settings, add layout and size to button layout

---
 .../ppcp-button/src/Assets/SmartButton.php    |   5 +-
 modules.local/ppcp-wc-gateway/services.php    | 212 +++++++++++-------
 2 files changed, 134 insertions(+), 83 deletions(-)

diff --git a/modules.local/ppcp-button/src/Assets/SmartButton.php b/modules.local/ppcp-button/src/Assets/SmartButton.php
index 42fa094db..845296766 100644
--- a/modules.local/ppcp-button/src/Assets/SmartButton.php
+++ b/modules.local/ppcp-button/src/Assets/SmartButton.php
@@ -330,7 +330,10 @@ class SmartButton implements SmartButtonInterface
                 'cancel_wrapper' => '#ppcp-cancel',
                 'url' => $this->url(),
                 'style' => [
-                    'layout' => 'vertical',
+                    'layout' => ($this->settings->has('button_layout')) ?
+                        $this->settings->get('button_layout') : 'vertical',
+                    'size' => ($this->settings->has('button_size')) ?
+                        $this->settings->get('button_size') : 'responsive',
                     'color' => ($this->settings->has('button_color')) ?
                         $this->settings->get('button_color') : null,
                     'shape' => ($this->settings->has('button_shape')) ?
diff --git a/modules.local/ppcp-wc-gateway/services.php b/modules.local/ppcp-wc-gateway/services.php
index fbaa78f3a..a506b4e2d 100644
--- a/modules.local/ppcp-wc-gateway/services.php
+++ b/modules.local/ppcp-wc-gateway/services.php
@@ -269,61 +269,6 @@ return [
                 ],
                 'requirements' => [],
             ],
-            'button_single_product_enabled' => [
-                'title' => __('Buttons on Single Product', 'woocommerce-paypal-commerce-gateway'),
-                'type' => 'checkbox',
-                'label' => __('Enable on Single Product', 'woocommerce-paypal-commerce-gateway'),
-                'default' => true,
-                'screens' => [
-                    State::STATE_PROGRESSIVE,
-                    State::STATE_ONBOARDED,
-                ],
-                'requirements' => [],
-            ],
-            'button_mini_cart_enabled' => [
-                'title' => __('Buttons on Mini Cart', 'woocommerce-paypal-commerce-gateway'),
-                'type' => 'checkbox',
-                'label' => __('Enable on Mini Cart', 'woocommerce-paypal-commerce-gateway'),
-                'default' => true,
-                'screens' => [
-                    State::STATE_PROGRESSIVE,
-                    State::STATE_ONBOARDED,
-                ],
-                'requirements' => [],
-            ],
-            'button_cart_enabled' => [
-                'title' => __('Buttons on Cart', 'woocommerce-paypal-commerce-gateway'),
-                'type' => 'checkbox',
-                'label' => __('Enable on Cart', 'woocommerce-paypal-commerce-gateway'),
-                'default' => true,
-                'screens' => [
-                    State::STATE_PROGRESSIVE,
-                    State::STATE_ONBOARDED,
-                ],
-                'requirements' => [],
-            ],
-            'button_label' => [
-                'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
-                'type' => 'select',
-                'class' => ['wc-enhanced-select'],
-                'default' => 'paypal',
-                'desc_tip' => true,
-                'description' => __(
-                    'This controls the label on the primary button.',
-                    'woocommerce-paypal-commerce-gateway'
-                ),
-                'options' => [
-                    'paypal' => __('PayPal', 'woocommerce-paypal-commerce-gateway'),
-                    'checkout' => __('PayPal Checkout', 'woocommerce-paypal-commerce-gateway'),
-                    'buynow' => __('PayPal Buy Now', 'woocommerce-paypal-commerce-gateway'),
-                    'pay' => __('Pay with PayPal', 'woocommerce-paypal-commerce-gateway'),
-                ],
-                'screens' => [
-                    State::STATE_PROGRESSIVE,
-                    State::STATE_ONBOARDED,
-                ],
-                'requirements' => [],
-            ],
             'brand_name' => [
                 'title' => __('Brand Name', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'text',
@@ -359,6 +304,114 @@ return [
                 ],
                 'requirements' => [],
             ],
+            'disable_funding' => [
+                'title' => __('Disable funding sources', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'ppcp-multiselect',
+                'class' => ['wc-enhanced-select'],
+                'default' => [],
+                'desc_tip' => true,
+                'description' => __(
+                    'By default all possible funding sources will be shown. You can disable some sources, if you wish.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'card' => _x('Credit or debit cards', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'credit' => _x('PayPal Credit', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'sepa' => _x('SEPA-Lastschrift', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'bancontact' => _x('Bancontact', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'eps' => _x('eps', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'giropay' => _x('giropay', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'ideal' => _x('iDEAL', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'mybank' => _x('MyBank', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'p24' => _x('Przelewy24', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                    'sofort' => _x('Sofort', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'vault_enabled' => [
+                'title' => __('Vaulting', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'checkbox',
+                'desc_tip' => true,
+                'label' => __('Enable vaulting', 'woocommerce-paypal-commerce-gateway'),
+                'description' => __('Enables you to store payment tokens for subscriptions.', 'woocommerce-paypal-commerce-gateway'),
+                'default' => true,
+                'screens' => [
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+
+            //General button styles
+
+            // General button styles
+            'button_layout' => [
+                'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                '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.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'vertical' => __('Vertical', 'woocommerce-paypal-commerce-gateway'),
+                    'horizontal' => __('Horizontal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            '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' => [],
+            ],
+            'button_label' => [
+                'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'paypal',
+                'desc_tip' => true,
+                'description' => __(
+                    'This controls the label on the primary button.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'paypal' => __('PayPal', 'woocommerce-paypal-commerce-gateway'),
+                    'checkout' => __('PayPal Checkout', 'woocommerce-paypal-commerce-gateway'),
+                    'buynow' => __('PayPal Buy Now', 'woocommerce-paypal-commerce-gateway'),
+                    'pay' => __('Pay with PayPal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
             'button_color' => [
                 'title' => __('Color', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'select',
@@ -401,46 +454,41 @@ return [
                 ],
                 'requirements' => [],
             ],
-            'disable_funding' => [
-                'title' => __('Disable funding sources', 'woocommerce-paypal-commerce-gateway'),
-                'type' => 'ppcp-multiselect',
-                'class' => ['wc-enhanced-select'],
-                'default' => [],
-                'desc_tip' => true,
-                'description' => __(
-                    'By default all possible funding sources will be shown. You can disable some sources, if you wish.',
-                    'woocommerce-paypal-commerce-gateway'
-                ),
-                'options' => [
-                    'card' => _x('Credit or debit cards', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'credit' => _x('PayPal Credit', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'sepa' => _x('SEPA-Lastschrift', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'bancontact' => _x('Bancontact', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'eps' => _x('eps', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'giropay' => _x('giropay', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'ideal' => _x('iDEAL', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'mybank' => _x('MyBank', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'p24' => _x('Przelewy24', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                    'sofort' => _x('Sofort', 'Name of payment method', 'woocommerce-paypal-commerce-gateway'),
-                ],
+
+            'button_single_product_enabled' => [
+                'title' => __('Enable buttons on Single Product', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'checkbox',
+                'label' => __('enable on Single Product', 'woocommerce-paypal-commerce-gateway'),
+                'default' => true,
                 'screens' => [
                     State::STATE_PROGRESSIVE,
                     State::STATE_ONBOARDED,
                 ],
                 'requirements' => [],
             ],
-            'vault_enabled' => [
-                'title' => __('Vaulting', 'woocommerce-paypal-commerce-gateway'),
+            'button_mini_cart_enabled' => [
+                'title' => __('Buttons on Mini Cart', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'checkbox',
-                'desc_tip' => true,
-                'label' => __('Enable vaulting', 'woocommerce-paypal-commerce-gateway'),
-                'description' => __('Enables you to store payment tokens for subscriptions.', 'woocommerce-paypal-commerce-gateway'),
+                'label' => __('Enable on Mini Cart', 'woocommerce-paypal-commerce-gateway'),
                 'default' => true,
                 'screens' => [
+                    State::STATE_PROGRESSIVE,
                     State::STATE_ONBOARDED,
                 ],
                 'requirements' => [],
             ],
+            'button_cart_enabled' => [
+                'title' => __('Buttons on Cart', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'checkbox',
+                'label' => __('Enable on Cart', 'woocommerce-paypal-commerce-gateway'),
+                'default' => true,
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+
             'dcc_cart_enabled' => [
                 'title' => __('Enable credit card on cart', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'checkbox',

From 13d8c61b2a87d1eb27b2964923c4205d53095b30 Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Fri, 14 Aug 2020 10:06:05 +0300
Subject: [PATCH 2/6] rearrange render methods for fields

---
 .../ppcp-wc-gateway/src/WcGatewayModule.php   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php b/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
index 2a93f195b..5d60689a4 100644
--- a/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
+++ b/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
@@ -117,22 +117,10 @@ class WcGatewayModule implements ModuleInterface
                 /**
                  * @var SettingsRenderer $renderer
                  */
-                return $renderer->renderPassword(
-                    $renderer->renderTextInput(
-                        $renderer->renderMultiSelect(
-                            $field,
-                            $key,
-                            $args,
-                            $value
-                        ),
-                        $key,
-                        $args,
-                        $value
-                    ),
-                    $key,
-                    $args,
-                    $value
-                );
+                $field = $renderer->renderMultiSelect($field, $key, $args, $value);
+                $field = $renderer->renderPassword($field, $key, $args, $value);
+                $field = $renderer->rendrenderTextInputerMultiSelect($field, $key, $args, $value);
+                return $field;
             },
             10,
             4

From e24fc0d7abfec33c86755ea0b8899e44160a088d Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Fri, 14 Aug 2020 10:09:11 +0300
Subject: [PATCH 3/6] add heading field

---
 modules.local/ppcp-wc-gateway/services.php    | 11 ++++++++--
 .../src/Settings/SettingsRenderer.php         | 21 ++++++++++++++++++-
 .../ppcp-wc-gateway/src/WcGatewayModule.php   |  3 ++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/modules.local/ppcp-wc-gateway/services.php b/modules.local/ppcp-wc-gateway/services.php
index a506b4e2d..f6562353a 100644
--- a/modules.local/ppcp-wc-gateway/services.php
+++ b/modules.local/ppcp-wc-gateway/services.php
@@ -346,8 +346,15 @@ return [
             ],
 
             //General button styles
-
-            // General button styles
+            'button_style_heading' => [
+                'heading' => __('General styles', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'ppcp-heading',
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
             'button_layout' => [
                 'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'select',
diff --git a/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
index 411b59d75..d8d609cef 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
@@ -104,6 +104,22 @@ class SettingsRenderer
 
         return $html;
     }
+
+    public function renderHeading($field, $key, $config, $value): string
+    {
+
+        if ($config['type'] !== 'ppcp-heading') {
+            return $field;
+        }
+
+        $html = sprintf(
+            '<h2 class="%s">%s</h2>',
+            esc_attr(implode(' ', $config['class'])),
+            esc_html($config['heading'])
+        );
+
+        return $html;
+    }
     //phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration.NoArgumentType
 
     public function render()
@@ -122,9 +138,11 @@ class SettingsRenderer
             }
             $value = $this->settings->has($field) ? $this->settings->get($field) : null;
             $id = 'ppcp[' . $field . ']';
+            $colspan = $config['type'] !== 'ppcp-heading' ? 1 : 2;
 
             ?>
         <tr valign="top" id="<?php echo esc_attr('field-' . $field); ?>">
+            <?php if ($config['type'] !== 'ppcp-heading') : ?>
             <th>
                 <label
                     for="<?php echo esc_attr($id); ?>"
@@ -137,7 +155,8 @@ class SettingsRenderer
                     <?php unset($config['description']);
                 endif; ?>
             </th>
-            <td><?php
+            <?php endif; ?>
+            <td colspan="<?php echo (int) $colspan; ?>"><?php
                 $config['type'] === 'ppcp-text' ?
                     $this->renderText($config)
                     : woocommerce_form_field($id, $config, $value); ?></td>
diff --git a/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php b/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
index 5d60689a4..81106a634 100644
--- a/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
+++ b/modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
@@ -119,7 +119,8 @@ class WcGatewayModule implements ModuleInterface
                  */
                 $field = $renderer->renderMultiSelect($field, $key, $args, $value);
                 $field = $renderer->renderPassword($field, $key, $args, $value);
-                $field = $renderer->rendrenderTextInputerMultiSelect($field, $key, $args, $value);
+                $field = $renderer->renderTextInput($field, $key, $args, $value);
+                $field = $renderer->renderHeading($field, $key, $args, $value);
                 return $field;
             },
             10,

From 5de78e1aaba6640785b78e5a9d9012f98b3dc40b Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Fri, 14 Aug 2020 10:28:24 +0300
Subject: [PATCH 4/6] add styles per context

---
 .../resources/js/modules/Renderer/Renderer.js |   2 +-
 .../ppcp-button/src/Assets/SmartButton.php    |  41 +-
 modules.local/ppcp-wc-gateway/services.php    | 354 +++++++++++++++++-
 .../ppcp-wc-gateway/src/Settings/Settings.php |   2 +-
 4 files changed, 383 insertions(+), 16 deletions(-)

diff --git a/modules.local/ppcp-button/resources/js/modules/Renderer/Renderer.js b/modules.local/ppcp-button/resources/js/modules/Renderer/Renderer.js
index 808a016a4..c8df1a393 100644
--- a/modules.local/ppcp-button/resources/js/modules/Renderer/Renderer.js
+++ b/modules.local/ppcp-button/resources/js/modules/Renderer/Renderer.js
@@ -15,7 +15,7 @@ class Renderer {
             return;
         }
 
-        const style = this.defaultConfig.button.style;
+        const style = wrapper === this.defaultConfig.button.wrapper ? this.defaultConfig.button.style : this.defaultConfig.button.mini_cart_style;
         paypal.Buttons({
             style,
             ...contextConfig,
diff --git a/modules.local/ppcp-button/src/Assets/SmartButton.php b/modules.local/ppcp-button/src/Assets/SmartButton.php
index 845296766..35094c25b 100644
--- a/modules.local/ppcp-button/src/Assets/SmartButton.php
+++ b/modules.local/ppcp-button/src/Assets/SmartButton.php
@@ -135,8 +135,8 @@ class SmartButton implements SmartButtonInterface
                 31
             );
         }
-        $notEnabledOnMiniCart = $this->settings->has('button_mini_cart_enabled') &&
-            !$this->settings->get('button_mini_cart_enabled');
+        $notEnabledOnMiniCart = $this->settings->has('button_mini-cart_enabled') &&
+            !$this->settings->get('button_mini-cart_enabled');
         if (
             ! $notEnabledOnMiniCart
         ) {
@@ -329,17 +329,19 @@ class SmartButton implements SmartButtonInterface
                 'mini_cart_wrapper' => '#ppc-button-minicart',
                 'cancel_wrapper' => '#ppcp-cancel',
                 'url' => $this->url(),
+                'mini_cart_style' => [
+                    'layout' => $this->styleForContext('layout', 'mini-cart'),
+                    'size' => $this->styleForContext('size', 'mini-cart'),
+                    'color' => $this->styleForContext('color', 'mini-cart'),
+                    'shape' => $this->styleForContext('shape', 'mini-cart'),
+                    'label' => $this->styleForContext('label', 'mini-cart'),
+                ],
                 'style' => [
-                    'layout' => ($this->settings->has('button_layout')) ?
-                        $this->settings->get('button_layout') : 'vertical',
-                    'size' => ($this->settings->has('button_size')) ?
-                        $this->settings->get('button_size') : 'responsive',
-                    'color' => ($this->settings->has('button_color')) ?
-                        $this->settings->get('button_color') : null,
-                    'shape' => ($this->settings->has('button_shape')) ?
-                        $this->settings->get('button_shape') : null,
-                    'label' => ($this->settings->has('button_label')) ?
-                        $this->settings->get('button_label') : 'paypal',
+                    'layout' => $this->styleForContext('layout', $this->context()),
+                    'size' => $this->styleForContext('size', $this->context()),
+                    'color' => $this->styleForContext('color', $this->context()),
+                    'shape' => $this->styleForContext('shape', $this->context()),
+                    'label' => $this->styleForContext('label', $this->context()),
                 ],
             ],
             'hosted_fields' => [
@@ -498,4 +500,19 @@ class SmartButton implements SmartButtonInterface
         }
         return false;
     }
+
+    private function styleForContext(string $style, string $context) : string {
+        $defaults = [
+            'layout' => 'vertical',
+            'size' => 'responsive',
+            'color' => 'gold',
+            'shape' => 'pill',
+            'label' => 'paypal',
+        ];
+
+        $value = isset($defaults[$style]) ? $defaults[$style] : '';
+        $value = $this->settings->has('button_' . $style) ? $this->settings->get('button_' . $style) : $value;
+        $value = $this->settings->has('button_' . $context . '_' . $style) ? $this->settings->get('button_' . $context . '_' . $style) : $value;
+        return $value;
+    }
 }
diff --git a/modules.local/ppcp-wc-gateway/services.php b/modules.local/ppcp-wc-gateway/services.php
index f6562353a..cfe1fcdf6 100644
--- a/modules.local/ppcp-wc-gateway/services.php
+++ b/modules.local/ppcp-wc-gateway/services.php
@@ -462,10 +462,20 @@ return [
                 'requirements' => [],
             ],
 
+            //Single product page
+            'button_single_product_heading' => [
+                'heading' => __('Single Product page', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'ppcp-heading',
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
             'button_single_product_enabled' => [
                 'title' => __('Enable buttons on Single Product', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'checkbox',
-                'label' => __('enable on Single Product', 'woocommerce-paypal-commerce-gateway'),
+                'label' => __('Enable on Single Product', 'woocommerce-paypal-commerce-gateway'),
                 'default' => true,
                 'screens' => [
                     State::STATE_PROGRESSIVE,
@@ -473,7 +483,124 @@ return [
                 ],
                 'requirements' => [],
             ],
-            'button_mini_cart_enabled' => [
+            'button_single_product_layout' => [
+                'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                '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.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'vertical' => __('Vertical', 'woocommerce-paypal-commerce-gateway'),
+                    'horizontal' => __('Horizontal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            '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' => [],
+            ],
+            'button_single_product_label' => [
+                'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'paypal',
+                'desc_tip' => true,
+                'description' => __(
+                    'This controls the label on the primary button.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'paypal' => __('PayPal', 'woocommerce-paypal-commerce-gateway'),
+                    'checkout' => __('PayPal Checkout', 'woocommerce-paypal-commerce-gateway'),
+                    'buynow' => __('PayPal Buy Now', 'woocommerce-paypal-commerce-gateway'),
+                    'pay' => __('Pay with PayPal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_single_product_color' => [
+                'title' => __('Color', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'gold',
+                'desc_tip' => true,
+                'description' => __(
+                    'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'gold' => __('Gold (Recommended)', 'woocommerce-paypal-commerce-gateway'),
+                    'blue' => __('Blue', 'woocommerce-paypal-commerce-gateway'),
+                    'silver' => __('Silver', 'woocommerce-paypal-commerce-gateway'),
+                    'black' => __('Black', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_single_product_shape' => [
+                'title' => __('Shape', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'rect',
+                'desc_tip' => true,
+                'description' => __(
+                    'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'pill' => __('Pill', 'woocommerce-paypal-commerce-gateway'),
+                    'rect' => __('Rectangle', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+
+            //Mini cart settings
+            'button_mini-cart_heading' => [
+                'heading' => __('Mini Cart', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'ppcp-heading',
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_mini-cart_enabled' => [
                 'title' => __('Buttons on Mini Cart', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'checkbox',
                 'label' => __('Enable on Mini Cart', 'woocommerce-paypal-commerce-gateway'),
@@ -484,6 +611,123 @@ return [
                 ],
                 'requirements' => [],
             ],
+            'button_mini-cart_layout' => [
+                'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                '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.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'vertical' => __('Vertical', 'woocommerce-paypal-commerce-gateway'),
+                    'horizontal' => __('Horizontal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            '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' => [],
+            ],
+            'button_mini-cart_label' => [
+                'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'paypal',
+                'desc_tip' => true,
+                'description' => __(
+                    'This controls the label on the primary button.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'paypal' => __('PayPal', 'woocommerce-paypal-commerce-gateway'),
+                    'checkout' => __('PayPal Checkout', 'woocommerce-paypal-commerce-gateway'),
+                    'buynow' => __('PayPal Buy Now', 'woocommerce-paypal-commerce-gateway'),
+                    'pay' => __('Pay with PayPal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_mini-cart_color' => [
+                'title' => __('Color', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'gold',
+                'desc_tip' => true,
+                'description' => __(
+                    'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'gold' => __('Gold (Recommended)', 'woocommerce-paypal-commerce-gateway'),
+                    'blue' => __('Blue', 'woocommerce-paypal-commerce-gateway'),
+                    'silver' => __('Silver', 'woocommerce-paypal-commerce-gateway'),
+                    'black' => __('Black', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_mini-cart_shape' => [
+                'title' => __('Shape', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'rect',
+                'desc_tip' => true,
+                'description' => __(
+                    'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'pill' => __('Pill', 'woocommerce-paypal-commerce-gateway'),
+                    'rect' => __('Rectangle', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+
+            //Cart settings
+            'button_cart_heading' => [
+                'heading' => __('Cart', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'ppcp-heading',
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
             'button_cart_enabled' => [
                 'title' => __('Buttons on Cart', 'woocommerce-paypal-commerce-gateway'),
                 'type' => 'checkbox',
@@ -495,6 +739,112 @@ return [
                 ],
                 'requirements' => [],
             ],
+            'button_cart_layout' => [
+                'title' => __('Button Layout', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                '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.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'vertical' => __('Vertical', 'woocommerce-paypal-commerce-gateway'),
+                    'horizontal' => __('Horizontal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            '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' => [],
+            ],
+            'button_cart_label' => [
+                'title' => __('Button Label', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'paypal',
+                'desc_tip' => true,
+                'description' => __(
+                    'This controls the label on the primary button.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'paypal' => __('PayPal', 'woocommerce-paypal-commerce-gateway'),
+                    'checkout' => __('PayPal Checkout', 'woocommerce-paypal-commerce-gateway'),
+                    'buynow' => __('PayPal Buy Now', 'woocommerce-paypal-commerce-gateway'),
+                    'pay' => __('Pay with PayPal', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_cart_color' => [
+                'title' => __('Color', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'gold',
+                'desc_tip' => true,
+                'description' => __(
+                    'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'gold' => __('Gold (Recommended)', 'woocommerce-paypal-commerce-gateway'),
+                    'blue' => __('Blue', 'woocommerce-paypal-commerce-gateway'),
+                    'silver' => __('Silver', 'woocommerce-paypal-commerce-gateway'),
+                    'black' => __('Black', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
+            'button_cart_shape' => [
+                'title' => __('Shape', 'woocommerce-paypal-commerce-gateway'),
+                'type' => 'select',
+                'class' => ['wc-enhanced-select'],
+                'default' => 'rect',
+                'desc_tip' => true,
+                'description' => __(
+                    'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
+                    'woocommerce-paypal-commerce-gateway'
+                ),
+                'options' => [
+                    'pill' => __('Pill', 'woocommerce-paypal-commerce-gateway'),
+                    'rect' => __('Rectangle', 'woocommerce-paypal-commerce-gateway'),
+                ],
+                'screens' => [
+                    State::STATE_PROGRESSIVE,
+                    State::STATE_ONBOARDED,
+                ],
+                'requirements' => [],
+            ],
 
             'dcc_cart_enabled' => [
                 'title' => __('Enable credit card on cart', 'woocommerce-paypal-commerce-gateway'),
diff --git a/modules.local/ppcp-wc-gateway/src/Settings/Settings.php b/modules.local/ppcp-wc-gateway/src/Settings/Settings.php
index d5bf7671c..872e97e7f 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/Settings.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/Settings.php
@@ -77,7 +77,7 @@ class Settings implements ContainerInterface
                 'woocommerce-paypal-commerce-gateway'
             ),
             'button_single_product_enabled' => true,
-            'button_mini_cart_enabled' => true,
+            'button_mini-cart_enabled' => true,
             'button_cart_enabled' => true,
             'dcc_cart_enabled' => true,
             'dcc_mini_cart_enabled' => true,

From 875356b24f26395284be6bb7b270d53a81d7a601 Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Fri, 14 Aug 2020 10:41:53 +0300
Subject: [PATCH 5/6] phpcs

---
 modules.local/ppcp-button/src/Assets/SmartButton.php | 12 ++++++++----
 .../src/Settings/SettingsRenderer.php                |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules.local/ppcp-button/src/Assets/SmartButton.php b/modules.local/ppcp-button/src/Assets/SmartButton.php
index 35094c25b..433449cc5 100644
--- a/modules.local/ppcp-button/src/Assets/SmartButton.php
+++ b/modules.local/ppcp-button/src/Assets/SmartButton.php
@@ -501,7 +501,8 @@ class SmartButton implements SmartButtonInterface
         return false;
     }
 
-    private function styleForContext(string $style, string $context) : string {
+    private function styleForContext(string $style, string $context): string
+    {
         $defaults = [
             'layout' => 'vertical',
             'size' => 'responsive',
@@ -510,9 +511,12 @@ class SmartButton implements SmartButtonInterface
             'label' => 'paypal',
         ];
 
-        $value = isset($defaults[$style]) ? $defaults[$style] : '';
-        $value = $this->settings->has('button_' . $style) ? $this->settings->get('button_' . $style) : $value;
-        $value = $this->settings->has('button_' . $context . '_' . $style) ? $this->settings->get('button_' . $context . '_' . $style) : $value;
+        $value = isset($defaults[$style]) ?
+            $defaults[$style] : '';
+        $value = $this->settings->has('button_' . $style) ?
+            $this->settings->get('button_' . $style) : $value;
+        $value = $this->settings->has('button_' . $context . '_' . $style) ?
+            $this->settings->get('button_' . $context . '_' . $style) : $value;
         return $value;
     }
 }
diff --git a/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
index d8d609cef..6fda892bf 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
@@ -122,6 +122,7 @@ class SettingsRenderer
     }
     //phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration.NoArgumentType
 
+    //phpcs:disable Inpsyde.CodeQuality.NestingLevel.High
     public function render()
     {
 
@@ -163,6 +164,7 @@ class SettingsRenderer
         </tr>
         <?php endforeach;
     }
+    //phpcs:enable Inpsyde.CodeQuality.NestingLevel.High
 
     private function renderText(array $config)
     {

From 65b38f75221d3025d813cd1be87590dab4d4014c Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Fri, 14 Aug 2020 13:38:20 +0300
Subject: [PATCH 6/6] proper heading order

---
 .../ppcp-wc-gateway/src/Settings/SettingsRenderer.php      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php b/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
index 6fda892bf..c17aa8fe2 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/SettingsRenderer.php
@@ -113,7 +113,7 @@ class SettingsRenderer
         }
 
         $html = sprintf(
-            '<h2 class="%s">%s</h2>',
+            '<h3 class="%s">%s</h3>',
             esc_attr(implode(' ', $config['class'])),
             esc_html($config['heading'])
         );
@@ -139,6 +139,7 @@ class SettingsRenderer
             }
             $value = $this->settings->has($field) ? $this->settings->get($field) : null;
             $id = 'ppcp[' . $field . ']';
+            $thTd = $config['type'] !== 'ppcp-heading' ? 'td' : 'th';
             $colspan = $config['type'] !== 'ppcp-heading' ? 1 : 2;
 
             ?>
@@ -157,10 +158,10 @@ class SettingsRenderer
                 endif; ?>
             </th>
             <?php endif; ?>
-            <td colspan="<?php echo (int) $colspan; ?>"><?php
+            <<?php echo $thTd; ?> colspan="<?php echo (int) $colspan; ?>"><?php
                 $config['type'] === 'ppcp-text' ?
                     $this->renderText($config)
-                    : woocommerce_form_field($id, $config, $value); ?></td>
+                    : woocommerce_form_field($id, $config, $value); ?></<?php echo $thTd; ?>>
         </tr>
         <?php endforeach;
     }