svn commit: r576009 - in /ofbiz/trunk/applications: order/src/org/ofbiz/order/order/OrderReadHelper.java order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh

[lektran]

Author: lektran
Date: Sat Sep 15 17:33:05 2007
New Revision: 576009

URL: http://svn.apache.org/viewvc?rev=576009&view=rev
Log:
Removed deprecated getShippableQuantity() and renamed getShippableQuantityBd()

Modified:
    
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
    
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
    
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh

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=576009&r1=576008&r2=576009&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 
Sat Sep 15 17:33:05 2007
@@ -937,20 +937,20 @@
         return shippableTotal.setScale(scale, rounding);
     }
 
-    public BigDecimal getShippableQuantityBd() {
+    public BigDecimal getShippableQuantity() {
         BigDecimal shippableQuantity = ZERO;
         List shipGroups = getOrderItemShipGroups();
         if (UtilValidate.isNotEmpty(shipGroups)) {
             Iterator shipGroupsIt = shipGroups.iterator();
             while (shipGroupsIt.hasNext()) {
                 GenericValue shipGroup = (GenericValue)shipGroupsIt.next();
-                shippableQuantity = 
shippableQuantity.add(getShippableQuantityBd(shipGroup.getString("shipGroupSeqId")));
+                shippableQuantity = 
shippableQuantity.add(getShippableQuantity(shipGroup.getString("shipGroupSeqId")));
             }
         }
         return shippableQuantity.setScale(scale, rounding);
     }
 
-    public BigDecimal getShippableQuantityBd(String shipGroupSeqId) {
+    public BigDecimal getShippableQuantity(String shipGroupSeqId) {
         BigDecimal shippableQuantity = ZERO;
         List validItems = getValidOrderItems(shipGroupSeqId);
         if (validItems != null) {
@@ -972,11 +972,6 @@
             }
         }
         return shippableQuantity.setScale(scale, rounding);
-    }
-
-    /** @deprecated Use getShippableQuantityBd() instead */
-    public double getShippableQuantity(String shipGroupSeqId) {
-        return getShippableQuantityBd(shipGroupSeqId).doubleValue();
     }
 
     public BigDecimal getShippableWeightBd(String shipGroupSeqId) {

Modified: 
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=576009&r1=576008&r2=576009&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
 (original)
+++ 
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
 Sat Sep 15 17:33:05 2007
@@ -111,7 +111,7 @@
         String contactMechId = shipAddr.getString("contactMechId");
         return getShipGroupEstimate(dispatcher, delegator, 
orh.getOrderTypeId(), shipmentMethodTypeId, carrierPartyId, carrierRoleTypeId,
                 contactMechId, orh.getProductStoreId(), 
orh.getShippableItemInfo(shipGroupSeqId), 
orh.getShippableWeightBd(shipGroupSeqId).doubleValue(),
-                orh.getShippableQuantityBd(shipGroupSeqId).doubleValue(), 
orh.getShippableTotal(shipGroupSeqId).doubleValue());
+                orh.getShippableQuantity(shipGroupSeqId).doubleValue(), 
orh.getShippableTotal(shipGroupSeqId).doubleValue());
     }
 
     public static Map getShipGroupEstimate(LocalDispatcher dispatcher, 
GenericDelegator delegator, String orderTypeId,

Modified: 
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh?rev=576009&r1=576008&r2=576009&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh
 (original)
+++ 
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.bsh
 Sat Sep 15 17:33:05 2007
@@ -135,7 +135,7 @@
                 shippableItems = 
delegator.findByAnd("OrderItemAndShipGrpInvResAndItemSum", 
UtilMisc.toMap("orderId", orderId, "shipGroupSeqId", shipGroupSeqId));
                 shippableTotal = new 
Double(orh.getShippableTotal(shipGroupSeqId).doubleValue());
                 shippableWeight = new 
Double(orh.getShippableWeightBd(shipGroupSeqId).doubleValue());
-                shippableQuantity = new 
Double(orh.getShippableQuantityBd(shipGroupSeqId).doubleValue());
+                shippableQuantity = new 
Double(orh.getShippableQuantity(shipGroupSeqId).doubleValue());
                 shipmentCostEstimate = 
packSession.getShipmentCostEstimate(orderItemShipGroup, productStoreId, 
shippableItemInfo, shippableTotal, shippableWeight, shippableQuantity);
                 context.put("shipmentCostEstimateForShipGroup", 
shipmentCostEstimate);
                 context.put("productStoreId", productStoreId);