Express Checkout - Displaying on checkout page when it shouldn't, ref #…

…688
angelleye · May 5, 2017 · ea4806f · ea4806f
1 parent 251ffba
commit ea4806f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 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
@@ -75,7 +75,9 @@ public function __construct($version) {
             add_filter('woocommerce_thankyou_order_received_text', array($this, 'ec_order_received_text'), 10, 2);
             add_action('wp_enqueue_scripts', array($this, 'ec_enqueue_scripts_product_page'));
             add_action('woocommerce_before_cart_table', array($this, 'top_cart_button'));
-            add_action( 'woocommerce_after_mini_cart', array($this, 'mini_cart_button'));
+            if($this->show_on_cart == 'yes') {
+                add_action( 'woocommerce_after_mini_cart', array($this, 'mini_cart_button'));
+            }
             add_action( 'woocommerce_before_cart', array( $this, 'woocommerce_before_cart'), 12 );
             add_filter('woocommerce_is_sold_individually', array($this, 'angelleye_woocommerce_is_sold_individually'), 10, 2);
             add_filter('woocommerce_ship_to_different_address_checked', array($this, 'angelleye_ship_to_different_address_checked'), 10,1);

diff --git a/classes/wc-gateway-paypal-express-angelleye.php b/classes/wc-gateway-paypal-express-angelleye.php
@@ -625,10 +625,10 @@ public function is_available() {
             return false;
         }
         if(!AngellEYE_Utility::is_valid_for_use_paypal_express()) {
-                return false;
+           return false;
         }
-        if( $this->show_on_checkout == 'regular' || $this->show_on_checkout == 'both') {
-            return true;
+        if( $this->show_on_checkout != 'regular' && $this->show_on_checkout != 'both') {
+            return false;
         }
         return parent::is_available();
     }