Index: openacs-4/packages/ecommerce/www/thank-you.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/thank-you.tcl	20 Apr 2001 20:51:13 -0000	1.1
+++ openacs-4/packages/ecommerce/www/thank-you.tcl	26 May 2002 04:36:50 -0000	1.2
@@ -1,24 +1,24 @@
-#  www/ecommerce/thank-you.tcl
 ad_page_contract {
     @param usca_p User session begun or not
 
     @author
     @creation-date
-    @cvs-id thank-you.tcl,v 3.1.6.6 2000/08/18 21:46:36 stevenp Exp
     @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date April 2002
+
 } {
     usca_p:optional
 }
-# This is a "thank you for your order" page
-# displays order summary for the most recently confirmed order for this user
 
-# we need them to be logged in
-set user_id [ad_verify_and_get_user_id]
+# This is a "thank you for your order" page displays order summary for
+# the most recently confirmed order for this user
 
+# We need them to be logged in
+
+set user_id [ad_verify_and_get_user_id]
 if {$user_id == 0} {
-    
     set return_url "[ad_conn url]"
-
     ad_returnredirect "[ad_conn package_url]register?[export_url_vars return_url]"
     template::adp_abort
 }
@@ -27,25 +27,32 @@
 # it isn't clear to me why we would log the session here
 # or why you would create a new session at this point
 
-# user session tracking
-set user_session_id [ec_get_user_session_id]
+# User session tracking
 
-
+set user_session_id [ec_get_user_session_id]
 ec_create_new_session_if_necessary
-# type1
-
 ec_log_user_as_user_id_for_this_session
 
-# their most recently confirmed order (or the empty string if there is none)
-set order_id [db_string  get_order_id_info "select order_id from ec_orders where user_id=:user_id and confirmed_date is not null and order_id=(select max(o2.order_id) from ec_orders o2 where o2.user_id=$user_id and o2.confirmed_date is not null)" -default ""]
+# Their most recently confirmed order (or the empty string if there is
+# none)
 
+set order_id [db_string  get_order_id_info "
+    select order_id 
+    from ec_orders 
+    where user_id=:user_id 
+    and confirmed_date is not null 
+    and order_id = (
+	select max(o2.order_id) 
+	from ec_orders o2 
+	where o2.user_id = $user_id 
+	and o2.confirmed_date is not null)" -default ""]
+
 if { [empty_string_p $order_id] } {
     ad_returnredirect index
-    # ad_script_abort
 }
 
 set order_summary [ec_order_summary_for_customer $order_id $user_id]
+
 db_release_unused_handles
+ad_return_template
 
-ec_return_template
-