Express Checkout - No Shipping Required Adjustment Necessary #928

angelleye · Nov 14, 2017 · 95f9d2a · 95f9d2a
1 parent 02f7a53
commit 95f9d2a
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-function-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-function-angelleye.php
@@ -113,16 +113,25 @@ public function angelleye_ec_save_payment_method_checkbox() {
     }
 
     public function angelleye_paypal_for_woocommerce_needs_shipping($SECFields) {
+        $is_required = 0;
+        $is_not_required = 0;
         if (sizeof(WC()->cart->get_cart()) != 0) {
             foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
                 $product_id = apply_filters( 'woocommerce_cart_item_product_id', $cart_item['product_id'], $cart_item, $cart_item_key );
                 $_no_shipping_required = get_post_meta($product_id, '_no_shipping_required', true);
                 if( $_no_shipping_required == 'yes' ) {
-                    $SECFields['noshipping'] = 1;
-                    return $SECFields;
+                    $is_not_required = $is_not_required + 1;
+                } else {
+                    $is_required = $is_required + 1;
                 }   
             }
         }
+        if( $is_required > 0 ) {
+            return $SECFields;
+        } elseif ($is_not_required > 0) {
+            $SECFields['noshipping'] = 1;
+            return $SECFields;
+        }
         return $SECFields;
     }