Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl 17 Aug 2005 09:31:58 -0000 1.7 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase.tcl 22 Aug 2005 17:44:42 -0000 1.8 @@ -130,13 +130,20 @@ $page_query [template::list::page_where_clause -name users -key u.user_id -and] }] { - set add_url [export_vars -base "../ecommerce/shopping-cart-add" { product_id user_id participant_id return_url }] - set add_member_url [export_vars -base "../ecommerce/participant-add" { {user_id $participant_id} section_id return_url add_url }] + set add_url [export_vars -base "[ad_conn package_url]ecommerce/shopping-cart-add" { product_id user_id participant_id return_url }] + set rel_id [relation::get_id -object_id_one $user_id -object_id_two $participant_id -rel_type "patron_rel"] + + if { ! [empty_string_p $rel_id] } { + set add_member_url [export_vars -base "[ad_conn package_url]ecommerce/participant-add" { {user_id $participant_id} section_id return_url add_url }] + } else { + set add_member_url [export_vars -base [ad_conn package_url]admin/process-purchase-2 { {user_id $participant_id} {patron_id $user_id} section_id community_id return_url }] + } + } } - set add_url [export_vars -base "ecommerce/shopping-cart-add" { product_id }] + set add_url [export_vars -base "[ad_conn package_url]ecommerce/shopping-cart-add" { product_id }] set addpatron_url [export_vars -base "membership-add" { user_id section_id community_id {referer $return_url} }] - set next_url [export_vars -base process-purchase-2 { {patron_id $user_id} section_id community_id return_url }] + set next_url [export_vars -base [ad_conn package_url]admin/process-purchase-2 { {patron_id $user_id} section_id community_id return_url }] } \ No newline at end of file