Author: jacopoc
Date: Sun Jun 24 07:15:28 2007
New Revision: 550232
URL:
http://svn.apache.org/viewvc?view=rev&rev=550232Log:
Fix from some funny bugs.
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?view=diff&rev=550232&r1=550231&r2=550232==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sun Jun 24 07:15:28 2007
@@ -1688,12 +1688,12 @@
Double depth = product.getDouble("shippingDepth");
// if all are null, see if there is an associated virtual product and get the info of that product
- if (height == null & width == null && depth == null) {
+ if (height == null && width == null && depth == null) {
GenericValue parentProduct = this.getParentProduct();
if (parentProduct != null) {
height = parentProduct.getDouble("shippingHeight");
- width = product.getDouble("shippingWidth");
- depth = product.getDouble("shippingDepth");
+ width = parentProduct.getDouble("shippingWidth");
+ depth = parentProduct.getDouble("shippingDepth");
}
}