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.30 -r1.31
--- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 10 Aug 2005 21:30:32 -0000 1.30
+++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 11 Aug 2005 01:03:09 -0000 1.31
@@ -126,7 +126,7 @@
Number in Waiting List
One or more prerequisites for this section have not been met:
Or create an account for the participant
- Or put this purchase in the waiting list
+ Put this purchase in the waiting list
Orders in the Last 7 Days
Participant pays for course
%patron_name% also pays for the course
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-delete-from.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-delete-from.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-delete-from.tcl 7 Aug 2005 13:34:45 -0000 1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-delete-from.tcl 11 Aug 2005 01:03:09 -0000 1.4
@@ -15,7 +15,7 @@
size_choice:optional
style_choice:optional
- user_id:integer,notnull,optional
+ user_id:integer,notnull
patron_id:integer,notnull,optional
participant_id:integer,notnull,optional
}
@@ -78,4 +78,13 @@
}
}
+# Flush cache
+if { [db_0or1row section_from_product {
+ select section_id
+ from dlec_view_sections
+ where product_id = :product_id
+}] } {
+ dotlrn_ecommerce::section::flush_cache $section_id
+}
+
rp_internal_redirect shopping-cart
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp 7 Aug 2005 13:33:25 -0000 1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.adp 11 Aug 2005 01:03:09 -0000 1.4
@@ -6,7 +6,9 @@
- - #dotlrn-ecommerce.lt_You_may_continue_with# #dotlrn-ecommerce.Continue#
+
+ - #dotlrn-ecommerce.lt_You_may_continue_with# #dotlrn-ecommerce.Continue#
+
- #dotlrn-ecommerce.lt_Or_put_this_purchase_# #dotlrn-ecommerce.lt_Go_on_the_waiting_lis#
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.tcl 25 Jul 2005 18:19:21 -0000 1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/waiting-list-confirm.tcl 11 Aug 2005 01:03:09 -0000 1.3
@@ -35,6 +35,11 @@
}
# See if we need to check for prerequisites
-set shopping_cart_add_url [export_vars -base shopping-cart-add { user_id participant_id product_id item_count {override_p 1} }]
-
set request_url [export_vars -base application-request { participant_id community_id {next_url $return_url} }]
+
+set allow_override_p [parameter::get -parameter AdminCanOverrideWaitingListP -default 1]
+
+if { $allow_override_p } {
+ set shopping_cart_add_url [export_vars -base shopping-cart-add { user_id participant_id product_id item_count {override_p 1} }]
+
+}
\ No newline at end of file