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.11 -r1.12 --- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 20 Jul 2005 18:14:15 -0000 1.11 +++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 21 Jul 2005 09:01:49 -0000 1.12 @@ -29,6 +29,7 @@ Edit My Application Expense Tracking Gift Certificate: + Go to My Account Grade I'm a new customer: info @@ -41,6 +42,7 @@ A space has opened up in $community_name. A space has opened up in $community_name. Please register via the website or call to get registered via phone. Alternately, you can use a + Application Confirmed Approved Applications Approved Users from Waiting List Back to shopping cart @@ -77,13 +79,16 @@ Purchase another Course/Section Purchase another Course/Section + Register for Another Course + Register for another course Registering for classes with %service_name% is quick and easy Required %prereqs.field% was not met Return to course catalog Return to main course registration administration Section Prerequisites Select another purchaser Sessions and Attendance + Thank you for your application. Thank You For Your Order The course only has $available_slots slot(s) left The following has been sent to the purchaser 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp 21 Jul 2005 09:01:49 -0000 1.1 @@ -0,0 +1,10 @@ + + #dotlrn-ecommerce.lt_Application_Confirmed# + +
+

#dotlrn-ecommerce.lt_Thank_you_for_your_ap#

+
+ +

+ #dotlrn-ecommerce.Go_to_My_Account#     + #dotlrn-ecommerce.lt_Register_for_Another_# 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.4 -r1.5 --- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 20 Jul 2005 17:41:07 -0000 1.4 +++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 21 Jul 2005 09:01:49 -0000 1.5 @@ -145,7 +145,7 @@ group by user_id)) e on (r.user_id = e.user_id), dotlrn_communities_all c where r.community_id = c.community_id - and member_state = 'waitinglist approved' + and member_state in ('waitinglist approved', 'payment received') } { set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} {send_email_p 0} }] } Index: openacs-4/packages/dotlrn-ecommerce/www/home.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-ecommerce/www/home.adp 20 Jul 2005 18:12:19 -0000 1.4 +++ openacs-4/packages/dotlrn-ecommerce/www/home.adp 21 Jul 2005 09:01:49 -0000 1.5 @@ -38,6 +38,7 @@

  • #acs-subsite.Close_your_account#
  • +
  • #dotlrn-ecommerce.lt_Register_for_another_#
  • @@ -84,7 +85,7 @@
  • #dotlrn-ecommerce.You_have_no_orders#
  • -
    +

    #dotlrn-ecommerce.Your_Applications#

    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.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/www/home.tcl 20 Jul 2005 18:12:19 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl 21 Jul 2005 09:01:49 -0000 1.3 @@ -128,4 +128,6 @@ set edit_asm_url [export_vars -base /assessment/assessment { assessment_id }] incr sessions_with_applications } -} \ No newline at end of file +} + +set catalog_url [ad_conn package_url] \ No newline at end of file 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.5 -r1.6 --- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 19 Jul 2005 18:15:09 -0000 1.5 +++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 21 Jul 2005 09:01:49 -0000 1.6 @@ -161,7 +161,7 @@ limit 1 }] } { if { ! [empty_string_p $assessment_id] && $assessment_id != -1 } { - set return_url [ad_conn package_url] + set return_url [ad_conn package_url]application-confirm ad_returnredirect [export_vars -base application-request { participant_id community_id {next_url $return_url} { type payment } }] ad_script_abort