Author: eckardjf
Date: Thu Apr 15 14:46:52 2010
New Revision: 934431
URL:
http://svn.apache.org/viewvc?rev=934431&view=revLog:
rename productSupplier to supplierProduct for clarity
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=934431&r1=934430&r2=934431&view=diff==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Thu Apr 15 14:46:52 2010
@@ -755,9 +755,9 @@ public class ShoppingCartHelper {
oldPrice = item.getBasePrice();
- GenericValue productSupplier = this.cart.getSupplierProduct(item.getProductId(), quantity, this.dispatcher);
+ GenericValue supplierProduct = this.cart.getSupplierProduct(item.getProductId(), quantity, this.dispatcher);
- if (productSupplier == null) {
+ if (supplierProduct == null) {
if ("_NA_".equals(cart.getPartyId())) {
// no supplier does not require the supplier product
item.setQuantity(quantity, dispatcher, this.cart);
@@ -770,8 +770,8 @@ public class ShoppingCartHelper {
}
} else {
item.setQuantity(quantity, dispatcher, this.cart);
- item.setBasePrice(productSupplier.getBigDecimal("lastPrice"));
- item.setName(ShoppingCartItem.getPurchaseOrderItemDescription(item.getProduct(), productSupplier, cart.getLocale()));
+ item.setBasePrice(supplierProduct.getBigDecimal("lastPrice"));
+ item.setName(ShoppingCartItem.getPurchaseOrderItemDescription(item.getProduct(), supplierProduct, cart.getLocale()));
}
}
} else {