Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.tcl 22 Aug 2005 21:59:23 -0000 1.7 +++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/prerequisite-confirm.tcl 6 Sep 2005 04:39:23 -0000 1.8 @@ -23,9 +23,6 @@ set cc_package_id [apm_package_id_from_key "dotlrn-catalog"] set admin_p [permission::permission_p -object_id $cc_package_id -privilege "admin"] -if { $admin_p } { - set return_url "/dotlrn-ecommerce/admin/" -} db_1row section { Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 6 Sep 2005 04:25:43 -0000 1.19 +++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 6 Sep 2005 04:39:23 -0000 1.20 @@ -198,9 +198,11 @@ if { $admin_p && $user_id != [ad_conn user_id] } { set cancel_url [set return_url [export_vars -base [ad_conn package_url]admin/process-purchase-course { user_id }]] } else { - set return_url [export_vars -base [ad_conn package_url]application-confirm { product_id {member_state "request approval"} }] set cancel_url [ad_conn package_url] } + set return_url [export_vars -base [ad_conn package_url]application-confirm { product_id {member_state "request approval"} {patron_id $user_id} }] + + ad_returnredirect [export_vars -base prerequisite-confirm { product_id user_id participant_id return_url cancel_url }] ad_script_abort }