From f4e4cfe4fdfab10573d1078ea45926ce605d89c4 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@gmail.com>
Date: Mon, 25 Nov 2019 10:15:06 +0530
Subject: [PATCH 1/2] Express Checkout - Checkout Page Display, PFW-532

---
 classes/wc-gateway-paypal-express-angelleye.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/wc-gateway-paypal-express-angelleye.php b/classes/wc-gateway-paypal-express-angelleye.php
index a3f90b9db..fac619c38 100644
--- a/classes/wc-gateway-paypal-express-angelleye.php
+++ b/classes/wc-gateway-paypal-express-angelleye.php
@@ -1105,7 +1105,7 @@ public function init_form_fields() {
                     'top' => __('Display at the top of the checkout page.', 'paypal-for-woocommerce'),
                     'regular' => __('Display in general list of enabled gateways on checkout page.', 'paypal-for-woocommerce'),
                     'both' => __('Display both at the top and in the general list of gateways on the checkout page.')),
-                'default' => 'top',
+                'default' => 'both',
                 'class'    => 'wc-enhanced-select',
                 'description' => __('Displaying the checkout button at the top of the checkout page will allow users to skip filling out the forms and can potentially increase conversion rates.'),
                 'desc_tip' => true,

From c103d237c202b69409607ea40748459a641ac517 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@gmail.com>
Date: Mon, 25 Nov 2019 10:16:56 +0530
Subject: [PATCH 2/2] Express Checkout - Checkout Page Display, PFW-532

---
 .../class-wc-gateway-paypal-express-helper-angelleye.php        | 2 +-
 classes/wc-gateway-paypal-express-angelleye.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
index b9d27406c..896d47cf8 100644
--- a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
+++ b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
@@ -57,7 +57,7 @@ public function __construct() {
                 $this->pp_button_type_my_custom = !empty($this->setting['pp_button_type_my_custom']) ? $this->setting['pp_button_type_my_custom'] : WC_Gateway_PayPal_Express_AngellEYE::angelleye_get_paypalimage();
                 $this->show_on_product_page = !empty($this->setting['show_on_product_page']) ? $this->setting['show_on_product_page'] : 'no';
                 $this->review_title_page = !empty($this->setting['review_title_page']) ? $this->setting['review_title_page'] : 'Review Order';
-                $this->show_on_checkout = !empty($this->setting['show_on_checkout']) ? $this->setting['show_on_checkout'] : 'top';
+                $this->show_on_checkout = !empty($this->setting['show_on_checkout']) ? $this->setting['show_on_checkout'] : 'both';
                 $this->button_position = !empty($this->setting['button_position']) ? $this->setting['button_position'] : 'bottom';
                 $this->show_on_cart = !empty($this->setting['show_on_cart']) ? $this->setting['show_on_cart'] : 'yes';
                 $this->show_on_minicart = !empty($this->setting['show_on_minicart']) ? $this->setting['show_on_minicart'] : 'no';
diff --git a/classes/wc-gateway-paypal-express-angelleye.php b/classes/wc-gateway-paypal-express-angelleye.php
index fac619c38..b4e81d849 100644
--- a/classes/wc-gateway-paypal-express-angelleye.php
+++ b/classes/wc-gateway-paypal-express-angelleye.php
@@ -96,7 +96,7 @@ public function __construct() {
         $this->save_abandoned_checkout = 'yes' === $this->get_option('save_abandoned_checkout', 'no');
         self::$log_enabled = $this->debug;
         $this->error_email_notify = 'yes' === $this->get_option('error_email_notify', 'no');
-        $this->show_on_checkout = $this->get_option('show_on_checkout', 'top');
+        $this->show_on_checkout = $this->get_option('show_on_checkout', 'both');
         $this->paypal_account_optional = $this->get_option('paypal_account_optional', 'no');
         $this->error_display_type = $this->get_option('error_display_type', 'detailed');
         $this->landing_page = $this->get_option('landing_page', 'login');