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.42 -r1.43
--- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml	1 Sep 2005 12:23:21 -0000	1.42
+++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml	6 Sep 2005 04:25:42 -0000	1.43
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="dotlrn-ecommerce" package_version="0.1d12" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="dotlrn-ecommerce" package_version="0.1d13" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Add_Course">Add Course</msg>
@@ -98,7 +98,7 @@
   <msg key="lt_Application_approval_">Application approval (default &lt;i&gt;Note: this is customizable on a per section basis&lt;/i&gt;)</msg>
   <msg key="lt_Application_approval__1">Application approval (granted spot from waiting list)</msg>
   <msg key="lt_Application_approval__2">Application approval (waiver of prerequisites approved)</msg>
-  <msg key="lt_Application_Confirmed">Application Confirmed</msg>
+  <msg key="lt_Application_Confirmed">Waiting list request confirmed</msg>
   <msg key="lt_Approved_Applications">Approved Applications</msg>
   <msg key="lt_Approved_PreReq_Appli">Approved PreReq Applications</msg>
   <msg key="lt_Approved_Users_from_W">Approved Users from Waiting List</msg>
@@ -118,8 +118,8 @@
   <msg key="lt_for_first_names_last_">for %first_names% %last_name% (if you're not %first_names% %last_name%</msg>
   <msg key="lt_for_the_current_purch">for the current purchases</msg>
   <msg key="lt_Go_on_the_waiting_lis">Waiting list</msg>
-  <msg key="lt_Hold_slot_and_wait_fo">Hold slot and wait for confirmation</msg>
-  <msg key="lt_How_are_you_related_t">Is this person your</msg>
+  <msg key="lt_Hold_slot_and_wait_fo">Request an exception</msg>
+  <msg key="lt_How_are_you_related_t">This person is your</msg>
   <msg key="lt_I_am_a_returning_cust">I am a returning customer:</msg>
   <msg key="lt_if_you_prefer_using_s">if you prefer using some of your other addresses on file with us.</msg>
   <msg key="lt_Im_participating_in_t">I'm participating in this course</msg>
@@ -167,15 +167,15 @@
   <msg key="lt_Select_another_purcha">Select another purchaser</msg>
   <msg key="lt_Sessions_and_Attendan">Sessions and Attendance</msg>
   <msg key="lt_Sorry_the_offer_code_">Sorry, the offer code was not accepted.</msg>
-  <msg key="lt_Thank_you_for_your_ap">Thank you for your application to %section_name%.</msg>
+  <msg key="lt_Thank_you_for_your_ap">Thank you for putting yourself on the waiting list for %section_name%.  We will notify you if a space becomes available.</msg>
   <msg key="lt_Thank_You_For_Your_Or">Thank You For Your Order</msg>
   <msg key="lt_The_course_only_has_a">The course only has $available_slots slot(s) left</msg>
   <msg key="lt_The_following_has_bee">The following has been sent to the purchaser</msg>
   <msg key="lt_The_offer_code_was_ac">The offer code was accepted. You save $savings!</msg>
-  <msg key="lt_This_section_is_curre">This section is currently full, but we are taking registrations for the waiting list.</msg>
+  <msg key="lt_This_section_is_curre">This section is currently full, but we are taking names for the waiting list.</msg>
   <msg key="lt_To_complete_your_orde">To complete your order, submit this form, and confirm the information on the following page.</msg>
-  <msg key="lt_to_send_us_your_order">to send us your order!</msg>
-  <msg key="lt_Total_Amount_Received">Total Amount Received</msg>
+  <msg key="lt_to_send_us_your_order">to send us your order, or click &quot;back&quot; on your browser to make changes.</msg>
+  <msg key="lt_Total_Amount_Received">Total Charge</msg>
   <msg key="lt_User_application_appr">Application approved</msg>
   <msg key="lt_User_approved_waiting">Slot available to come off waiting list - waiting for purchase</msg>
   <msg key="lt_User_has_approved_pre">Prequisite has been approved - waiting for purchase</msg>
@@ -200,7 +200,7 @@
   <msg key="lt_You_have_no_applicati">You have no applications</msg>
   <msg key="lt_You_may_continue_with">You may continue with the purchase</msg>
   <msg key="lt_You_may_only_enter_up">You may only enter up to the amount</msg>
-  <msg key="lt_You_may_wish_to_conti">Would you like to be placed to the waiting list?</msg>
+  <msg key="lt_You_may_wish_to_conti">Would you like to be placed on the waiting list?</msg>
   <msg key="lt_You_may_wish_to_regis">Would you be interested in taking a different course?</msg>
   <msg key="lt_Your_application_to_j">Your application to join $community_name was approved. Please register via the MOS website or call to get registered via phone.</msg>
   <msg key="lt_Your_application_to_j_1">Your application to join %community_name% was rejected.</msg>
@@ -245,10 +245,10 @@
   <msg key="Process_Registration">Process Registration</msg>
   <msg key="Product">Product</msg>
   <msg key="Public_Pages">Public Pages</msg>
-  <msg key="Purchase_membership">Purchase membership</msg>
+  <msg key="Purchase_membership">Purchase membership </msg>
   <msg key="Purchaser">Purchaser</msg>
   <msg key="Purchaser_is">Purchaser is</msg>
-  <msg key="Push">Push</msg>
+  <msg key="Push">Click</msg>
   <msg key="Quantity">Quantity</msg>
   <msg key="Quick_Links">Quick Links</msg>
   <msg key="Reason">Reason</msg>
@@ -283,7 +283,7 @@
   <msg key="Subtotal_1">Subtotal</msg>
   <msg key="System_Setup">System Setup</msg>
   <msg key="Tax">Tax:</msg>
-  <msg key="The_section_is_full">The section is full</msg>
+  <msg key="The_section_is_full">The section is full.</msg>
   <msg key="TOTAL">TOTAL:</msg>
   <msg key="Total">Total:</msg>
   <msg key="Total_1">Total</msg>
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.13 -r1.14
--- openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	6 Sep 2005 02:00:16 -0000	1.13
+++ openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	6 Sep 2005 04:25:43 -0000	1.14
@@ -3,7 +3,6 @@
 ad_page_contract {
     
     
-    
     @author Roel Canicula (roelmc@pldtdsl.net)
     @creation-date 2005-06-23
     @arch-tag: 93f47ba6-c04e-419a-bcd6-60bb95553236
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.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp	5 Sep 2005 20:48:24 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.adp	6 Sep 2005 04:25:43 -0000	1.4
@@ -22,4 +22,19 @@
 <!--
   <a href="home" class="button">#dotlrn-ecommerce.Go_to_My_Account#</a> &nbsp;&nbsp;&nbsp;
 -->
+
+<if @admin_p@>
+    <ul>
+      <li> <a
+	  href="admin/process-purchase-course?user_id=@patron_id@">#dotlrn-ecommerce.lt_Purchase_another_Cour#</a> #dotlrn-ecommerce.lt_for_the_current_purch#</li>
+      <li> <a
+	  href="admin/process-purchase-all">#dotlrn-ecommerce.lt_Select_another_purcha#</a> </li>
+      
+      <li> <a
+	  href="admin">#dotlrn-ecommerce.lt_Return_to_main_course#</a> </li>
+    </ul>
+
+</if>
+<else>
   <a href="index" class="button">#dotlrn-ecommerce.lt_Register_for_Another_#</a>
+</else>
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl	5 Sep 2005 20:48:25 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl	6 Sep 2005 04:25:43 -0000	1.5
@@ -2,8 +2,13 @@
 } {
     {product_id:notnull}
     member_state:notnull
+    {patron_id ""}
+
 }
 
+set cc_package_id [apm_package_id_from_key "dotlrn-catalog"]
+set admin_p [permission::permission_p -object_id $cc_package_id -privilege "admin"]
+
 if { [db_0or1row get_name {
     select c.course_name||': '||s.section_name as section_name, s.community_id
     from dotlrn_ecommerce_section s, dotlrn_catalogi c, cr_items i
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl	6 Sep 2005 01:12:11 -0000	1.20
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl	6 Sep 2005 04:25:43 -0000	1.21
@@ -31,6 +31,7 @@
 }
 
 
+
 # Proc to be used in form validation
 proc already_registered_p { section_id purchaser_id participant_id } {
     if { [empty_string_p $section_id] } {
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl	6 Sep 2005 01:12:11 -0000	1.10
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl	6 Sep 2005 04:25:43 -0000	1.11
@@ -23,6 +23,7 @@
 
 set title ""
 
+
 if { [exists_and_not_null section_id] } {
 
     db_1row get_section_info "select c.course_id, c.course_name,
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-add.tcl	28 Aug 2005 15:18:12 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-add.tcl	6 Sep 2005 04:25:43 -0000	1.3
@@ -19,6 +19,7 @@
 } -errors {
 }
 
+
 if { ! [empty_string_p $cancel] } {
     ns_log notice "DEBUG:: CANCEL - $cancel - $return_url"
 
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.18 -r1.19
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl	24 Aug 2005 10:03:03 -0000	1.18
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl	6 Sep 2005 04:25:43 -0000	1.19
@@ -143,12 +143,13 @@
 		# No more slots left, ask user if he wants to go to
 		# waiting list
 		
-		if { $admin_p && $user_id != [ad_conn user_id] } {
+		if { $admin_p } {
 		    set cancel_url [set return_url [export_vars -base [ad_conn package_url]admin/process-purchase-course { user_id }]]
 		} else {
-		    set return_url [export_vars -base [ad_conn package_url]application-confirm { product_id {member_state "needs approval"} }]
 		    set cancel_url [ad_conn package_url]
 		}
+		
+		set return_url [export_vars -base [ad_conn package_url]application-confirm { product_id {member_state "needs approval"} {patron_id $user_id}} ]
 		ad_returnredirect [export_vars -base waiting-list-confirm { product_id user_id participant_id return_url cancel_url }]
 		ad_script_abort
 	    }