Index: openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml,v diff -u -r1.31 -r1.32 --- openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 11 Aug 2005 01:03:09 -0000 1.31 +++ openacs-4/packages/dotlrn-ecommerce/catalog/dotlrn-ecommerce.en_US.ISO-8859-1.xml 11 Aug 2005 01:56:47 -0000 1.32 @@ -204,8 +204,9 @@ Order list Order Summary Orders with - Outstanding blance + Outstanding balance Paid By + Paid Via: Participant Participants Payment Information @@ -277,6 +278,7 @@ Welcome to %course_name% You have no orders Your Applications + Your Order Your Order History Your Relationship Zone Index: openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.adp 3 Aug 2005 22:39:32 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.adp 11 Aug 2005 01:56:47 -0000 1.3 @@ -43,4 +43,7 @@ #dotlrn-ecommerce.TOTAL#$@total@ - \ No newline at end of file + + +

+#dotlrn-ecommerce.Paid_Via# @payment_method@ \ No newline at end of file Index: openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.tcl 3 Aug 2005 22:39:32 -0000 1.3 +++ openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.tcl 11 Aug 2005 01:56:47 -0000 1.4 @@ -75,7 +75,7 @@ set options "$options; " } - template::multirow append items $quantity $product_name $options $price_name [ec_pretty_price $price_charged [ad_parameter -package_id [ec_id] Currency ecommerce]] + template::multirow append items $quantity $section_name $options $price_name [ec_pretty_price $price_charged [ad_parameter -package_id [ec_id] Currency ecommerce]] } if { ![empty_string_p $confirmed_date] } { @@ -98,3 +98,20 @@ #foreach i {price shipping gift_certificate tax subtotal total balance} { # set $i [ec_pretty_price [set $i] $currency] #} + +set payment_method [db_string payment_method { + select method + from dotlrn_ecommerce_transactions + where order_id = :order_id +} -default cc] + +set payment_method [ad_decode $payment_method \ + cc "[_ dotlrn-ecommerce.Credit_Card]" \ + check "[_ dotlrn-ecommerce.Check]" \ + internal_account "[_ dotlrn-ecommerce.Internal_Account]" \ + cash "[_ dotlrn-ecommerce.Cash]" \ + invoice "[_ dotlrn-ecommerce.Invoice]" \ + scholarship "[_ dotlrn-ecommerce.Scholarship]" \ + lockbox "[_ dotlrn-ecommerce.Lock_Box]" \ + "[_ dotlrn-ecommerce.Credit_Card]" + ] Index: openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.xql 16 Jul 2005 12:51:06 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/lib/summary-for-customer.xql 11 Aug 2005 01:56:47 -0000 1.3 @@ -28,11 +28,14 @@ - select i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice, p.product_name, p.one_line_description, p.product_id, count(*) as quantity + select i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice, p.product_name, p.one_line_description, p.product_id, count(*) as quantity, s.course_name||': '||s.section_name as section_name from ec_items i, ec_products p + left join dlec_view_sections s + on (p.product_id = s.product_id) + where i.order_id = :order_id and i.product_id = p.product_id - group by p.product_name, p.one_line_description, p.product_id, i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice + group by p.product_name, p.one_line_description, p.product_id, i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice, s.course_name, s.section_name Index: openacs-4/packages/dotlrn-ecommerce/www/home.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/home.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn-ecommerce/www/home.tcl 4 Aug 2005 23:33:17 -0000 1.5 +++ openacs-4/packages/dotlrn-ecommerce/www/home.tcl 11 Aug 2005 01:56:47 -0000 1.6 @@ -96,7 +96,7 @@ group by o.order_id, confirmed_date order by o.order_id } { - set order_url [export_vars -base [apm_package_url_from_key ecommerce]order { order_id }] + set order_url [export_vars -base order { user_id order_id }] set confirmed_date [util_AnsiDatetoPrettyDate $confirmed_date] }