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 -N -r1.9 -r1.10 --- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 23 Jul 2005 15:07:45 -0000 1.9 +++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 25 Jul 2005 18:18:43 -0000 1.10 @@ -17,6 +17,8 @@ } -errors { } +### Add security checks + set user_id [ad_conn user_id] set package_id [ad_conn package_id] @@ -107,6 +109,9 @@ [_ dotlrn-ecommerce.Cancel] + + [_ dotlrn-ecommerce.Register] + } html { width 125 align center nowrap } @@ -160,8 +165,8 @@ set section_clause "" } -db_multirow -extend { approve_url reject_url asm_url section_edit_url person_url } applications applications [subst { - select person__name(r.user_id) as person_name, member_state, r.community_id, r.user_id as applicant_user_id, s.section_name, t.course_name, s.section_id, r.rel_id, e.phone, +db_multirow -extend { approve_url reject_url asm_url section_edit_url person_url register_url } applications applications [subst { + select person__name(r.user_id) as person_name, member_state, r.community_id, r.user_id as applicant_user_id, s.section_name, t.course_name, s.section_id, r.rel_id, e.phone, o.creation_user as patron_id, (select count(*) from (select * from dotlrn_member_rels_full rr, @@ -177,10 +182,11 @@ where address_id in (select max(address_id) from ec_addresses group by user_id)) e - on (r.user_id = e.user_id), dotlrn_ecommerce_section s, dotlrn_catalogi t, cr_items i + on (r.user_id = e.user_id), dotlrn_ecommerce_section s, dotlrn_catalogi t, cr_items i, acs_objects o where r.community_id = s.community_id and s.course_id = t.item_id and t.course_id = i.live_revision + and r.rel_id = o.object_id and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'awaiting payment', 'payment received') $user_clause @@ -256,4 +262,5 @@ 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} }] }