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.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info	28 Jun 2005 03:30:15 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/dotlrn-ecommerce.info	4 Jul 2005 13:39:47 -0000	1.7
@@ -12,25 +12,26 @@
         <summary>Package to tie the dotLRN, Ecommerce, Assessments and dotLRN Catalog packages together</summary>
         <vendor url="http://www.solutiongrove.com">Solution Grove</vendor>
         <description format="text/html">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.</description>
+        <maturity>0</maturity>
 
         <provides url="dotlrn-ecommerce" version="0.1d"/>
-	<requires url="categories" version="1.1d3"/>
+        <requires url="acs-kernel" version="5.2.0d2"/>
+        <requires url="assessment" version="0.11"/>
+        <requires url="categories" version="1.1d3"/>
+        <requires url="dotlrn" version="2.1.2d1"/>
         <requires url="dotlrn-catalog" version="0.1a4"/>
-	<requires url="assessment" version="0.11"/>
-	<requires url="ecommerce" version="5.05"/>
-	<requires url="dotlrn" version="2.1.2d1"/>
-	<requires url="acs-kernel" version="5.2.0d2"/>
+        <requires url="ecommerce" version="5.05"/>
 
-
         <callbacks>
             <callback type="after-install"  proc="dotlrn_ecommerce::install"/>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="AssistantCommunityId"  description="Specify the community id whose members we will use in the Assistant field in the add section form."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="InstructorCommunityId"  description="Specify the community id whose members we will use in the Instructors field in Add Section."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="GradeCategoryTree"  description="Category tree to hold participant grades"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="" name="PatronRelationshipCategoryTree"  description="Category tree to use when adding participant-patron relationships."/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  default="1" name="MemberPriceP"  default="0" description="Whether we give special sale price to members."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AssessmentPackage"  description="Assessment package to be used by dotLRN eCommerce. This package should be accessible at least by registered users."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AssistantCommunityId"  description="Specify the community id whose members we will use in the Assistant field in the add section form."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="GradeCategoryTree"  description="Category tree to hold participant grades"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="InstructorCommunityId"  description="Specify the community id whose members we will use in the Instructors field in Add Section."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MemberPriceP"  default="1" description="Whether we give special sale price to members."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="PatronRelationshipCategoryTree"  description="Category tree to use when adding participant-patron relationships."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PaymentMethods"  default="cc" description="A space separeted list of allowed payment methods. Valid payment methods are 'cc' (Credit Card), 'internal_account' (With extra field asking for internal account code) or 'check'."/>
         </parameters>
 
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	23 Jun 2005 12:30:30 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.adp	4 Jul 2005 13:39:47 -0000	1.5
@@ -12,6 +12,9 @@
 	      id="section_id" /><formwidget id="purchase" /><formwidget
 		id="admin" /></formtemplate>
 <li><a href=course-list>Manage Course List</a>
+<if @registration_assessment_url@ defined>
+<li><a href="@registration_assessment_url;noquote@">Manage Registration Assessment</a>
+</if>
 
 </ul>
 
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl	19 Jun 2005 06:05:07 -0000	1.5
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/index.tcl	4 Jul 2005 13:39:47 -0000	1.6
@@ -26,6 +26,8 @@
 
 set assistant_community_url [dotlrn_community::get_community_url $assistant_community_id]
 
+set return_url [ad_return_url]
+
 # HAM : check if scholarship is installed
 set scholarship_installed_p [apm_package_installed_p "scholarship-fund"]
 # HAM : check if expenses is installed
@@ -78,4 +80,9 @@
 	    ad_script_abort	
 	}
     }
+}
+
+set registration_assessment_id [parameter::get -parameter RegistrationId -package_id [subsite::main_site_id]]
+if { ! [empty_string_p $registration_assessment_id] } {
+    set registration_assessment_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/one-a" { {assessment_id $registration_assessment_id} return_url }]
 }
\ No newline at end of file
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl	4 Jul 2005 11:45:32 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form-2.tcl	4 Jul 2005 13:39:47 -0000	1.7
@@ -910,7 +910,7 @@
     # can have multiple associated assessments, we keep track of all
     # these assessments but for now just use the first one
 
-    ad_returnredirect [export_vars -base "/assessment/assessment" { {assessment_id "[lindex $assessment_ids 0]"} {return_url $checkout_url} }]
+    ad_returnredirect [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]assessment" { {assessment_id "[lindex $assessment_ids 0]"} {return_url $checkout_url} }]
     ad_script_abort
 }