You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bi...@apache.org on 2008/05/09 01:53:52 UTC
svn commit: r654657 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Author: bibryam
Date: Thu May 8 16:53:52 2008
New Revision: 654657
URL: http://svn.apache.org/viewvc?rev=654657&view=rev
Log:
Fix for OFBIZ-1684 reported by Scott Gray - "Split Pay Pref Per Shp Grp incorrectly calculates max amounts for Payment Preferences".
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=654657&r1=654656&r2=654657&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Thu May 8 16:53:52 2008
@@ -4575,7 +4575,7 @@
Iterator shipIter = cart.getShipGroups().iterator();
while (shipIter.hasNext()) {
CartShipInfo csi = (CartShipInfo) shipIter.next();
- maxAmount = new BigDecimal(csi.getTotal()).add(new BigDecimal(cart.getOrderOtherAdjustmentTotal() / cart.getShipGroupSize())).add(new BigDecimal(csi.getShipEstimate()));
+ maxAmount = new BigDecimal(csi.getTotal()).add(new BigDecimal(cart.getOrderOtherAdjustmentTotal() / cart.getShipGroupSize())).add(new BigDecimal(csi.getShipEstimate()).add(new BigDecimal(csi.getTotalTax(cart))));
maxAmount = maxAmount.setScale(scale, rounding);
// create the OrderPaymentPreference record