svn commit: r1057580 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

Author: jleroux
Date: Tue Jan 11 11:10:46 2011
New Revision: 1057580

URL: http://svn.apache.org/viewvc?rev=1057580&view=rev
Log:
Revert r1057571 on David's advice in dev ML

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1057580&r1=1057579&r2=1057580&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Tue Jan 11 11:10:46 2011
@@ -110,8 +110,6 @@ public class ShoppingCartItem implements
     private BigDecimal displayPrice = null;
     private BigDecimal recurringBasePrice = null;
     private BigDecimal recurringDisplayPrice = null;
-    private BigDecimal taxTotal = null;
-    private BigDecimal taxPercentage = null;
     /** comes from price calc, used for special promo price promotion action */
     private BigDecimal specialPromoPrice = null;
     /** for reservations: extra % 2nd person */
@@ -1208,14 +1206,6 @@ public class ShoppingCartItem implements
                         if (priceResult.get("specialPromoPrice") != null) {
                             this.setSpecialPromoPrice(((BigDecimal) priceResult.get("specialPromoPrice")).divide(pieces, decimals, RoundingMode.HALF_UP));
                         }
-
-                        if (priceResult.get("taxTotal") != null) {
-                            this.taxTotal = ((BigDecimal) priceResult.get("taxTotal")).divide(pieces, decimals, RoundingMode.HALF_UP);
-                        }
-
-                        if (priceResult.get("taxPercentage") != null) {
-                            this.taxPercentage = ((BigDecimal) priceResult.get("taxPercentage")).divide(pieces, decimals, RoundingMode.HALF_UP);
-                        }
                     }else{
                         if (priceResult.get("listPrice") != null) {
                             this.listPrice = ((BigDecimal) priceResult.get("listPrice"));
@@ -1229,9 +1219,6 @@ public class ShoppingCartItem implements
                             this.setDisplayPrice(((BigDecimal) priceResult.get("price")));
                         }
                         
-                        taxTotal = (BigDecimal) priceResult.get("taxTotal");
-                        taxPercentage = (BigDecimal) priceResult.get("taxPercentage");
-
                         this.setSpecialPromoPrice((BigDecimal) priceResult.get("specialPromoPrice"));
                     }
                     
@@ -1924,6 +1911,7 @@ public class ShoppingCartItem implements
         }
     }
 
+
     public Map getItemProductInfo() {
         Map itemInfo = FastMap.newInstance();
         itemInfo.put("productId", this.getProductId());
@@ -2010,16 +1998,6 @@ public class ShoppingCartItem implements
         this.isModifiedPrice = isModifiedPrice;
     }
 
-    /** Get the total taxes */
-    public BigDecimal getTaxTotal() {
-        return taxTotal;
-    }
-
-    /** Get the percentage tax rate */
-    public BigDecimal getTaxPercentage() {
-        return taxPercentage;
-    }
-
     /** get the percentage for the second person */
     public BigDecimal getReserv2ndPPPerc() {
         return reserv2ndPPPerc;