You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2007/09/16 02:40:20 UTC
svn commit: r576010 - 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
Author: lektran
Date: Sat Sep 15 17:40:18 2007
New Revision: 576010
URL: http://svn.apache.org/viewvc?rev=576010&view=rev
Log:
Removed deprecated getShippableWeight() and renamed getShippableWeightBd()
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=576010&r1=576009&r2=576010&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:40:18 2007
@@ -974,7 +974,7 @@
return shippableQuantity.setScale(scale, rounding);
}
- public BigDecimal getShippableWeightBd(String shipGroupSeqId) {
+ public BigDecimal getShippableWeight(String shipGroupSeqId) {
BigDecimal shippableWeight = ZERO;
List validItems = getValidOrderItems(shipGroupSeqId);
if (validItems != null) {
@@ -986,11 +986,6 @@
}
return shippableWeight.setScale(scale, rounding);
- }
-
- /** @deprecated Use getShippableWeightBd() instead */
- public double getShippableWeight(String shipGroupSeqId) {
- return getShippableWeightBd(shipGroupSeqId).doubleValue();
}
public BigDecimal getItemWeightBd(GenericValue item) {
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=576010&r1=576009&r2=576010&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:40:18 2007
@@ -110,7 +110,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(),
+ contactMechId, orh.getProductStoreId(), orh.getShippableItemInfo(shipGroupSeqId), orh.getShippableWeight(shipGroupSeqId).doubleValue(),
orh.getShippableQuantity(shipGroupSeqId).doubleValue(), orh.getShippableTotal(shipGroupSeqId).doubleValue());
}
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=576010&r1=576009&r2=576010&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:40:18 2007
@@ -134,7 +134,7 @@
shippableItemInfo = orh.getOrderItemAndShipGroupAssoc(shipGroupSeqId);
shippableItems = delegator.findByAnd("OrderItemAndShipGrpInvResAndItemSum", UtilMisc.toMap("orderId", orderId, "shipGroupSeqId", shipGroupSeqId));
shippableTotal = new Double(orh.getShippableTotal(shipGroupSeqId).doubleValue());
- shippableWeight = new Double(orh.getShippableWeightBd(shipGroupSeqId).doubleValue());
+ shippableWeight = new Double(orh.getShippableWeight(shipGroupSeqId).doubleValue());
shippableQuantity = new Double(orh.getShippableQuantity(shipGroupSeqId).doubleValue());
shipmentCostEstimate = packSession.getShipmentCostEstimate(orderItemShipGroup, productStoreId, shippableItemInfo, shippableTotal, shippableWeight, shippableQuantity);
context.put("shipmentCostEstimateForShipGroup", shipmentCostEstimate);