Changeset 356400

Timestamp:

03/07/2011 01:16:13 AM (13 years ago)

Author:

jghazally

Message:

Fi the disregard Shipping bug : ​http://getshopped.org/forums/topic.php?id=18044

File:

• wp-e-commerce/branches/3.8-development/wpsc-includes/ajax.functions.php (modified) (2 diffs)

wp-e-commerce/branches/3.8-development/wpsc-includes/ajax.functions.php

@@ -512 +512 @@
     $form_validity = $wpsc_checkout->validate_forms();
     extract( $form_validity ); // extracts $is_valid and $error_messages
-    if ( get_option( 'do_not_use_shipping' ) == 0 && ($wpsc_cart->selected_shipping_method == null || $wpsc_cart->selected_shipping_option == null) ) {
-        $_SESSION['wpsc_checkout_misc_error_messages'][] = __( 'You must select a shipping method, otherwise we cannot process your order.', 'wpsc' );
-        $is_valid = false;
-    }
+
     if ( $_POST['agree'] != 'yes' ) {
         $_SESSION['wpsc_checkout_misc_error_messages'][] = __( 'Please agree to the terms and conditions, otherwise we cannot process your order.', 'wpsc' );
@@ -549 +546 @@
         $is_valid = false;
     
-    if ( (get_option( 'do_not_use_shipping' ) != 1) && (in_array( 'ups', (array)$options )) && $_SESSION['wpsc_zipcode'] == '' ) {
-        if ( $num_items != $disregard_shipping ) {
+    if ( get_option( 'do_not_use_shipping' ) == 0 && ($wpsc_cart->selected_shipping_method == null || $wpsc_cart->selected_shipping_option == null) && ( $num_items != $disregard_shipping ) ) {
+        $_SESSION['wpsc_checkout_misc_error_messages'][] = __( 'You must select a shipping method, otherwise we cannot process your order.', 'wpsc' );
+        $is_valid = false;
+    }
+    if ( (get_option( 'do_not_use_shipping' ) != 1) && (in_array( 'ups', (array)$options )) && $_SESSION['wpsc_zipcode'] == '' && ( $num_items != $disregard_shipping ) ) {
             $_SESSION['categoryAndShippingCountryConflict'] = __( 'Please enter a Zipcode and click calculate to proceed', 'wpsc' );
             $is_valid = false;
-        }
     }
     if ( $is_valid == true ) {