Merge pull request #117 from angelleye/PFWMA-299

Shipping Zone rule(s) are not triggering properly. PFWMA-299
angelleye · Jul 13, 2023 · 5e61de2 · 5e61de2
2 parents 440254a + 78c7484
commit 5e61de2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin-paypal-payflow.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin-paypal-payflow.php
@@ -393,7 +393,8 @@ public function angelleye_get_multi_account_by_order_total_latest($gateways, $ga
                                             $woo_shipping_zone = wc_get_shipping_zone( reset( $shipping_packages ) );
                                             $zone_id = $woo_shipping_zone->get_id();
                                             if ($zone_id != $mul_shipping_zone) {
-                                                $cart_loop_not_pass = $cart_loop_not_pass + 1;
+                                                unset($result[$key]);
+                                                unset($passed_rules);
                                                 continue;
                                             }
                                         }
@@ -405,6 +406,8 @@ public function angelleye_get_multi_account_by_order_total_latest($gateways, $ga
                                 if (!empty($shipping_class) && $shipping_class != 'all') {
                                     if ($product_shipping_class != $shipping_class) {
                                         $cart_loop_not_pass = $cart_loop_not_pass + 1;
+                                        unset($result[$key]);
+                                        unset($passed_rules);
                                         continue;
                                     }
                                 }