Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl	16 Aug 2005 16:09:25 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl	16 Aug 2005 16:18:01 -0000	1.3
@@ -1,6 +1,7 @@
 ad_page_contract {
 } {
     {product_id:notnull}
+    member_state:notnull
 }
 
 if { [db_0or1row get_name {
@@ -32,7 +33,7 @@
 	    }] } {
 		db_dml set_member_state {
 		    update membership_rels
-		    set member_state = 'awaiting payment'
+		    set member_state = :member_state
 		    where rel_id = :rel_id
 		}
 	    }
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl	15 Aug 2005 17:03:34 -0000	1.12
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl	16 Aug 2005 16:18:01 -0000	1.13
@@ -94,7 +94,7 @@
 		limit 1
 	    }] } {
 		if { ! [empty_string_p $assessment_id] && $assessment_id != -1 } {
-		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id }]
+		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id {member_state "awaiting payment"} }]
 		    ad_returnredirect [export_vars -base application-request { participant_id community_id {next_url $return_url} { type payment } }]
 		    ad_script_abort
 		    
@@ -114,7 +114,7 @@
 		if { $admin_p && $user_id != [ad_conn user_id] } {
 		    set cancel_url [set return_url [export_vars -base ../admin/process-purchase-course { user_id }]]
 		} else {
-		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id }]
+		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id {member_state "needs approval"} }]
 		    set cancel_url ..
 		}
 		ad_returnredirect [export_vars -base waiting-list-confirm { product_id user_id participant_id return_url cancel_url }]
@@ -165,7 +165,7 @@
 		if { $admin_p && $user_id != [ad_conn user_id] } {
 		    set cancel_url [set return_url [export_vars -base ../admin/process-purchase-course { user_id }]]
 		} else {
-		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id }]
+		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id {member_state "request approval"} }]
 		    set cancel_url ..
 		}
 		ad_returnredirect [export_vars -base prerequisite-confirm { product_id user_id participant_id return_url cancel_url }]