Index: openacs-4/packages/ecommerce/www/admin/orders/revenue.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/revenue.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/orders/revenue.adp 17 Aug 2008 22:42:25 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/orders/revenue.adp 17 Aug 2008 22:47:01 -0000 1.2 @@ -4,24 +4,21 @@

@title@

- + @reportable_transactions_select_html;noquote@ - + @money_select_html;noquote@ - + @gift_certificates_sales_html;noquote@ - + @gift_certificates_issued_html;noquote@ - - + @gift_certificates_approved_html;noquote@
PeriodRevenue 1
PeriodRevenue 1
 
PeriodProduct Sales 2
PeriodProduct Sales 2
 
PeriodGift Certificate Sales -3
PeriodGift Certificate Sales3
 
PeriodGift Certificates Issued -4
PeriodGift Certificates Issued4
 
ExpiresGift Certificates Outstanding 5
ExpiresGift Certificates Outstanding 5
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.6 -r1.7 --- openacs-4/packages/ecommerce/www/admin/orders/revenue.tcl 17 Aug 2008 22:42:25 -0000 1.6 +++ openacs-4/packages/ecommerce/www/admin/orders/revenue.tcl 17 Aug 2008 22:47:01 -0000 1.7 @@ -23,9 +23,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] - append reportable_tranactions_select_html "$transaction_year Q$transaction_quarter[ec_pretty_pure_price $revenue]\n" + append reportable_tranactions_select_html "$transaction_year Q$transaction_quarter[ec_pretty_pure_price $revenue]\n" if { $transaction_quarter == "4" } { - append reportable_transactions_select_html "total for $transaction_year[ec_pretty_pure_price $revenue_sum]\n" + append reportable_transactions_select_html "total for $transaction_year[ec_pretty_pure_price $revenue_sum]\n" set revenue_sum 0 } } @@ -57,9 +57,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] - append money_select_html "$transaction_year Q$transaction_quarterPrice: [ec_pretty_pure_price $total_price_charged] | Shipping: [ec_pretty_pure_price $total_shipping_charged] | Tax [ec_pretty_pure_price $total_tax_charged]\n" + append money_select_html "$transaction_year Q$transaction_quarterPrice: [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" } { - append money_select_html "total for $transaction_yearPrice: [ec_pretty_pure_price $price_sum] | Shipping [ec_pretty_pure_price $shipping_sum] | Tax [ec_pretty_pure_price $tax_sum]\n" + append money_select_html "total for $transaction_yearPrice: [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 @@ -75,9 +75,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] - append gift_certificates_sales_html "$issue_year Q$issue_quarter[ec_pretty_pure_price $amount]\n" + append gift_certificates_sales_html "$issue_year Q$issue_quarter[ec_pretty_pure_price $amount]\n" if { $issue_quarter == "4" } { - append gift_certificates_sales_html "total for $issue_year[ec_pretty_pure_price $amount_sum]\n" + append gift_certificates_sales_html "total for $issue_year[ec_pretty_pure_price $amount_sum]\n" set amount_sum 0 } } @@ -91,9 +91,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] - append gift_certificates_issued_html "$issue_year Q$issue_quarter[ec_pretty_pure_price $amount]\n" + append gift_certificates_issued_html "$issue_year Q$issue_quarter[ec_pretty_pure_price $amount]\n" if { $issue_quarter == "4" } { - append gift_certificates_issued_html "total for $issue_year[ec_pretty_pure_price $amount_sum]\n" + append gift_certificates_issued_html "total for $issue_year[ec_pretty_pure_price $amount_sum]\n" set amount_sum 0 } } @@ -120,9 +120,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] - append gift_certificates_approved_html "$expires_year Q$expires_quarter[ec_pretty_pure_price $amount_outstanding]\n" + append gift_certificates_approved_html "$expires_year Q$expires_quarter[ec_pretty_pure_price $amount_outstanding]\n" if { $expires_quarter == "4" } { - append gift_certificates_approved_html "total for $expires_year[ec_pretty_pure_price $amount_outstanding_sum]\n" + append gift_certificates_approved_html "total for $expires_year[ec_pretty_pure_price $amount_outstanding_sum]\n" set amount_sum 0 } }