Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl 3 Aug 2005 22:46:40 -0000 1.17 +++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl 5 Aug 2005 05:40:09 -0000 1.18 @@ -861,4 +861,19 @@ } append hidden_vars [export_form_vars billing_address_id shipping_address_id user_id participant_id] +# Get scholarships +db_multirow scholarships scholarships { + select f.title, sum(g.grant_amount) as grant_amount + from scholarship_fundi f, + scholarship_fund_grants g, + ec_gift_certificates gc + where f.fund_id = g.fund_id + and g.gift_certificate_id = gc.gift_certificate_id + and g.user_id = :user_id + + group by f.title +} { + set grant_amount [ec_pretty_price $grant_amount] +} + db_release_unused_handles