Merge pull request #1504 from angelleye/PFW-698

Conflict with WooCommerce Stripe Payment Gateway : PFW-698
angelleye · Oct 20, 2020 · 1c38f36 · 1c38f36
2 parents 2f53352 + 8bcb32d
commit 1c38f36
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye-v2.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye-v2.php
@@ -681,6 +681,9 @@ public function ec_enqueue_scripts($is_mini_cart = false) {
                 $smart_js_arg = array();
                 $smart_js_arg['client-id'] = $this->client_id;
                 $smart_js_arg['currency'] = get_woocommerce_currency();
+                if (($funding_key = array_search('elv', $this->disallowed_funding_methods)) !== false) {
+                    unset($this->disallowed_funding_methods[$funding_key]);
+                }
                 if ($this->disallowed_funding_methods !== false && count($this->disallowed_funding_methods) > 0) {
                     $smart_js_arg['disable-funding'] = implode(',', $this->disallowed_funding_methods);
                 }

diff --git a/assets/js/angelleye-in-context-checkout.min-v1.js b/assets/js/angelleye-in-context-checkout.min-v1.js
diff --git a/assets/js/angelleye-in-context-checkout.min-v2.js b/assets/js/angelleye-in-context-checkout.min-v2.js
diff --git a/assets/js/angelleye-in-context-checkout_v1.js b/assets/js/angelleye-in-context-checkout_v1.js
@@ -2,6 +2,9 @@ jQuery(function ($) {
     if (typeof angelleye_in_content_param === 'undefined') {
         return false;
     }
+    if (typeof paypal === 'undefined') {
+        return false;
+    }
     display_smart_button_on_cart_checkout();
     display_smart_button_on_min_cart();
     display_smart_button_on_product_page();

diff --git a/assets/js/angelleye-in-context-checkout_v2.js b/assets/js/angelleye-in-context-checkout_v2.js
@@ -3,6 +3,10 @@ jQuery(function ($) {
         return false;
     }
 
+    if (typeof paypal === 'undefined') {
+        return false;
+    }
+
     var angelleye_hide_button = function () {
         $('#place_order').show();
         $('.angelleye_pp_message_payment:eq(1)').hide();