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.12 -r1.13
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	27 Jul 2005 14:38:45 -0000	1.12
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	2 Aug 2005 18:44:39 -0000	1.13
@@ -25,12 +25,27 @@
 set admin_p [permission::permission_p -object_id $package_id -privilege "admin"]
 set return_url [ad_return_url]
 
+set enable_applications_p [parameter::get -package_id [ad_conn package_id] -parameter EnableCourseApplicationsP -default 1]
+
 if { [exists_and_not_null type] } {
     set _type $type
 } else {
     set _type all
 }
 
+set filters {
+    {"[_ dotlrn-ecommerce.In_Waiting_List]" "needs approval"}
+    {"[_ dotlrn-ecommerce.lt_Approved_Waiting_List]" "waitinglist approved"}
+    {"[_ dotlrn-ecommerce.For_PreReq_Approval]" "request approval"}
+    {"[_ dotlrn-ecommerce.lt_Approved_PreReq_Appli]" "request approved"}
+}
+
+if { $enable_applications_p } {
+    lappend filters \
+	{"[_ dotlrn-ecommerce.Applications]" "awaiting payment"} \
+	{"[_ dotlrn-ecommerce.lt_Approved_Applications]" "payment received"}
+}
+
 template::list::create \
     -name "applications" \
     -multirow "applications" \
@@ -116,21 +131,14 @@
 	    }
 	    html { width 125 align center nowrap }
 	}
-    } -filters {
+    } -filters [subst {
 	type {
 	    label "[_ dotlrn-ecommerce.Type_of_Request]"
-	    values {
-		{"[_ dotlrn-ecommerce.In_Waiting_List]" "needs approval"}
-		{"[_ dotlrn-ecommerce.lt_Approved_Waiting_List]" "waitinglist approved"}
-		{"[_ dotlrn-ecommerce.For_PreReq_Approval]" "request approval"}
-		{"[_ dotlrn-ecommerce.Applications]" "awaiting payment"}
-		{"[_ dotlrn-ecommerce.lt_Approved_PreReq_Appli]" "request approved"}
-		{"[_ dotlrn-ecommerce.lt_Approved_Applications]" "payment received"}
-	    }
+	    values { $filters }
 	    where_clause { member_state = :type }
 	}
 	section_id {}
-    } -orderby {
+    }] -orderby {
 	section_name {
 	    label "[_ dotlrn-ecommerce.Section_1]"
 	    orderby "lower(s.section_name)"
@@ -165,6 +173,12 @@
     set section_clause ""
 }
 
+if { $enable_applications_p } {
+    set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'awaiting payment', 'payment received') }
+} else {
+    set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved') }
+}
+
 db_multirow -extend { approve_url reject_url asm_url section_edit_url person_url register_url } applications applications [subst {
     select person__name(r.user_id) as person_name, member_state, r.community_id, r.user_id as applicant_user_id, s.section_name, t.course_name, s.section_id, r.rel_id, e.phone, o.creation_user as patron_id,
     (select count(*)
@@ -187,8 +201,8 @@
     and s.course_id = t.item_id
     and t.course_id = i.live_revision
     and r.rel_id = o.object_id
-    and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'awaiting payment', 'payment received')
 
+    $member_state_clause
     $user_clause
     $section_clause
 
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	1 Aug 2005 01:06:24 -0000	1.13
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	2 Aug 2005 18:44:39 -0000	1.14
@@ -30,10 +30,14 @@
 <li><a href="@relationships_category_url;noquote@">#dotlrn-ecommerce.lt_Manage_Relationship_T#</a>
 <li>#dotlrn-ecommerce.Email_templates_1#
 <ul>
+<if @enable_applications_p@>
   <li>Application approval (default <i>Note: this is customizable on a per section basis</i>) [ <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=Application_approved&return_url=@return_url@">subject</a> | <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=lt_Your_application_to_j&return_url=@return_url@">body</a> ]
+</if>
   <li>Application approval (granted spot from waiting list) [ <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=lt_A_space_has_opened_up&return_url=@return_url@">subject</a> | <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=lt_A_space_has_opened_up_1&return_url=@return_url@">body</a> ]
   <li>Application approval (waiver of prerequisites approved) [ <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=Application_prereq_approved&return_url=@return_url@">subject</a> | <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=lt_Your_prereq_approved&return_url=@return_url@">body</a> ]
+<if @enable_applications_p@>
   <li>Reject application [ <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=Application_rejected&return_url=@return_url@">subject</a> | <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=lt_Your_application_to_j_1&return_url=@return_url@">body</a> ]
+</if>
   <li>Reject waiver of prerequisites [ <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=Application_prereq_rejected&return_url=@return_url@">subject</a> | <a href="/acs-lang/admin/edit-localized-message?package_key=dotlrn-ecommerce&locale=@package_locale@&message_key=lt_Your_prereq_rejected&return_url=@return_url@">body</a> ]
   <li>Purchase receipt [ <a href="/ecommerce/admin/email-templates/edit.tcl?email_template_id=1&return_url=@return_url@">edit</a> ]
 </ul>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl	21 Jul 2005 22:10:46 -0000	1.9
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl	2 Aug 2005 18:44:39 -0000	1.10
@@ -103,3 +103,4 @@
 set relationships_category_url [export_vars -base ../Administration/categories/cadmin/tree-view { tree_id }]
 
 set package_locale [lang::system::locale]
+set enable_applications_p [parameter::get -package_id [ad_conn package_id] -parameter EnableCourseApplicationsP -default 1]