You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2012/05/22 09:02:09 UTC
svn commit: r1341325 - in /ofbiz/branches/release11.04: ./
applications/order/src/org/ofbiz/order/order/OrderServices.java
Author: jacopoc
Date: Tue May 22 07:02:08 2012
New Revision: 1341325
URL: http://svn.apache.org/viewvc?rev=1341325&view=rev
Log:
Applied fix from trunk for revision: 1341314
===
Fixed error reported in OFBIZ-4892: in orders with more than one promo codes, only one code was stored in OrderProductPromoCode entity.
Thanks to Ritu Raj Lakhera for the report and the patch; the one I have committed fixes the bug in a slightly different way.
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderServices.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1341314
Modified: ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1341325&r1=1341324&r2=1341325&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/release11.04/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue May 22 07:02:08 2012
@@ -969,10 +969,9 @@ public class OrderServices {
// store the orderProductPromoCodes
Set<String> orderProductPromoCodes = UtilGenerics.checkSet(context.get("orderProductPromoCodes"));
if (UtilValidate.isNotEmpty(orderProductPromoCodes)) {
- GenericValue orderProductPromoCode = delegator.makeValue("OrderProductPromoCode");
Iterator<String> orderProductPromoCodeIter = orderProductPromoCodes.iterator();
while (orderProductPromoCodeIter.hasNext()) {
- orderProductPromoCode.clear();
+ GenericValue orderProductPromoCode = delegator.makeValue("OrderProductPromoCode");
orderProductPromoCode.set("orderId", orderId);
orderProductPromoCode.set("productPromoCodeId", orderProductPromoCodeIter.next());
toBeStored.add(orderProductPromoCode);