Index: openacs-4/packages/ecommerce/www/admin/orders/revenue.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/revenue.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/orders/revenue.tcl 9 Mar 2004 00:59:50 -0000 1.4
+++ openacs-4/packages/ecommerce/www/admin/orders/revenue.tcl 9 Aug 2008 10:33:13 -0000 1.5
@@ -31,9 +31,9 @@
group by to_char(inserted_date,'YYYY'), to_char(inserted_date,'Q')
order by to_char(inserted_date,'YYYY') || to_char(inserted_date,'Q')" {
set revenue_sum [expr $revenue_sum + $revenue]
- doc_body_append "
$transaction_year Q$transaction_quarter | [ec_pretty_price $revenue] | |
\n"
+ doc_body_append "$transaction_year Q$transaction_quarter | [ec_pretty_pure_price $revenue] | |
\n"
if { $transaction_quarter == "4" } {
- doc_body_append "total for $transaction_year | [ec_pretty_price $revenue_sum] | |
\n"
+ doc_body_append "total for $transaction_year | [ec_pretty_pure_price $revenue_sum] | |
\n"
set revenue_sum 0
}
}
@@ -70,9 +70,9 @@
set price_sum [expr $price_sum + $total_price_charged]
set shipping_sum [expr $shipping_sum + $total_shipping_charged]
set tax_sum [expr $tax_sum + $total_tax_charged]
- doc_body_append "$transaction_year Q$transaction_quarter | Price: [ec_pretty_price $total_price_charged] | Shipping: [ec_pretty_price $total_shipping_charged] | Tax [ec_pretty_price $total_tax_charged] | |
\n"
+ doc_body_append "$transaction_year Q$transaction_quarter | Price: [ec_pretty_pure_price $total_price_charged] | Shipping: [ec_pretty_pure_price $total_shipping_charged] | Tax [ec_pretty_pure_price $total_tax_charged] | |
\n"
if { $transaction_quarter == "4" } {
- doc_body_append "total for $transaction_year | Price: [ec_pretty_price $price_sum] | Shipping [ec_pretty_price $shipping_sum] | Tax [ec_pretty_price $tax_sum] | |
\n"
+ doc_body_append "total for $transaction_year | Price: [ec_pretty_pure_price $price_sum] | Shipping [ec_pretty_pure_price $shipping_sum] | Tax [ec_pretty_pure_price $tax_sum] | |
\n"
set price_sum 0
set shipping_sum 0
set tax_sum 0
@@ -93,9 +93,9 @@
group by to_char(issue_date,'YYYY'), to_char(issue_date,'Q')
order by to_char(issue_date,'YYYY') || to_char(issue_date,'Q')" {
set amount_sum [expr $amount_sum + $amount]
- doc_body_append "$issue_year Q$issue_quarter | [ec_pretty_price $amount] | |
\n"
+ doc_body_append "$issue_year Q$issue_quarter | [ec_pretty_pure_price $amount] | |
\n"
if { $issue_quarter == "4" } {
- doc_body_append "total for $issue_year | [ec_pretty_price $amount_sum] | |
\n"
+ doc_body_append "total for $issue_year | [ec_pretty_pure_price $amount_sum] | |
\n"
set amount_sum 0
}
}
@@ -114,9 +114,9 @@
group by to_char(issue_date,'YYYY'), to_char(issue_date,'Q')
order by to_char(issue_date,'YYYY') || to_char(issue_date,'Q')" {
set amount_sum [expr $amount_sum + $amount]
- doc_body_append "$issue_year Q$issue_quarter | [ec_pretty_price $amount] | |
\n"
+ doc_body_append "$issue_year Q$issue_quarter | [ec_pretty_pure_price $amount] | |
\n"
if { $issue_quarter == "4" } {
- doc_body_append "total for $issue_year | [ec_pretty_price $amount_sum] | |
\n"
+ doc_body_append "total for $issue_year | [ec_pretty_pure_price $amount_sum] | |
\n"
set amount_sum 0
}
}
@@ -148,9 +148,9 @@
group by to_char(expires,'YYYY'), to_char(expires,'Q')
order by to_char(expires,'YYYY') || to_char(expires,'Q')" {
set amount_outstanding_sum [expr $amount_outstanding_sum + $amount_outstanding]
- doc_body_append "$expires_year Q$expires_quarter | [ec_pretty_price $amount_outstanding] | |
\n"
+ doc_body_append "$expires_year Q$expires_quarter | [ec_pretty_pure_price $amount_outstanding] | |
\n"
if { $expires_quarter == "4" } {
- doc_body_append "total for $expires_year | [ec_pretty_price $amount_outstanding_sum] | |
\n"
+ doc_body_append "total for $expires_year | [ec_pretty_pure_price $amount_outstanding_sum] | |
\n"
set amount_sum 0
}
}