I don't know if this is related to the commit or not (maybe not) but I have noticed that also the multi ship group features on the order entry backend are not working properly: * when, in the first checkout screen you select "New Ship Group" a new ship group is correctly created but when you hit the "Continue" button the system creates a third one (!) * if you assign the promotional items to the second ship group and then you complete the checkout the promotional items are moved back to the first ship group
Jacopo On Apr 17, 2010, at 7:03 AM, Scott Gray wrote: > This commit broke the demo system, no cost estimates are returned during > checkout any more. > > Regards > Scott > > HotWax Media > http://www.hotwaxmedia.com > > On 8/04/2010, at 3:47 AM, doo...@apache.org wrote: > >> Author: doogie >> Date: Wed Apr 7 15:47:27 2010 >> New Revision: 931594 >> >> URL: http://svn.apache.org/viewvc?rev=931594&view=rev >> Log: >> If an exact productStoreShipMethId is requested, then do an exact AND >> match, not an OR. Otherwise, both the original exact entity will be >> returned, *and* any others that happen to have the same >> carrierPartyId/shipmentMethodTypeId pair. Then, when getFirst is >> called, it will effectively be random. This bug shows up with showing >> cost estimates for a shipping method picker during checkout. >> >> Modified: >> >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java >> >> Modified: >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=931594&r1=931593&r2=931594&view=diff >> ============================================================================== >> --- >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java >> (original) >> +++ >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java >> Wed Apr 7 15:47:27 2010 >> @@ -250,7 +250,7 @@ public class ShipmentServices { >> if (UtilValidate.isNotEmpty(productStoreShipMethId)) { >> // if the productStoreShipMethId field is passed, then also get >> estimates that have the field set >> List<EntityCondition> condList = >> UtilMisc.toList(EntityCondition.makeCondition("productStoreShipMethId", >> EntityOperator.EQUALS, productStoreShipMethId), estFieldsCond); >> - estFieldsCond = EntityCondition.makeCondition(condList, >> EntityOperator.OR); >> + estFieldsCond = EntityCondition.makeCondition(condList, >> EntityOperator.AND); >> } >> >> Collection<GenericValue> estimates = null; >> >> >