Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 20 Sep 2002 07:07:07 -0000 1.6 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 3 Oct 2002 18:12:09 -0000 1.7 @@ -39,7 +39,7 @@ select count(*) from ec_orders where order_id=:order_id"] } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -69,7 +69,7 @@ where order_id=:order_id and order_state='in_basket' and saved_p='t'"] } { - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } @@ -205,7 +205,7 @@ } db_release_unused_handles - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } else { @@ -236,7 +236,7 @@ where user_session_id=:user_session_id and order_state='in_basket'" -default ""] if { [empty_string_p $current_basket] } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } db_transaction { @@ -286,7 +286,7 @@ } db_release_unused_handles - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } elseif { $submit == "Replace" } { @@ -302,7 +302,7 @@ where user_session_id=:user_session_id and order_state='in_basket'" -default ""] if { [empty_string_p $current_basket] } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -356,7 +356,7 @@ } db_release_unused_handles - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } elseif { $submit == "Discard" } { if { [info exists discard_confirmed_p] && $discard_confirmed_p == "t" } { @@ -369,7 +369,7 @@ where order_id=:order_id" } - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } @@ -385,13 +385,13 @@ ad_return_template return } elseif { $submit == "Save it for Later" } { - ad_returnredirect "shopping-cart-retrieve-2" + rp_internal_redirect "shopping-cart-retrieve-2" ad_script_abort } # There shouldn't be any other cases, but log it if there are ns_log Notice "Error: [ec_url]shopping-cart-retrieve-3.tcl was called with an unexpected value of submit: $submit" db_release_unused_handles -ad_returnredirect "shopping-cart" +rp_internal_redirect "shopping-cart"