svn commit: r884033 - in /ofbiz/branches/release09.04: ./ applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java framework/base/src/org/ofbiz/base/util/UtilFormatOut.java framework/common/config/general.properties

Author: jleroux
Date: Wed Nov 25 10:57:00 2009
New Revision: 884033

URL: http://svn.apache.org/viewvc?rev=884033&view=rev
Log:
"Applied fix from trunk for revision: 884023  "
------------------------------------------------------------------------
r884023 | jleroux | 2009-11-25 11:43:09 +0100 (mer. 25 nov. 2009) | 6 lignes

Partially fix an issue I discussed with Akash on dev ML on how to format decimals in prices
* Mostly parameterize UtilFormatOut.formatPrice() from general.properties
* I removed unused currency.decimal.format calls in CheckOutEvents class
* Also removed unused priceNumberFormat in UtilFormatOut class

Still have to fix 11 harcoded  "##0.00" in ftl files using ofbizCurrency
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
    ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
    ofbiz/branches/release09.04/framework/common/config/general.properties

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 25 10:57:00 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023

Modified: ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=884033&r1=884032&r2=884033&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original)
+++ ofbiz/branches/release09.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Wed Nov 25 10:57:00 2009
@@ -285,8 +285,6 @@
     public static Map getSelectedPaymentMethods(HttpServletRequest request) {
         ShoppingCart cart = (ShoppingCart) request.getSession().getAttribute("shoppingCart");
         //Locale locale = UtilHttp.getLocale(request);
-        String currencyFormat = UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", "##0.00");
-        DecimalFormat formatter = new DecimalFormat(currencyFormat);
         Map selectedPaymentMethods = new HashMap();
         String[] paymentMethods = request.getParameterValues("checkOutPaymentId");
         String errMsg = null;
@@ -1042,8 +1040,6 @@
         if (UtilValidate.isNotEmpty(billingAccountId)) {
             // parse the amount to a decimal
             if (UtilValidate.isNotEmpty(billingAccountAmount)) {
-                String currencyFormat = UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", "##0.00");
-                DecimalFormat formatter = new DecimalFormat(currencyFormat);
                 try {
                     billingAccountAmt = new BigDecimal(billingAccountAmount);
                 } catch (NumberFormatException e) {

Modified: ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java?rev=884033&r1=884032&r2=884033&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java (original)
+++ ofbiz/branches/release09.04/framework/base/src/org/ofbiz/base/util/UtilFormatOut.java Wed Nov 25 10:57:00 2009
@@ -39,9 +39,8 @@
         }
     }
 
-    // ------------------- price format handlers -------------------
-    static DecimalFormat priceDecimalFormat = new DecimalFormat("#,##0.00");
-    static DecimalFormat priceNumberFormat = new DecimalFormat("##0.00");
+    // ------------------- price format handlers -------------------    
+    static DecimalFormat priceDecimalFormat = new DecimalFormat(UtilProperties.getPropertyValue("general.properties", "currency.decimal.format", "#,##0.00"));
 
     /** Formats a Double representing a price into a string
      * @param price The price Double to be formatted

Modified: ofbiz/branches/release09.04/framework/common/config/general.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/general.properties?rev=884033&r1=884032&r2=884033&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/common/config/general.properties (original)
+++ ofbiz/branches/release09.04/framework/common/config/general.properties Wed Nov 25 10:57:00 2009
@@ -29,8 +29,8 @@
 # ID of the VisualTheme to use if there VISUAL_THEME UserPreference record for the current user
 defaultVisualThemeId=BLUELIGHT
 
-# -- the default decimal format for currency
-currency.decimal.format=##0.00
+# -- the default decimal format for currency (used in UtilFormatOut.java)
+currency.decimal.format=#,##0.00
 
 # -- Properties fallback locale. Change this setting with caution. If you
 #    start getting "resource not found" exceptions, then there are