You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/12/01 09:21:14 UTC
svn commit: r1040887 -
/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
Author: jleroux
Date: Wed Dec 1 08:21:13 2010
New Revision: 1040887
URL: http://svn.apache.org/viewvc?rev=1040887&view=rev
Log:
Fix wrong indentation on Adam's remark on dev ML.
No functional changes
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1040887&r1=1040886&r2=1040887&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Wed Dec 1 08:21:13 2010
@@ -1806,10 +1806,10 @@ public class ProductPromoWorker {
amount = amount.setScale(3, rounding);
GenericValue orderAdjustment = delegator.makeValue("OrderAdjustment",
UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT", amountField, amount,
- "productPromoId", productPromoAction.get("productPromoId"),
- "productPromoRuleId", productPromoAction.get("productPromoRuleId"),
- "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"),
- "description", getProductPromoDescription((String) productPromoAction.get("productPromoId"), delegator)));
+ "productPromoId", productPromoAction.get("productPromoId"),
+ "productPromoRuleId", productPromoAction.get("productPromoRuleId"),
+ "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"),
+ "description", getProductPromoDescription((String) productPromoAction.get("productPromoId"), delegator)));
// if an orderAdjustmentTypeId was included, override the default
if (UtilValidate.isNotEmpty(productPromoAction.getString("orderAdjustmentTypeId"))) {
@@ -1824,10 +1824,10 @@ public class ProductPromoWorker {
amount = amount.setScale(decimals, rounding);
GenericValue orderAdjustment = delegator.makeValue("OrderAdjustment",
UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT", amountField, amount,
- "productPromoId", productPromoAction.get("productPromoId"),
- "productPromoRuleId", productPromoAction.get("productPromoRuleId"),
- "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"),
- "description", getProductPromoDescription((String) productPromoAction.get("productPromoId"), delegator)));
+ "productPromoId", productPromoAction.get("productPromoId"),
+ "productPromoRuleId", productPromoAction.get("productPromoRuleId"),
+ "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId"),
+ "description", getProductPromoDescription((String) productPromoAction.get("productPromoId"), delegator)));
// if an orderAdjustmentTypeId was included, override the default
if (UtilValidate.isNotEmpty(productPromoAction.getString("orderAdjustmentTypeId"))) {