Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl	23 Aug 2005 14:52:42 -0000	1.9
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/finalize-order.tcl	3 Sep 2005 00:58:54 -0000	1.10
@@ -194,11 +194,6 @@
     ec_update_state_to_confirmed $order_id
 }
 
-# Call after-checkout callback
-# Roel - 0705, Removed this line from the transaction, may have been causing
-# the transaction to hang
-callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
-
 set method [db_string payment_method {
     select method
     from dotlrn_ecommerce_transactions
@@ -209,6 +204,10 @@
     # Authorize this transaction without credit card
     ec_email_new_order $order_id
     ec_update_state_to_authorized $order_id 
+
+    # Call after-checkout callback
+    callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
     ad_returnredirect $return_url
     ad_script_abort
 }
@@ -278,6 +277,10 @@
 		# 'authorized'.
 
 		ec_update_state_to_authorized $order_id 
+
+		# Call after-checkout callback
+		callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 		ad_returnredirect $return_url
 
 	    } else {
@@ -308,6 +311,9 @@
 
 		    ec_update_state_to_authorized $order_id 
 
+		    # Call after-checkout callback
+		    callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 		    # Record the date & time of the authorization.
 
 		    db_dml update_authorized_date "
@@ -379,6 +385,9 @@
 
 		    ec_update_state_to_authorized $order_id 
 		    
+		    # Call after-checkout callback
+		    callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 		    # Record the date & time of the authorization and
 		    # schedule the transaction for settlement.
 
@@ -514,6 +523,9 @@
 
 			ec_update_state_to_authorized $order_id 
 
+			# Call after-checkout callback
+			callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 			# Schedule the soft goods transaction for
 			# settlement.
 
@@ -641,6 +653,10 @@
 	    # 'authorized'.
 
 	    ec_update_state_to_authorized $order_id 
+
+	    # Call after-checkout callback
+	    callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 	    ad_returnredirect $return_url
 
 	} else {
@@ -670,6 +686,9 @@
 
 		ec_update_state_to_authorized $order_id 
 
+		# Call after-checkout callback
+		callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 		# Record the date & time of the authorization.
 
 		db_dml update_authorized_date "
@@ -752,6 +771,10 @@
 	    # 'authorized'.
 
 	    ec_update_state_to_authorized $order_id 
+
+	    # Call after-checkout callback
+	    callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+	    
 	    ad_returnredirect $return_url
 	    ad_script_abort
 	} else {
@@ -781,6 +804,9 @@
 
 		    ec_update_state_to_authorized $order_id 
 
+		    # Call after-checkout callback
+		    callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 		    # Record the date & time of the authorization and
 		    # schedule the transaction for settlement.
 
@@ -816,6 +842,10 @@
 		# Gift cert covers cost, no cc transaction needed,
 		# authorize immediately
 		ec_update_state_to_authorized $order_id
+
+		# Call after-checkout callback
+		callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 		ad_returnredirect $return_url
 		ad_script_abort
 	    }
@@ -880,6 +910,10 @@
 	# 'authorized'.
 
 	ec_update_state_to_authorized $order_id 
+
+	# Call after-checkout callback
+	callback -- ecommerce::after-checkout -patron_id $user_id -order_id $order_id
+
 	ad_returnredirect $return_url
     }
 }