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.22 -r1.23 --- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 17 Aug 2005 15:37:28 -0000 1.22 +++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 18 Aug 2005 19:34:53 -0000 1.23 @@ -232,7 +232,7 @@ and rr.rel_id <= r.rel_id and rr.community_id = r.community_id and rr.member_state = r.member_state - order by o.creation_date) r) as number + order by o.creation_date) r) as number, s.product_id from dotlrn_member_rels_full r left join (select * from ec_addresses @@ -313,8 +313,10 @@ set section_edit_url [export_vars -base admin/one-section { section_id return_url }] set person_url [export_vars -base /acs-admin/users/one { {user_id $applicant_user_id} }] - set register_url [export_vars -base admin/process-purchase-course { section_id {user_id $patron_id} {participant_id $applicant_user_id} }] + set add_url [export_vars -base "../ecommerce/shopping-cart-add" { product_id {user_id $patron_id} {participant_id $applicant_user_id} return_url }] + set register_url [export_vars -base admin/participant-add { section_id {user_id $applicant_user_id} return_url add_url }] + # get associated comment if {![empty_string_p $asm_url]} { db_foreach get_comments { 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.16 -r1.17 --- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl 18 Aug 2005 10:05:35 -0000 1.16 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl 18 Aug 2005 19:34:53 -0000 1.17 @@ -390,6 +390,7 @@ # } set return_url [ad_return_url] + ad_form -extend -name "participant" -export { user_id return_url new_user_p } -validate $validate -form { } -on_request { set related_user 0 @@ -425,7 +426,6 @@ where section_id = :section_id } - set item_count 1 if { $related_user == -1 } { ad_returnredirect [export_vars -base "process-purchase-group" { section_id user_id return_url return_url }] ad_script_abort @@ -434,7 +434,7 @@ ad_script_abort } - set add_url [export_vars -base "../ecommerce/shopping-cart-add" { product_id user_id participant_id item_count return_url }] + set add_url [export_vars -base "../ecommerce/shopping-cart-add" { product_id user_id participant_id return_url }] set participant_id [ad_decode $participant_id 0 $user_id $participant_id] if { $new_user_p } {