svn commit: r981600 - in /ofbiz/trunk/applications/order/src/org/ofbiz/order: order/OrderReadHelper.java shoppingcart/ShoppingCartServices.java

[doogie-3]

Author: doogie
Date: Mon Aug  2 17:00:26 2010
New Revision: 981600

URL: http://svn.apache.org/viewvc?rev=981600&view=rev
Log:
In loadCartFromOrder, add support for restoring the per-ship-group sales
tax adjustments.

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

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=981600&r1=981599&r2=981600&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Mon Aug  2 17:00:26 2010
@@ -1333,6 +1333,10 @@ public class OrderReadHelper {
         return getOrderHeaderAdjustments(getAdjustments(), shipGroupSeqId);
     }
 
+    public List<GenericValue> getOrderHeaderAdjustmentsTax(String shipGroupSeqId) {
+        return filterOrderAdjustments(getOrderHeaderAdjustments(getAdjustments(), shipGroupSeqId), false, true, false, false, false);
+    }
+
     public List<GenericValue> getOrderHeaderAdjustmentsToShow() {
         return filterOrderAdjustments(getOrderHeaderAdjustments(), true, false, false, false, false);
     }

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=981600&r1=981599&r2=981600&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Mon Aug  2 17:00:26 2010
@@ -332,6 +332,7 @@ public class ShoppingCartServices {
             cartShipInfo.setFacilityId(orderItemShipGroup.getString("facilityId"));
             cartShipInfo.setVendorPartyId(orderItemShipGroup.getString("vendorPartyId"));
             cartShipInfo.setShipGroupSeqId(orderItemShipGroup.getString("shipGroupSeqId"));
+            cartShipInfo.shipTaxAdj.addAll(orh.getOrderHeaderAdjustmentsTax(orderItemShipGroup.getString("shipGroupSeqId")));
         }
 
         List<GenericValue> orderItems = orh.getValidOrderItems();