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.21 -r1.22
--- openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info 9 Aug 2005 03:08:57 -0000 1.21
+++ openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info 10 Aug 2005 21:30:32 -0000 1.22
@@ -7,15 +7,15 @@
f
t
-
+
Roel Canicula
Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together
- 2005-07-31
+ 2005-08-10
Solution Grove
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.
0
-
+
@@ -34,13 +34,13 @@
+
+
-
-
-
+
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.29 -r1.30
--- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 7 Aug 2005 13:38:14 -0000 1.29
+++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 10 Aug 2005 21:30:32 -0000 1.30
@@ -1,5 +1,5 @@
-
+
Action
Add Course
@@ -42,6 +42,7 @@
Credit Card
Credit card number
Currently Selected
+ Date
delete
Display All Orders
Display Course
@@ -77,6 +78,7 @@
List
List Registrants
List Users
+ Lock Box
1. Please review your order list for accuracy.
2. Complete this information.
A full credit card expiration date (month and year) is required
@@ -170,7 +172,7 @@
Users in waiting list
Users related to the %patron_name%
Waiting List and Prerequisite Applications
- Welcome to %course_name%. We look forward to a great course.
+ Welcome to %course_name%. We look forward to a great course.
Who is taking the course?
Who's participating in this course?
Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d4-0.1d5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d4-0.1d5.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d4-0.1d5.sql 10 Aug 2005 21:30:32 -0000 1.1
@@ -0,0 +1,14 @@
+--
+-- packages/dotlrn-ecommerce/sql/postgresql/upgrade/upgrade-0.1d4-0.1d5.sql
+--
+-- @author Roel Canicula (roelmc@pldtdsl.net)
+-- @creation-date 2005-08-10
+-- @arch-tag: d0ee3250-194e-46c7-ad87-26b7b1801127
+-- @cvs-id $Id: upgrade-0.1d4-0.1d5.sql,v 1.1 2005/08/10 21:30:32 roelc Exp $
+--
+
+alter table dotlrn_ecommerce_transactions drop constraint dotlrn_ecommerce_transactions_method;
+alter table dotlrn_ecommerce_transactions add constraint dotlrn_ecommerce_transactions_method check (method in ('cc', 'internal_account', 'check', 'cash', 'invoice', 'scholarship', 'lockbox'));
+
+alter table dotlrn_ecommerce_transaction_invoice_payments drop constraint dotlrn_ecommerce_transaction_invoice_payments_method;
+alter table dotlrn_ecommerce_transaction_invoice_payments add constraint dotlrn_ecommerce_transaction_invoice_payments_method check (method in ('cc', 'internal_account', 'check', 'cash', 'invoice', 'scholarship', 'lockbox'));
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl 3 Aug 2005 03:48:19 -0000 1.14
+++ openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl 10 Aug 2005 21:30:31 -0000 1.15
@@ -87,11 +87,33 @@
@error
} {
- #apm_upgrade_logic \
- # -from_version_name $from_version_name \
- # -to_version_name $to_version_name \
- # -spec {
- # }
+ apm_upgrade_logic \
+ -from_version_name $from_version_name \
+ -to_version_name $to_version_name \
+ -spec {
+ 0.1d4 0.1d5 {
+ apm_parameter_register \
+ MultipleItemDiscountP \
+ "Enable multiple item discounts, i.e. the first item has the full price and the next items get the discount." \
+ dotlrn-ecommerce \
+ 0 \
+ number
+
+ apm_parameter_register \
+ MultipleItemDiscountAmount \
+ "The amount discounted to multiple item purchases. This needs the parameter MultipleItemDiscountP to be set to 1." \
+ dotlrn-ecommerce \
+ 5 \
+ number
+
+ apm_parameter_register \
+ AdminCanOverrideWaitingListP \
+ "Allow the admin to override the waiting list if the section is full." \
+ dotlrn-ecommerce \
+ 1 \
+ number
+ }
+ }
}
ad_proc -private dotlrn-catalog::package_mount {