svn commit: r830882 - in /ofbiz/branches/release09.04: ./ applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java

Author: jleroux
Date: Thu Oct 29 10:22:17 2009
New Revision: 830882

URL: http://svn.apache.org/viewvc?rev=830882&view=rev
Log:
"Applied fix from trunk for revision: 830880"
------------------------------------------------------------------------
r830880 | jleroux | 2009-10-29 11:20:16 +0100 (jeu. 29 oct. 2009) | 1 ligne

Forgot this in r830874
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
    ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
    ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 29 10:22:17 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
+/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

Modified: ofbiz/branches/release09.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=830882&r1=830881&r2=830882&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original)
+++ ofbiz/branches/release09.04/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Thu Oct 29 10:22:17 2009
@@ -643,6 +643,10 @@
         public String getDescription() {
             return (configOption.getString("description") != null? configOption.getString("description"): "no description");
         }
+        
+        public String getDescription(Locale locale) {
+            return (configOption.getString("description") != null? (String) configOption.get("description", locale): "no description");
+        }        
 
         public String getId() {
             return configOption.getString("configOptionId");

Modified: ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=830882&r1=830881&r2=830882&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Thu Oct 29 10:22:17 2009
@@ -121,7 +121,8 @@
         this.productStoreId = (String) session.getAttribute("productStoreId");
         this.facilityId = (String) session.getAttribute("facilityId");
         this.currency = (String) session.getAttribute("currency");
-        this.locale = (Locale) session.getAttribute("locale");
+//        this.locale = (Locale) session.getAttribute("locale"); This is legacy code and may come (demo) from ProductStore.defaultLocaleString defined in demoRetail and is incompatible with how localisation is handled in the POS
+        this.locale = Locale.getDefault();
 
         this.cart = new ShoppingCart(session.getDelegator(), productStoreId, locale, currency);
         this.ch = new CheckOutHelper(session.getDispatcher(), session.getDelegator(), cart);
@@ -234,9 +235,9 @@
         return cart.size();
     }
 
-    public Map getItemInfo(int index) {
+    public Map<String, Object> getItemInfo(int index) {
         ShoppingCartItem item = cart.findCartItem(index);
-        Map itemInfo = FastMap.newInstance();
+        Map<String, Object> itemInfo = FastMap.newInstance();
         itemInfo.put("productId", item.getProductId());
         itemInfo.put("description", item.getDescription());
         itemInfo.put("quantity", UtilFormatOut.formatQuantity(item.getQuantity()));
@@ -261,7 +262,7 @@
         return itemInfo;
     }
 
-    public List getItemConfigInfo(int index) {
+    public List<Map<String, Object>> getItemConfigInfo(int index) {
         List<Map> list = new ArrayList<Map>();
         // I think I need to initialize the list in a special way
         // to use foreach in receipt.java
@@ -270,15 +271,13 @@
         if (this.isAggregatedItem(item.getProductId())) {
             ProductConfigWrapper pcw = null;
             pcw = item.getConfigWrapper();
-            List selected = pcw.getSelectedOptions();
-            Iterator iter = selected.iterator();
-            while (iter.hasNext()) {
-                ConfigOption configoption = (ConfigOption)iter.next();
-                Map itemInfo = FastMap.newInstance();
+            List<ConfigOption> selected = pcw.getSelectedOptions();
+            for(ConfigOption configoption : selected) {
+                Map<String, Object> itemInfo = FastMap.newInstance();
                 if (configoption.isSelected() && !configoption.isDefault()) {
                     itemInfo.put("productId", "");
                     itemInfo.put("sku", "");
-                    itemInfo.put("configDescription", configoption.getDescription());
+                    itemInfo.put("configDescription", configoption.getDescription(locale));
                     itemInfo.put("configQuantity", UtilFormatOut.formatQuantity(item.getQuantity()));
                     itemInfo.put("configBasePrice", UtilFormatOut.formatPrice(configoption.getOffsetPrice()));
                     //itemInfo.put("isTaxable", item.taxApplies() ? "T" : " ");
@@ -289,12 +288,12 @@
         return list;
     }
 
-    public Map getPaymentInfo(int index) {
+    public Map<String, Object> getPaymentInfo(int index) {
         ShoppingCart.CartPaymentInfo inf = cart.getPaymentInfo(index);
         GenericValue infValue = inf.getValueObject(session.getDelegator());
         GenericValue paymentPref = null;
         try {
-            Map fields = FastMap.newInstance();
+            Map<String, Object> fields = FastMap.newInstance();
             fields.put("paymentMethodTypeId", inf.paymentMethodTypeId);
             if (inf.paymentMethodId != null) {
                 fields.put("paymentMethodId", inf.paymentMethodId);
@@ -302,7 +301,7 @@
             fields.put("maxAmount", inf.amount);
             fields.put("orderId", this.getOrderId());
 
-            List paymentPrefs = session.getDelegator().findByAnd("OrderPaymentPreference", fields);
+            List<GenericValue> paymentPrefs = session.getDelegator().findByAnd("OrderPaymentPreference", fields);
             if (UtilValidate.isNotEmpty(paymentPrefs)) {
                 //Debug.log("Found some prefs - " + paymentPrefs.size(), module);
                 if (paymentPrefs.size() > 1) {
@@ -319,7 +318,7 @@
         }
         //Debug.log("PaymentPref - " + paymentPref, module);
 
-        Map payInfo = FastMap.newInstance();
+        Map<String, Object> payInfo = FastMap.newInstance();
 
         // locate the auth info
         GenericValue authTrans = null;
@@ -340,8 +339,8 @@
         //Debug.log("AuthTrans - " + authTrans, module);
 
         if ("PaymentMethodType".equals(infValue.getEntityName())) {
-            payInfo.put("description", infValue.getString("description"));
-            payInfo.put("payInfo", infValue.getString("description"));
+            payInfo.put("description", (String) infValue.get("description", locale));
+            payInfo.put("payInfo", (String) infValue.get("description", locale));
             payInfo.put("amount", UtilFormatOut.formatPrice(inf.amount));
         } else {
             String paymentMethodTypeId = infValue.getString("paymentMethodTypeId");
@@ -352,7 +351,7 @@
                 Debug.logError(e, module);
             }
             if (pmt != null) {
-                payInfo.put("description", pmt.getString("description"));
+                payInfo.put("description", (String) pmt.get("description", locale));
                 payInfo.put("amount", UtilFormatOut.formatPrice(inf.amount));
             }
 
@@ -377,9 +376,10 @@
                 payInfo.put("cardNumber", cardStr);  // masked cardNumber
 
             } else if ("GIFT_CARD".equals(paymentMethodTypeId)) {
-                GenericValue gc = null;
+                 @SuppressWarnings("unused")
+                GenericValue gc = null;
                 try {
-                    gc = infValue.getRelatedOne("GiftCard");
+                    gc = infValue.getRelatedOne("GiftCard"); //FIXME is this really useful ? (Maybe later...)
                 } catch (GenericEntityException e) {
                     Debug.logError(e, module);
                 }
@@ -673,8 +673,8 @@
     }
 
     public int checkPaymentMethodType(String paymentMethodTypeId) {
-        Map fields = UtilMisc.toMap("paymentMethodTypeId", paymentMethodTypeId, "productStoreId", productStoreId);
-        List values = null;
+        Map<String, String> fields = UtilMisc.toMap("paymentMethodTypeId", paymentMethodTypeId, "productStoreId", productStoreId);
+        List<GenericValue> values = null;
         try {
             values = session.getDelegator().findByAndCache("ProductStorePaymentSetting", fields);
         } catch (GenericEntityException e) {
@@ -686,7 +686,7 @@
             return NO_PAYMENT;
         } else {
             boolean isExternal = true;
-            Iterator i = values.iterator();
+            Iterator<GenericValue> i = values.iterator();
             while (i.hasNext() && isExternal) {
                 GenericValue v = (GenericValue) i.next();
                 //Debug.log("Testing [" + paymentMethodTypeId + "] - " + v, module);

Modified: ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=830882&r1=830881&r2=830882&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original)
+++ ofbiz/branches/release09.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Thu Oct 29 10:22:17 2009
@@ -395,7 +395,7 @@
             }
 
             if (trans.isAggregatedItem(((String)expandMap.get("productId")).trim())) {
-                List<Map> maps = trans.getItemConfigInfo(i);
+                List<Map<String, Object>> maps = trans.getItemConfigInfo(i);
                 for (Map map: maps) {
                     expandMap = this.makeCodeExpandMap(trans, type);
                     expandMap.putAll(map);