Index: openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	16 Jul 2005 14:23:51 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	20 Jul 2005 17:41:07 -0000	1.4
@@ -11,20 +11,23 @@
 } {
     community_id:integer,notnull
     user_id:integer,notnull
-    {type waiting_list}
+    {type full}
 } -properties {
 } -validate {
 } -errors {
 }
 
 ### Check for security
 
-if { $type == "waiting_list" } {
+if { $type == "full" } {
     set new_member_state "waitinglist approved"
     set old_member_state "needs approval"
-} else {
+} elseif { $type == "prereq" } {
     set new_member_state "request approved"
     set old_member_state "request approval"
+} elseif { $type == "payment" } {
+    set new_member_state "payment received"
+    set old_member_state "awaiting payment"
 }
 
 db_dml approve_request {
Index: openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl	20 Jul 2005 17:18:02 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl	20 Jul 2005 17:41:07 -0000	1.4
@@ -11,7 +11,7 @@
 } {
     community_id:integer,notnull
     user_id:integer,notnull
-    {type waiting_list}
+    {type full}
     {send_email_p 1}
 } -properties {
 } -validate {
Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	19 Jul 2005 18:15:09 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	20 Jul 2005 17:41:07 -0000	1.4
@@ -73,8 +73,14 @@
 	where r.community_id = c.community_id
 	and member_state in ('needs approval', 'awaiting payment')
     } {
-	set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} }]
-	set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} }]
+	if { $member_state == "needs approval" } {
+	    set list_type full
+	} elseif { $member_state == "awaiting payment" } {
+	    set list_type payment
+	}
+
+	set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} {type $list_type} }]
+	set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} {type $list_type} }]
 	
 	# Get associated assessment
 	if { [db_0or1row assessment {
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl	19 Jul 2005 18:50:39 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl	20 Jul 2005 17:41:07 -0000	1.5
@@ -58,7 +58,7 @@
 		select count(*)
 		from membership_rels m,
 		acs_rels r
-		where m.member_state = 'needs approval'
+		where m.member_state in ('needs approval', 'awaiting payment')
 		      and m.rel_id = r.rel_id
 		      and r.rel_type = 'dotlrn_member_rel'
 		      and r.object_id_one = :community_id