Index: openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info 28 Dec 2005 00:36:36 -0000 1.45
+++ openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info 23 Jan 2006 08:04:43 -0000 1.46
@@ -7,15 +7,15 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="0.1d23" url="http://openacs.org/repository/download/apm/dotlrn-ecommerce-0.1d23.apm">
+ <version name="0.1d24" url="http://openacs.org/repository/download/apm/dotlrn-ecommerce-0.1d24.apm">
<owner url="mailto:roelmc@solutiongrove.com">Roel Canicula</owner>
<summary>Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together</summary>
<release-date>2005-08-10</release-date>
<vendor url="http://www.solutiongrove.com">Solution Grove</vendor>
<description format="text/html">Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together. Initially intended for the MOS and MGH projects, the goal is to create a reusable module for similar projects.</description>
<maturity>0</maturity>
- <provides url="dotlrn-ecommerce" version="0.1d23"/>
+ <provides url="dotlrn-ecommerce" version="0.1d24"/>
<requires url="dotlrn" version="2.1.3"/>
<requires url="dotlrn-assessment" version="0.2"/>
<requires url="dotlrn-attendance" version="0.1d"/>
Index: openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 23 Jan 2006 03:09:54 -0000 1.54
+++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 23 Jan 2006 08:04:43 -0000 1.55
@@ -9,12 +9,12 @@
<msg key="Add_Purchaser">Add Purchaser</msg>
<msg key="add_section">add section</msg>
<msg key="add_to_cart">register for course</msg>
- <msg key="Added">to waiting list / Application Submitted</msg>
+ <msg key="Added">to waiting list / Application submitted</msg>
<msg key="Administer_Public_Pages">Administer Public Pages</msg>
<msg key="Administrative_Setup">Administrative Setup</msg>
<msg key="Amount_to_be_Paid">Amount to be Paid</msg>
<msg key="Application">Application</msg>
- <msg key="Application_1">Approved (awaiting payment)</msg>
+ <msg key="Application_1">Application submitted</msg>
<msg key="Application_2">Approved</msg>
<msg key="Application_3">Submitted</msg>
<msg key="Application_4">for waiver of prerequisites submitted</msg>
Index: openacs-4/packages/dotlrn-ecommerce/lib/email-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/email-templates.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-ecommerce/lib/email-templates.tcl 20 Dec 2005 15:38:20 -0000 1.9
+++ openacs-4/packages/dotlrn-ecommerce/lib/email-templates.tcl 23 Jan 2006 08:04:43 -0000 1.10
@@ -12,7 +12,7 @@
}
set email_types [list "on join" "waitinglist approved" "prereq approval" "prereq reject"]
if {[parameter::get -package_id [ad_conn package_id] -parameter EnableCourseApplicationsP -default 1]} {
- lappend email_types "on approval" "awaiting payment" "application reject"
+ lappend email_types "on approval" "application sent" "application reject"
}
if {[parameter::get -package_id [ad_conn package_id] -parameter NotifyApplicantOnRequest]} {
lappend email_types "needs approval" "request approval"
Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl,v
diff -u -r1.65 -r1.66
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 23 Jan 2006 03:09:55 -0000 1.65
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 23 Jan 2006 08:04:43 -0000 1.66
@@ -674,7 +674,7 @@
set waiting_p 1
set waiting_list_number [util_memoize [list dotlrn_ecommerce::section::waiting_list_number $user_id $community_id] $memoize_max_age]
}
- "awaiting payment" {
+ "application sent" {
set waiting_p 2
if { ![empty_string_p $assessment_id] } {
set rel_id [db_string membership_rel {
@@ -712,7 +712,7 @@
"request approval" {
set pending_p 1
}
- "payment received" {
+ "application approved" {
set approved_p 1
if {![empty_string_p $assessment_id]} {
set rel_id [db_string membership_rel {
Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql 1 Sep 2005 12:23:21 -0000 1.22
+++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-create.sql 23 Jan 2006 08:04:42 -0000 1.23
@@ -92,7 +92,7 @@
-- Add member states
alter table membership_rels drop constraint membership_rel_mem_ck;
-alter table membership_rels add CONSTRAINT membership_rel_mem_ck CHECK ((((((((member_state)::text = 'merged'::text) OR ((member_state)::text = 'approved'::text)) OR ((member_state)::text = 'needs approval'::text)) OR ((member_state)::text = 'banned'::text)) OR ((member_state)::text = 'rejected'::text)) OR ((member_state)::text = 'deleted'::text) OR ((member_state)::text = 'request approval'::text) OR ((member_state)::text = 'request approved'::text) OR ((member_state)::text = 'waitinglist approved'::text) OR ((member_state)::text = 'awaiting payment'::text) OR ((member_state)::text = 'payment received'::text)));
+alter table membership_rels add CONSTRAINT membership_rel_mem_ck CHECK ((((((((member_state)::text = 'merged'::text) OR ((member_state)::text = 'approved'::text)) OR ((member_state)::text = 'needs approval'::text)) OR ((member_state)::text = 'banned'::text)) OR ((member_state)::text = 'rejected'::text)) OR ((member_state)::text = 'deleted'::text) OR ((member_state)::text = 'request approval'::text) OR ((member_state)::text = 'request approved'::text) OR ((member_state)::text = 'waitinglist approved'::text) OR ((member_state)::text = 'application sent'::text) OR ((member_state)::text = 'application approved'::text)));
-- Invoice payment method
create table dotlrn_ecommerce_transaction_invoice_payments (
Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d23-0.1d24.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d23-0.1d24.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d23-0.1d24.sql 19 Oct 2005 09:48:48 -0000 1.1
+++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d23-0.1d24.sql 23 Jan 2006 08:04:42 -0000 1.2
@@ -53,3 +53,9 @@
left join dotlrn_ecommerce_section s on (i.product_id = s.product_id)
left join cc_users u on (o.user_id=u.user_id)
where o.order_state in ('confirmed', 'authorized', 'fulfilled', 'returned'));
+
+-- Change membership states to more appropriate names
+alter table membership_rels drop constraint membership_rel_mem_ck;
+update membership_rels set member_state = 'application sent' where member_state = 'application sent';
+update membership_rels set member_state = 'application approved' where member_state = 'application approved';
+alter table membership_rels add constraint membership_rel_mem_ck check (member_state::text = 'merged'::text OR member_state::text = 'approved'::text OR member_state::text = 'needs approval'::text OR member_state::text = 'banned'::text OR member_state::text = 'rejected'::text OR member_state::text = 'deleted'::text OR member_state::text = 'request approval'::text OR member_state::text = 'request approved'::text OR member_state::text = 'waitinglist approved'::text or member_state::text = 'application sent' or member_state::text = 'application approved');
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/tcl/course-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/course-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn-ecommerce/tcl/course-procs.tcl 20 Dec 2005 15:39:16 -0000 1.15
+++ openacs-4/packages/dotlrn-ecommerce/tcl/course-procs.tcl 23 Jan 2006 08:04:42 -0000 1.16
@@ -59,7 +59,7 @@
} {
set var_list [list community_name [dotlrn_community::get_community_name $community_id]]
db_transaction {
- foreach type [list "on join" "awaiting payment" "on approval"] {
+ foreach type [list "on join" "application sent" "on approval"] {
set from_addr ""
set email [_ [email_type_message_key -type $type -key body] $var_list]
set subject [_ [email_type_message_key -type $type -key subject] $var_list]
@@ -76,7 +76,7 @@
} {
list of valid email types for this dotlrn_ecommerce
} {
- return [list "on join" "awaiting payment" "on approval"]
+ return [list "on join" "application sent" "on approval"]
}
ad_proc -private dotlrn_ecommerce::email_type_message_key {
@@ -91,7 +91,7 @@
if {[string equal "subject" $key]} {
return [string map \
[list \
- "awaiting payment" dotlrn-ecommerce.Application_submitted \
+ "application sent" dotlrn-ecommerce.Application_submitted \
"on approval" dotlrn-ecommerce.Application_approved \
submit_app dotlrn-ecommerce.Application_submitted \
approve_app dotlrn-ecommerce.Application_approved \
@@ -106,7 +106,7 @@
} elseif {[string equal "body" $key]} {
return [string map \
[list \
- "awaiting payment" dotlrn-ecommerce.lt_Your_application_has_been_submitted \
+ "application sent" dotlrn-ecommerce.lt_Your_application_has_been_submitted \
"on approval" dotlrn-ecommerce.lt_Your_application_to_j \
submit_app dotlrn-ecommerce.lt_Your_application_has_been_submitted \
approve_app dotlrn-ecommerce.lt_Your_application_to_j \
@@ -131,7 +131,7 @@
} {
return [string map \
[list \
- "awaiting payment" "[_ dotlrn-ecommerce.Application_1]" \
+ "application sent" "[_ dotlrn-ecommerce.Application_1]" \
"on approval" "[_ dotlrn-ecommerce.Application_2]" \
"submit_app" "[_ dotlrn-ecommerce.Application_3]" \
"approve_app" "[_ dotlrn-ecommerce.Application_2]" \
@@ -151,7 +151,7 @@
} {
return [string map \
[list \
- "awaiting payment" "[_ dotlrn-ecommerce.sent]" \
+ "application sent" "[_ dotlrn-ecommerce.sent]" \
"on approval" "[_ dotlrn-ecommerce.sent_1]" \
"submit_app" "[_ dotlrn-ecommerce.sent_2]" \
"approve_app" "[_ dotlrn-ecommerce.sent_1]" \
Index: openacs-4/packages/dotlrn-ecommerce/tcl/dotlrn-ecommerce-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/dotlrn-ecommerce-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn-ecommerce/tcl/dotlrn-ecommerce-procs.tcl 24 Sep 2005 08:16:14 -0000 1.12
+++ openacs-4/packages/dotlrn-ecommerce/tcl/dotlrn-ecommerce-procs.tcl 23 Jan 2006 08:04:42 -0000 1.13
@@ -186,7 +186,7 @@
create or replace view dotlrn_member_rels_approved
as select *
from dotlrn_member_rels_full
- where member_state in ('approved', 'waitinglist approved', 'request approved', 'payment received');
+ where member_state in ('approved', 'waitinglist approved', 'request approved', 'application approved');
drop trigger membership_rels_up_tr on membership_rels;
drop function membership_rels_up_tr ();
@@ -204,7 +204,7 @@
from group_element_index
where rel_id = new.rel_id
loop
- if new.member_state in (''approved'', ''waitinglist approved'', ''request approved'', ''payment received'') then
+ if new.member_state in (''approved'', ''waitinglist approved'', ''request approved'', ''application approved'') then
perform party_approved_member__add(map.group_id, map.element_id, new.rel_id, map.rel_type);
else
perform party_approved_member__remove(map.group_id, map.element_id, new.rel_id, map.rel_type);
@@ -223,7 +223,7 @@
db_foreach current_users {
select rel_id, community_id, user_id
from dotlrn_member_rels_full
- where member_state in ('waitinglist approved', 'request approved', 'payment received')
+ where member_state in ('waitinglist approved', 'request approved', 'application approved')
} {
db_exec_plsql approve_current_users {
declare
@@ -355,7 +355,7 @@
db_foreach current_users {
select rel_id, community_id, user_id
from dotlrn_member_rels_full
- where member_state in ('waitinglist approved', 'request approved', 'payment received')
+ where member_state in ('waitinglist approved', 'request approved', 'application approved')
} {
db_exec_plsql approve_current_users {
declare
Index: openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl 1 Oct 2005 21:33:10 -0000 1.34
+++ openacs-4/packages/dotlrn-ecommerce/tcl/section-procs.tcl 23 Jan 2006 08:04:42 -0000 1.35
@@ -286,7 +286,7 @@
from dotlrn_ecommerce_section
where section_id = :section_id)
and (rel_type = 'dotlrn_member_rel' or rel_type = 'dc_student_rel')
- and member_state in ('approved', 'request approval', 'request approved', 'waitinglist approved', 'payment received'))
+ and member_state in ('approved', 'request approval', 'request approved', 'waitinglist approved', 'application approved'))
+
@@ -344,7 +344,7 @@
from acs_objects o, dotlrn_member_rels_full r
where o.object_id = r.rel_id
and (current_timestamp - o.last_modified)::interval >= (:time_period||' seconds')::interval
- and r.member_state in ('request approved', 'waitinglist approved', 'payment received')
+ and r.member_state in ('request approved', 'waitinglist approved', 'application approved')
} {
if { [parameter::get -parameter AllowAheadAccess -package_id [apm_package_id_from_key dotlrn-ecommerce] -default 0] } {
# Dispatch dotlrn applet callbacks
@@ -751,7 +751,7 @@
set new_member_state [ad_decode $old_member_state \
"needs approval" "waitinglist approved" \
"request approval" "request approved" \
- "awaiting payment" "payment received" \
+ "application sent" "application approved" \
"waitinglist approved"]
db_transaction {
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.20 -r1.21
--- openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl 1 Oct 2005 21:34:19 -0000 1.20
+++ openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl 23 Jan 2006 08:04:42 -0000 1.21
@@ -36,8 +36,8 @@
set email_type "prereq approval"
}
payment {
- set new_member_state "payment received"
- set old_member_state "awaiting payment"
+ set new_member_state "application approved"
+ set old_member_state "application sent"
set email_type "on approval"
}
}
Index: openacs-4/packages/dotlrn-ecommerce/www/application-bulk-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-bulk-approve.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/application-bulk-approve.tcl 1 Oct 2005 22:05:43 -0000 1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/application-bulk-approve.tcl 23 Jan 2006 08:04:42 -0000 1.3
@@ -14,7 +14,7 @@
__confirmed_p:optional
{filter_community_id ""}
- {filter_member_state:multiple {{needs approval} {awaiting payment}}}
+ {filter_member_state:multiple {{needs approval} {application sent}}}
} -properties {
} -validate {
} -errors {
@@ -57,7 +57,7 @@
set type [ad_decode $member_state \
"needs approval" "Waiting List" \
"request approval" "Prerequisite" \
- "awaiting payment" "Application" \
+ "application sent" "Application" \
"Waiting List"]
}
@@ -73,7 +73,7 @@
set type [ad_decode $member_state \
"needs approval" "Waiting List" \
"request approval" "Prerequisite" \
- "awaiting payment" "Application" \
+ "application sent" "Application" \
"Waiting List"]
}
@@ -125,7 +125,7 @@
dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type "prereq approval" -override_email $reason -override_subject $subject
} else {
- set email_type [ad_decode $member_state "needs approval" "waitinglist approved" "awaiting payment" "on approval" "waitinglist approved"]
+ set email_type [ad_decode $member_state "needs approval" "waitinglist approved" "application sent" "on approval" "waitinglist approved"]
dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type $email_type
}
@@ -154,7 +154,7 @@
from dotlrn_member_rels_full r, dotlrn_communities_full c
where r.community_id = c.community_id
and rel_id in ([join $rel_id ,])
- and member_state in ('waitinglist approved', 'request approved', 'payment received')
+ and member_state in ('waitinglist approved', 'request approved', 'application approved')
order by r.community_id
}]
Index: openacs-4/packages/dotlrn-ecommerce/www/application-bulk-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-bulk-reject.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/application-bulk-reject.tcl 1 Oct 2005 21:35:14 -0000 1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/application-bulk-reject.tcl 23 Jan 2006 08:04:42 -0000 1.2
@@ -47,7 +47,7 @@
where r.community_id = c.community_id
and rel_id in ([join $rel_id ,])
- and r.member_state in ('needs approval', 'request approval', 'awaiting payment', 'waitinglist approved', 'request approved', 'payment received')
+ and r.member_state in ('needs approval', 'request approval', 'application sent', 'waitinglist approved', 'request approved', 'application approved')
group by r.community_id, r.member_state, c.pretty_name
}] {
@@ -56,10 +56,10 @@
set type [ad_decode $member_state \
"needs approval" "Waiting List" \
"request approval" "Prerequisite" \
- "awaiting payment" "Application" \
+ "application sent" "Application" \
"waitinglist approved" "Waiting List" \
"request approved" "Prerequisite" \
- "payment received" "Application" \
+ "application approved" "Application" \
"Waiting List"]
}
@@ -75,10 +75,10 @@
set type [ad_decode $member_state \
"needs approval" "Waiting List" \
"request approval" "Prerequisite" \
- "awaiting payment" "Application" \
+ "application sent" "Application" \
"waitinglist approved" "Waiting List" \
"request approved" "Prerequisite" \
- "payment received" "Application" \
+ "application approved" "Application" \
"Waiting List"]
}
Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp 14 Sep 2005 18:06:01 -0000 1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp 23 Jan 2006 08:04:42 -0000 1.7
@@ -1,5 +1,5 @@
<master>
- <if @member_state@ eq "request approval" or @member_state@ eq "awaiting payment">
+ <if @member_state@ eq "request approval" or @member_state@ eq "application sent">
<property name="title">Application Confirmed</property>
</if>
<else>
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.19 -r1.20
--- openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl 1 Oct 2005 21:45:08 -0000 1.19
+++ openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl 23 Jan 2006 08:04:42 -0000 1.20
@@ -64,7 +64,7 @@
and community_id = :community_id
}]
- if { [lsearch $member_state {"waitinglist approved" "request approved" "payment received"}] != -1 } {
+ if { [lsearch $member_state {"waitinglist approved" "request approved" "application approved"}] != -1 } {
# Dispatch dotlrn applet callbacks
dotlrn_community::applets_dispatch \
-community_id $community_id \
@@ -139,7 +139,7 @@
and community_id = :community_id
}]
- if { [lsearch $member_state {"waitinglist approved" "request approved" "payment received"}] != -1 } {
+ if { [lsearch $member_state {"waitinglist approved" "request approved" "application approved"}] != -1 } {
# Dispatch dotlrn applet callbacks
dotlrn_community::applets_dispatch \
-community_id $community_id \
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.40 -r1.41
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 1 Oct 2005 21:35:14 -0000 1.40
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 23 Jan 2006 08:04:42 -0000 1.41
@@ -51,8 +51,8 @@
if { $enable_applications_p } {
lappend filters \
- {"[_ dotlrn-ecommerce.Applications]" "awaiting payment"} \
- {"[_ dotlrn-ecommerce.lt_Approved_Applications]" "payment received"}
+ {"[_ dotlrn-ecommerce.Applications]" "application sent"} \
+ {"[_ dotlrn-ecommerce.lt_Approved_Applications]" "application approved"}
}
@@ -78,12 +78,12 @@
number {
label "[_ dotlrn-ecommerce.lt_Number_in_Waiting_Lis]"
html { align center }
- hide_p {[ad_decode $_type "waitinglist approved" 1 "request approved" 1 "payment received" 1 "all" 0 0]}
+ hide_p {[ad_decode $_type "waitinglist approved" 1 "request approved" 1 "application approved" 1 "all" 0 0]}
display_template {
<if @applications.member_state@ in "needs approval" "request approval">
@applications.number@
</if>
- <elseif @applications.member_state@ eq "awaiting payment">
+ <elseif @applications.member_state@ eq "application sent">
Awaiting approval
</elseif>
<else>
@@ -108,7 +108,7 @@
<if @applications.member_state@ eq "needs approval">
[_ dotlrn-ecommerce.lt_User_is_in_waiting_li]
</if>
- <elseif @applications.member_state@ eq "payment received">
+ <elseif @applications.member_state@ eq "application approved">
[_ dotlrn-ecommerce.lt_User_application_appr]
</elseif>
<elseif @applications.member_state@ eq "waitinglist approved">
@@ -140,7 +140,7 @@
}
phone {
label "[_ dotlrn-ecommerce.Phone_Number]"
- hide_p {[ad_decode $_type "waitinglist approved" 0 "request approved" 0 "payment received" 0 "all" 0 1]}
+ hide_p {[ad_decode $_type "waitinglist approved" 0 "request approved" 0 "application approved" 0 "all" 0 1]}
}
}
@@ -164,7 +164,7 @@
actions {
label ""
display_template {
- <if @applications.member_state@ in "needs approval" "request approval" "awaiting payment">
+ <if @applications.member_state@ in "needs approval" "request approval" "application sent">
<a href="@applications.approve_url;noquote@" class="button">[_ dotlrn-ecommerce.Approve]</a>
<a href="@applications.reject_url;noquote@" class="button">[_ dotlrn-ecommerce.Reject]</a>
</if>
@@ -238,7 +238,7 @@
}
if { $enable_applications_p } {
- set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'awaiting payment', 'payment received') }
+ set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'application sent', 'application approved') }
} else {
set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved') }
}
@@ -290,16 +290,16 @@
[template::list::filter_where_clauses -and -name applications]
[template::list::orderby_clause -name applications -orderby]
}] {
- set list_type [ad_decode $member_state "needs approval" full "request approval" prereq "awaiting payment" payment full]
+ set list_type [ad_decode $member_state "needs approval" full "request approval" prereq "application sent" payment full]
set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} {type $list_type} return_url }]
set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} {type $list_type} return_url }]
if { $member_state == "needs approval" ||
- $member_state == "awaiting payment" ||
+ $member_state == "application sent" ||
$member_state == "waitinglist approved" ||
- $member_state == "payment received"
+ $member_state == "application approved"
} {
if { ! [empty_string_p $session_id] } {
if {$use_embedded_application_view_p ==1} {
Index: openacs-4/packages/dotlrn-ecommerce/www/home.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn-ecommerce/www/home.tcl 17 Oct 2005 13:03:32 -0000 1.15
+++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl 23 Jan 2006 08:04:42 -0000 1.16
@@ -126,7 +126,7 @@
where r.community_id = c.community_id
and s.community_id = c.community_id
and o.object_id = r.rel_id
- and r.member_state in ('request approval', 'request approved', 'awaiting payment', 'payment received')
+ and r.member_state in ('request approval', 'request approved', 'application sent', 'application approved')
and (r.user_id = :user_id or o.creation_user=:user_id)
} {
append notice "community_id '${community_id}' participant = '${participant_id}' <br />"
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-template-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-template-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/email-template-delete.tcl 8 Aug 2005 13:10:07 -0000 1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-template-delete.tcl 23 Jan 2006 08:04:42 -0000 1.2
@@ -33,13 +33,13 @@
switch -exact $action {
"submit_app" {
- set type "awaiting payment"
+ set type "application sent"
}
"approve_app" {
set type "on approval"
}
"on join" -
- "awaiting payment" -
+ "application sent" -
"on approval" -
"waitinglist approved" -
"prereq approval" -
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl 20 Dec 2005 15:40:51 -0000 1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/email-template.tcl 23 Jan 2006 08:04:42 -0000 1.8
@@ -24,13 +24,13 @@
switch -exact $action {
"submit_app" {
- set type "awaiting payment"
+ set type "application sent"
}
"approve_app" {
set type "on approval"
}
"on join" -
- "awaiting payment" -
+ "application sent" -
"on approval" -
"waitinglist approved" -
"prereq approval" -
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/one-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/one-user.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/one-user.tcl 4 Aug 2005 23:33:17 -0000 1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/one-user.tcl 23 Jan 2006 08:04:42 -0000 1.2
@@ -59,7 +59,7 @@
select c.community_id, c.pretty_name
from dotlrn_member_rels_full r, dotlrn_communities c
where r.community_id = c.community_id
- and r.member_state = 'awaiting payment'
+ and r.member_state = 'application sent'
and r.user_id = :user_id
} {
if { [db_0or1row assessment {
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request-2.tcl 18 Jan 2006 17:32:53 -0000 1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request-2.tcl 23 Jan 2006 08:04:41 -0000 1.8
@@ -32,8 +32,8 @@
# Send emails
switch -- $type {
- "awaiting payment" {
- dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type "awaiting payment"
+ "application sent" {
+ dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type "application sent"
}
"prereq" {
set mail_from [parameter::get -package_id [ad_acs_kernel_id] -parameter OutgoingSender]
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.29 -r1.30
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl 17 Jan 2006 21:58:05 -0000 1.29
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl 23 Jan 2006 08:04:41 -0000 1.30
@@ -47,7 +47,7 @@
}
payment {
- set member_state "awaiting payment"
+ set member_state "application sent"
set assessment_id [dotlrn_ecommerce::section::application_assessment $section_id]
}
}
@@ -95,7 +95,7 @@
select count(*)
from membership_rels m,
acs_rels r
- where m.member_state in ('needs approval', 'awaiting payment')
+ where m.member_state in ('needs approval', 'application sent')
and m.rel_id = r.rel_id
and r.rel_type = 'dotlrn_member_rel'
and r.object_id_one = :community_id
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp 19 Jul 2005 18:15:09 -0000 1.5
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change.adp 23 Jan 2006 08:04:41 -0000 1.6
@@ -14,7 +14,7 @@
#dotlrn-ecommerce.lt_Youve_already_purchas#
</if>
<else>
- <if @member_state@ in "request approval" "needs approval" "awaiting payment">
+ <if @member_state@ in "request approval" "needs approval" "application sent">
#dotlrn-ecommerce.lt_Your_request_has_been#
</if>
</else>
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 -r1.33 -r1.34
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 24 Oct 2005 18:18:22 -0000 1.33
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 23 Jan 2006 08:04:41 -0000 1.34
@@ -135,7 +135,7 @@
if { $member_state != "approved" &&
$member_state != "waitinglist approved" &&
$member_state != "request approved" &&
- $member_state != "payment received" &&
+ $member_state != "application approved" &&
($override_p == 0 || $admin_p == 0)
} {
@@ -160,7 +160,7 @@
set _return_url [export_vars -base [ad_conn url] { product_id user_id participant_id override_p offer_code {override_course_application_p 1} }]
ad_returnredirect [export_vars -base application-request { user_id participant_id community_id {next_url $_return_url} { type payment } return_url }]
} else {
- set return_url [export_vars -base "[ad_conn package_url]application-confirm" { product_id {member_state "awaiting payment"} }]
+ set return_url [export_vars -base "[ad_conn package_url]application-confirm" { product_id {member_state "application sent"} }]
ad_returnredirect [export_vars -base application-request { user_id participant_id community_id {next_url $return_url} { type payment } }]
}
ad_script_abort