Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 24 Feb 2005 13:33:13 -0000 1.26 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 9 Aug 2008 10:30:03 -0000 1.27 @@ -204,28 +204,28 @@ if { [empty_string_p $base_shipping_cost] || $base_shipping_cost == 0 } { set shipping_summary "For each order, there is no base cost. However, " } else { - set shipping_summary "For each order, there is a base cost of [ec_pretty_price $base_shipping_cost $currency]. In addition, " + set shipping_summary "For each order, there is a base cost of [ec_pretty_pure_price $base_shipping_cost $currency]. In addition, " } if { ([empty_string_p $weight_shipping_cost] || $weight_shipping_cost == 0) && ([empty_string_p $default_shipping_per_item] || $default_shipping_per_item == 0) } { append shipping_summary "the per-item cost is set using the amount in the \"Shipping Price\" field of each item (or \"Shipping Price - Additional\", if more than one of the same product is ordered). " } elseif { [empty_string_p $weight_shipping_cost] || $weight_shipping_cost == 0 } { - append shipping_summary "the per-item cost is [ec_pretty_price $default_shipping_per_item $currency], unless the \"Shipping Price\" has been set for that product. A \"Shipping Price - Additional\" amount is added for each additional unit of the same product ordered). " + append shipping_summary "the per-item cost is [ec_pretty_pure_price $default_shipping_per_item $currency], unless the \"Shipping Price\" has been set for that product. A \"Shipping Price - Additional\" amount is added for each additional unit of the same product ordered). " } else { - append shipping_summary "the per-item-cost is equal to [ec_pretty_price $weight_shipping_cost $currency] times its weight in [ad_parameter -package_id [ec_id] WeightUnits ecommerce], unless the \"Shipping Price\" has been set for that product. A \"Shipping Price - Additional\" amount is added for each additional unit of the same product ordered). " + append shipping_summary "the per-item-cost is equal to [ec_pretty_pure_price $weight_shipping_cost $currency] times its weight in [ad_parameter -package_id [ec_id] WeightUnits ecommerce], unless the \"Shipping Price\" has been set for that product. A \"Shipping Price - Additional\" amount is added for each additional unit of the same product ordered). " } if { ([empty_string_p $add_exp_base_shipping_cost] || $add_exp_base_shipping_cost == 0) && ([empty_string_p $add_exp_amount_per_item] || $add_exp_amount_per_item == 0) && ([empty_string_p $add_exp_amount_by_weight] || $add_exp_amount_by_weight == 0) } { set express_part_of_shipping_summary "There are no additional charges for express shipping. " } else { if { ![empty_string_p $add_exp_base_shipping_cost] && $add_exp_base_shipping_cost != 0 } { - set express_part_of_shipping_summary "Express Shipping adds [ec_pretty_price $add_exp_base_shipping_cost $currency] to the Regular Shipping's base charge. " + set express_part_of_shipping_summary "Express Shipping adds [ec_pretty_pure_price $add_exp_base_shipping_cost $currency] to the Regular Shipping's base charge. " } if { ![empty_string_p $add_exp_amount_per_item] && $add_exp_amount_per_item != 0 } { - append express_part_of_shipping_summary "Express Shipping adds [ec_pretty_price $add_exp_amount_per_item $currency] for each item, in addition to the amount charged for Regular Shipping. " + append express_part_of_shipping_summary "Express Shipping adds [ec_pretty_pure_price $add_exp_amount_per_item $currency] for each item, in addition to the amount charged for Regular Shipping. " } if { ![empty_string_p $add_exp_amount_by_weight] && $add_exp_amount_by_weight != 0 } { - append express_part_of_shipping_summary "Express Shipping adds [ec_pretty_price $add_exp_amount_by_weight $currency] per [ad_parameter -package_id [ec_id] WeightUnits ecommerce] of each item ordered, in addition to the amount charged for Regular Shipping. " + append express_part_of_shipping_summary "Express Shipping adds [ec_pretty_pure_price $add_exp_amount_by_weight $currency] per [ad_parameter -package_id [ec_id] WeightUnits ecommerce] of each item ordered, in addition to the amount charged for Regular Shipping. " } } @@ -523,7 +523,7 @@ } set to_return "
- [ad_system_name] Member Reviews: + [ad_system_name] member reviews: " set comments_to_print "" @@ -1171,22 +1171,22 @@ set tax [lindex $price_shipping_gift_certificate_and_tax 3] set currency [ad_parameter -package_id [ec_id] Currency ecommerce] - set price_summary_line_1_list [list "Item(s) Subtotal:" [ec_pretty_price $price $currency]] - set price_summary_line_2_list [list "Shipping & Handling:" [ec_pretty_price $shipping $currency]] + set price_summary_line_1_list [list "Item(s) Subtotal:" [ec_pretty_pure_price $price $currency]] + set price_summary_line_2_list [list "Shipping & Handling:" [ec_pretty_pure_price $shipping $currency]] set price_summary_line_3_list [list "" "-------"] - set price_summary_line_4_list [list "Subtotal:" [ec_pretty_price [expr $price + $shipping] $currency]] + set price_summary_line_4_list [list "Subtotal:" [ec_pretty_pure_price [expr $price + $shipping] $currency]] if { $gift_certificate > 0 } { - set price_summary_line_5_list [list "Tax:" [ec_pretty_price $tax $currency]] + set price_summary_line_5_list [list "Tax:" [ec_pretty_pure_price $tax $currency]] set price_summary_line_6_list [list "" "-------"] - set price_summary_line_7_list [list "TOTAL:" [ec_pretty_price [expr $price + $shipping + $tax] $currency]] - set price_summary_line_8_list [list "Gift Certificate:" "-[ec_pretty_price $gift_certificate $currency]"] + set price_summary_line_7_list [list "TOTAL:" [ec_pretty_pure_price [expr $price + $shipping + $tax] $currency]] + set price_summary_line_8_list [list "Gift Certificate:" "-[ec_pretty_pure_price $gift_certificate $currency]"] set price_summary_line_9_list [list "" "-------"] - set price_summary_line_10_list [list "Balance due:" [ec_pretty_price [expr $price + $shipping + $tax - $gift_certificate] $currency]] + set price_summary_line_10_list [list "Balance due:" [ec_pretty_pure_price [expr $price + $shipping + $tax - $gift_certificate] $currency]] set n_lines 10 } else { - set price_summary_line_5_list [list "Tax:" [ec_pretty_price $tax $currency]] + set price_summary_line_5_list [list "Tax:" [ec_pretty_pure_price $tax $currency]] set price_summary_line_6_list [list "" "-------"] - set price_summary_line_7_list [list "TOTAL:" [ec_pretty_price [expr $price + $shipping + $tax] $currency]] + set price_summary_line_7_list [list "TOTAL:" [ec_pretty_pure_price [expr $price + $shipping + $tax] $currency]] set n_lines 7 } Index: openacs-4/packages/ecommerce/www/checkout-one-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/checkout-one-form.tcl 13 Jan 2005 13:57:58 -0000 1.2 +++ openacs-4/packages/ecommerce/www/checkout-one-form.tcl 9 Aug 2008 10:31:04 -0000 1.3 @@ -327,9 +327,9 @@ # 4. set total costs for each shipping option set total_shipping_price_default $total_reg_shipping_price - set total_reg_shipping_price [ec_pretty_price [expr $total_reg_shipping_price + $shipping_method_standard] $currency "t"] - set total_exp_shipping_price [ec_pretty_price [expr $total_exp_shipping_price + $shipping_method_express] $currency "t"] - set shipping_method_pickup [ec_pretty_price 0 $currency "t"] + set total_reg_shipping_price [ec_pretty_pure_price [expr $total_reg_shipping_price + $shipping_method_standard] $currency "t"] + set total_exp_shipping_price [ec_pretty_pure_price [expr $total_exp_shipping_price + $shipping_method_express] $currency "t"] + set shipping_method_pickup [ec_pretty_pure_price 0 $currency "t"] set shipping_method_no_shipping 0 # 5 prepare shipping options to present to user @@ -557,7 +557,7 @@ set show_creditcard_form_p "f" } elseif { $user_gift_certificate_balance > 0 } { set gift_certificate_covers_part_of_order 1 - set certificate_amount [ec_pretty_price $user_gift_certificate_balance] + set certificate_amount [ec_pretty_pure_price $user_gift_certificate_balance] } if { $show_creditcard_form_p == "t" } { Index: openacs-4/packages/ecommerce/www/shopping-cart.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/ecommerce/www/shopping-cart.tcl 1 Mar 2005 00:01:31 -0000 1.15 +++ openacs-4/packages/ecommerce/www/shopping-cart.tcl 9 Aug 2008 10:31:04 -0000 1.16 @@ -103,7 +103,7 @@ # Calculate line subtotal for end users - set line_subtotal [ec_pretty_price [expr $quantity * $lowest_price] $currency] + set line_subtotal [ec_pretty_pure_price [expr $quantity * $lowest_price] $currency] multirow set in_cart $i line_subtotal $line_subtotal # Add the price of the item to the total price @@ -115,12 +115,12 @@ # http://openacs.org/bugtracker/openacs/com/ecommerce/bug?bug%5fnumber=643 multirow set in_cart $i delete_export_vars $delete_export_vars - multirow set in_cart $i price "[lindex $lowest_price_and_price_name 1]:  [ec_pretty_price [lindex $lowest_price_and_price_name 0] $currency]" + multirow set in_cart $i price "[lindex $lowest_price_and_price_name 1]:  [ec_pretty_pure_price [lindex $lowest_price_and_price_name 0] $currency]" } # Add adjust quantities line if there are products in the cart. -set pretty_total_price [ec_pretty_price $total_price $currency] +set pretty_total_price [ec_pretty_pure_price $total_price $currency] # List the states that get charged tax. Although not 100% accurate # as shipping might be taxed too this is better than nothing. Index: openacs-4/packages/ecommerce/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/admin/index.tcl 30 Apr 2008 12:28:17 -0000 1.9 +++ openacs-4/packages/ecommerce/www/admin/index.tcl 9 Aug 2008 10:31:34 -0000 1.10 @@ -45,7 +45,7 @@ # recommend products -set pretty_avg_price [ec_pretty_price $avg_price] +set pretty_avg_price [ec_pretty_pure_price $avg_price] # links and info mainly related to website administration Index: openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl 9 Mar 2004 00:59:50 -0000 1.7 +++ openacs-4/packages/ecommerce/www/admin/orders/by-order-state-and-time.tcl 9 Aug 2008 10:33:13 -0000 1.8 @@ -151,7 +151,7 @@ [ec_nbsp_if_null [util_AnsiDatetoPrettyDate $confirmed_date]] $order_state [ec_decode $last_name "" " " "$last_name, $first_names"] - [ec_nbsp_if_null [ec_pretty_price $price_to_display]] + [ec_nbsp_if_null [ec_pretty_pure_price $price_to_display]] $n_items " incr row_counter Index: openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl 24 Feb 2005 13:33:14 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/orders/by-state-and-time.tcl 9 Aug 2008 10:33:13 -0000 1.3 @@ -152,7 +152,7 @@ [ec_nbsp_if_null [util_AnsiDatetoPrettyDate $in_basket_date]] $order_state [ec_decode $last_name "" " " "$last_name, $first_names"] - [ec_nbsp_if_null [ec_pretty_price $price_to_display]] + [ec_nbsp_if_null [ec_pretty_pure_price $price_to_display]] $n_items " incr row_counter Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl 1 Mar 2005 00:01:33 -0000 1.9 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-2.tcl 9 Aug 2008 10:33:13 -0000 1.10 @@ -128,7 +128,7 @@ } set options [join $option_list ", "] - append items_to_print "
  • $product_name; [ec_decode $options "" "" "$options; "]$price_name: [ec_pretty_price $price_charged]" + append items_to_print "
  • $product_name; [ec_decode $options "" "" "$options; "]$price_name: [ec_pretty_pure_price $price_charged]" } if { [info exists all_items_p] } { Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl 9 Mar 2004 00:59:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.tcl 9 Aug 2008 10:33:13 -0000 1.4 @@ -43,7 +43,7 @@ doc_body_append " - + " if { ![empty_string_p $issuer_user_id] } { doc_body_append " Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificates-issued.tcl 9 Aug 2008 10:33:13 -0000 1.6 @@ -137,7 +137,7 @@ - " + " incr row_counter } Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificates.tcl 9 Aug 2008 10:33:13 -0000 1.6 @@ -134,7 +134,7 @@ - " + " incr row_counter } Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 9 Mar 2004 00:59:50 -0000 1.9 +++ openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 9 Aug 2008 10:33:13 -0000 1.10 @@ -102,9 +102,9 @@ append items_to_print " - + + (out of [ec_pretty_pure_price $shipping_charged])" } @@ -131,7 +131,7 @@ append doc_body "

    Base shipping charge to refund: - (out of [ec_pretty_price $base_shipping])

    + (out of [ec_pretty_pure_price $base_shipping])

    Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl 9 Mar 2004 00:59:50 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl 9 Aug 2008 10:33:13 -0000 1.6 @@ -70,7 +70,7 @@ append exception_text "
  • Please enter a purely numeric price to refund for $product_name (no letters or special characters)." } elseif { $price_to_refund($item_id) > $price_charged } { incr exception_count - append exception_text "
  • Please enter a price to refund for $product_name that is less than or equal to [ec_pretty_price $price_charged]." + append exception_text "
  • Please enter a price to refund for $product_name that is less than or equal to [ec_pretty_pure_price $price_charged]." } else { set total_price_to_refund [expr $total_price_to_refund + $price_to_refund($item_id)] @@ -94,7 +94,7 @@ append exception_text "
  • Please enter a purely numeric shipping amount to refund for $product_name (no letters or special characters)." } elseif { $shipping_to_refund($item_id) > $shipping_charged } { incr exception_count - append exception_text "
  • Please enter a shipping amount to refund for $product_name that is less than or equal to [ec_pretty_price $shipping_charged]." + append exception_text "
  • Please enter a shipping amount to refund for $product_name that is less than or equal to [ec_pretty_pure_price $shipping_charged]." } else { set total_shipping_to_refund [expr $total_shipping_to_refund + $shipping_to_refund($item_id)] @@ -119,7 +119,7 @@ append exception_text "
  • Please enter a purely numeric base shipping amount to refund (no letters or special characters)." } elseif { $base_shipping_to_refund > $base_shipping } { incr exception_count - append exception_text "
  • Please enter a base shipping amount to refund that is less than or equal to [ec_pretty_price $base_shipping]." + append exception_text "
  • Please enter a base shipping amount to refund that is less than or equal to [ec_pretty_pure_price $base_shipping]." } else { set total_shipping_to_refund [expr $total_shipping_to_refund + $base_shipping_to_refund] set iteration_shipping_tax_to_refund [ec_min $base_shipping_tax [db_string get_base_shipping_it_refund " @@ -190,10 +190,10 @@ [export_entire_form] [export_form_vars cash_amount_to_refund certificate_amount_to_reinstate]
    -

    Total refund amount: [ec_pretty_price $total_amount_to_refund] (price: [ec_pretty_price $total_price_to_refund], shipping: [ec_pretty_price $total_shipping_to_refund], tax: [ec_pretty_price $total_tax_to_refund])

    +

    Total refund amount: [ec_pretty_pure_price $total_amount_to_refund] (price: [ec_pretty_pure_price $total_price_to_refund], shipping: [ec_pretty_pure_price $total_shipping_to_refund], tax: [ec_pretty_pure_price $total_tax_to_refund])

      -
    • [ec_pretty_price $certificate_amount_to_reinstate] will be reinstated in gift certificates.
      -
    • [ec_pretty_price $cash_amount_to_refund] will be refunded to the customer's credit card.
      +
    • [ec_pretty_pure_price $certificate_amount_to_reinstate] will be reinstated in gift certificates.
      +
    • [ec_pretty_pure_price $cash_amount_to_refund] will be refunded to the customer's credit card.
    " # Request the credit card number to be re-entered if it is no longer Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl 9 Mar 2004 00:59:50 -0000 1.6 +++ openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl 9 Aug 2008 10:33:13 -0000 1.7 @@ -454,21 +454,21 @@ set refund_status $response(response_code) set pgw_transaction_id $response(transaction_id) if { $refund_status == "failure" || $refund_status == "invalid_input" } { - set errorstring "Refund transaction $transaction_id for [ec_pretty_price $transaction_amount] of refund $refund_id at [ad_conn url], resulted in: $refund_status" + set errorstring "Refund transaction $transaction_id for [ec_pretty_pure_price $transaction_amount] of refund $refund_id at [ad_conn url], resulted in: $refund_status" db_dml insert_cc_refund_problem " insert into ec_problems_log (problem_id, problem_date, problem_details, order_id) values (ec_problem_id_sequence.nextval, sysdate, :errorstring, :order_id)" - append results_explanation "

    Refund transaction $transaction_id for [ec_pretty_price $transaction_amount] did not occur. + append results_explanation "

    Refund transaction $transaction_id for [ec_pretty_pure_price $transaction_amount] did not occur. We have made a record of this in the problems log so that the situation can be corrected manually.

    " } elseif { $refund_status == "inconclusive" } { # Set the to_be_captured_date so that the scheduled # procedure ec_unrefunded_transactions will retry the # transaction. - append results_explanation "

    The results of refund transaction $transaction_id for [ec_pretty_price $transaction_amount] were inconclusive + append results_explanation "

    The results of refund transaction $transaction_id for [ec_pretty_pure_price $transaction_amount] were inconclusive (perhaps due to a communications failure between us and the payment gateway). A program will keep trying to complete this refund transaction and the problems log will be updated if it the refund transaction cannot be completed.

    " } else { @@ -479,15 +479,15 @@ update ec_financial_transactions set refunded_date=sysdate where transaction_id=:pgw_transaction_id" - append results_explanation "

    Refund transaction $pgw_transaction_id for [ec_pretty_price $transaction_amount] is complete!

    ";# + append results_explanation "

    Refund transaction $pgw_transaction_id for [ec_pretty_pure_price $transaction_amount] is complete!

    ";# } } else { # It is too early to perform the refund now. First the # original transaction needs to be settled by the payment # gateway. - append results_explanation "

    Refund transaction $transaction_id for [ec_pretty_price $transaction_amount] is scheduled for a later time. + append results_explanation "

    Refund transaction $transaction_id for [ec_pretty_pure_price $transaction_amount] is scheduled for a later time. Refunds can not be processed before the transaction charging the credit card has been completed by the gateway. Transactions are completed with 24 hours after marking. Therefore the refund transaction has been scheduled for $to_be_captured_date

    " Index: openacs-4/packages/ecommerce/www/admin/orders/items-void.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-void.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/orders/items-void.tcl 9 Mar 2004 00:59:50 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/orders/items-void.tcl 9 Aug 2008 10:33:13 -0000 1.5 @@ -90,7 +90,7 @@ and i.product_id = :product_id" { doc_body_append " -

    Please confirm that you want to void $product_name; $price_name: [ec_pretty_price $price_charged] $item_state

    " +

    Please confirm that you want to void $product_name; $price_name: [ec_pretty_pure_price $price_charged] $item_state

    " } } else { @@ -136,7 +136,7 @@ } doc_body_append " -
    • + " } doc_body_append "
    Gift Certificate ID    $gift_certificate_id
    Amount Left[ec_pretty_price $amount_left] (out of [ec_pretty_price $amount])
    Amount Left[ec_pretty_pure_price $amount_left] (out of [ec_pretty_pure_price $amount])
    Issued By$issuer on [util_AnsiDatetoPrettyDate $issue_date]
    [ec_nbsp_if_null [util_AnsiDatetoPrettyDate $issue_date]] [ec_decode $last_name "" " " "$last_name, $first_names"] [ec_decode $last_name "" " " "$issued_to_last_name, $issued_to_first_names"][ec_pretty_price $amount][ec_pretty_pure_price $amount]$gift_certificate_state [ec_decode $last_name "" " " "$last_name, $first_names"] $recipient_email[ec_pretty_price $amount][ec_pretty_pure_price $amount]
    $product_name (out of [ec_pretty_price $price_charged]) (out of [ec_pretty_pure_price $price_charged]) - (out of [ec_pretty_price $shipping_charged])
    $product_name; $price_name: [ec_pretty_price $price_charged]$item_state$product_name; $price_name: [ec_pretty_pure_price $price_charged]$item_state
    " Index: openacs-4/packages/ecommerce/www/admin/orders/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/one.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/orders/one.tcl 9 Mar 2004 00:59:50 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/orders/one.tcl 9 Aug 2008 10:33:13 -0000 1.5 @@ -142,7 +142,7 @@ set item_quantity [expr $item_quantity + $quantity] set item_description " $product_name; - [ec_decode $options "" "" "$options; "]$price_name: [ec_pretty_price $price_charged]" + [ec_decode $options "" "" "$options; "]$price_name: [ec_pretty_pure_price $price_charged]" set old_product_color_size_style_price_price_name [list $product_id $color_choice $size_choice $style_choice $price_charged $price_name] } @@ -226,7 +226,7 @@ Base shipping charged - [ec_pretty_price $shipping_charged] [ec_decode $shipping_method "pickup" "(Pickup)" "no shipping" "(No Shipping)" ""] + [ec_pretty_pure_price $shipping_charged] [ec_decode $shipping_method "pickup" "(Pickup)" "no shipping" "(No Shipping)" ""] @@ -265,7 +265,7 @@ $transaction_id [ec_nbsp_if_null [ec_formatted_full_date $inserted_date]] $creditcard_last_four - [ec_pretty_price $transaction_amount] + [ec_pretty_pure_price $transaction_amount] [ec_decode $transaction_type "charge" "authorization to charge" "intent to refund"] [ec_nbsp_if_null [ec_decode $transaction_type "refund" "Yes" [ec_decode $to_be_captured_p "t" "Yes" "f" "No" ""]]] [ec_nbsp_if_null [ec_formatted_full_date $authorized_date]] @@ -356,7 +356,7 @@ doc_body_append " Refund ID: $refund_id
    Date: [ec_formatted_full_date $refund_date]
    - Amount: [ec_pretty_price $refund_amount]
    + Amount: [ec_pretty_pure_price $refund_amount]
    Refunded by: $first_names $last_name
    Reason: $refund_reasons