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.46 -r1.47
--- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml	13 Sep 2005 11:12:25 -0000	1.46
+++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml	14 Sep 2005 03:41:40 -0000	1.47
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="dotlrn-ecommerce" package_version="0.1d16" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="dotlrn-ecommerce" package_version="0.1d17" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Action">Action</msg>
   <msg key="Add_Course">Add Course</msg>
@@ -181,6 +181,7 @@
   <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_There_is_no_fee_for_t">There is no fee for this course</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, or click &quot;back&quot; on your browser to make changes.</msg>
Index: openacs-4/packages/dotlrn-ecommerce/lib/section.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/section.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/dotlrn-ecommerce/lib/section.tcl	14 Sep 2005 02:42:33 -0000	1.30
+++ openacs-4/packages/dotlrn-ecommerce/lib/section.tcl	14 Sep 2005 03:41:40 -0000	1.31
@@ -108,9 +108,20 @@
     dotlrn_ecommerce::section::flush_cache $section_id
 }
 
-ad_form -extend -name add_section -form {
-    {section_name:text {label "Section Name"}}
-    {price:currency,to_sql(sql_number) {label "Regular Price"} {html {size 6}}}
+if { [parameter::get -parameter AllowFreeRegistration -default 0] } {
+    ad_form -extend -name add_section -form {
+	{section_name:text {label "Section Name"}}
+	{price:currency,to_sql(sql_number) {label "Regular Price"} {html {size 6}}
+	    {help_text {Enter any fees related to this course here. \$0 in this field means there is no related fee.}}
+	}
+    }
+} else {
+    ad_form -extend -name add_section -form {
+	{section_name:text {label "Section Name"}}
+	{price:currency,to_sql(sql_number) {label "Regular Price"} {html {size 6}}
+	    {help_text "Enter any fees related to this course here."}
+	}	
+    }
 }
 
 
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.56 -r1.57
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl	14 Sep 2005 02:42:33 -0000	1.56
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl	14 Sep 2005 03:41:40 -0000	1.57
@@ -303,7 +303,7 @@
 		<if @course_list.sessions@ not nil and @course_list.show_sessions_p@ eq "t"><br />@course_list.sessions;noquote@</if>
 		<if @course_list.section_zones@ not nil><br />@course_list.section_zones;noquote@</if>
 		<if @course_list.instructor_names@ not nil><br />@course_list.instructor_names;noquote@</if>
-		<if @course_list.prices@ not nil><br /><if @allow_free_registration_p@ and @course_list.prices@ lt 0.01>Free Registration</if><else>@course_list.prices;noquote@</else></if>
+		<if @course_list.prices@ not nil><br /><if @allow_free_registration_p@ and @course_list.price@ lt 0.01>[_ dotlrn-ecommerce.lt_There_is_no_fee_for_t]</if><else>@course_list.prices;noquote@</else></if>
 		<if @course_list.show_participants_p@ eq "t">
 		<br />@course_list.attendees;noquote@ participant<if @course_list.attendees@ gt 1>s</if>
 		<if @course_list.available_slots@ not nil and @course_list.available_slots@ gt 0>,<br />@course_list.available_slots;noquote@ available</if>
@@ -483,7 +483,7 @@
     set discount_clause ""
 }
 
-db_multirow -extend {patron_message member_state fs_chunk section_folder_id section_pages_url category_name community_url course_edit_url section_add_url section_edit_url course_grades section_grades section_zones sections_url member_p sessions instructor_names prices shopping_cart_add_url attendees available_slots pending_p waiting_p approved_p instructor_p registration_approved_url button waiting_list_number asm_url } course_list get_courses { } {
+db_multirow -extend {patron_message member_state fs_chunk section_folder_id section_pages_url category_name community_url course_edit_url section_add_url section_edit_url course_grades section_grades section_zones sections_url member_p sessions instructor_names price prices shopping_cart_add_url attendees available_slots pending_p waiting_p approved_p instructor_p registration_approved_url button waiting_list_number asm_url } course_list get_courses { } {
 
     # Since dotlrn-ecommerce is based on dotlrn-catalog,
     # it's possible to have a dotlrn_catalog object without an
@@ -622,7 +622,7 @@
     }
 
     if { ! [empty_string_p $product_id] } {
-	set prices [util_memoize [list dotlrn_ecommerce::section::price $section_id] $memoize_max_age]
+	set prices [set price [util_memoize [list dotlrn_ecommerce::section::price $section_id] $memoize_max_age]]
 	if { [parameter::get -package_id [ad_conn package_id] -parameter MemberPriceP -default 0 ] } {
 	    set member_price [util_memoize [list dotlrn_ecommerce::section::member_price $section_id] $memoize_max_age]
 	    if { $member_price } {