Author: jleroux
Date: Sat Nov 2 00:07:10 2013
New Revision: 1538096
URL:
http://svn.apache.org/r1538096Log:
Fixes a bug I found in CheckInits.groovy while trying to create an new order from Order View screen
Fixes the same kind of bug in CheckoutOptions.groovy
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1538096&r1=1538095&r2=1538096&view=diff==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Sat Nov 2 00:07:10 2013
@@ -60,6 +60,6 @@ if (partyId) {
contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false));
if (contactMech) {
ShoppingCart shoppingCart = ShoppingCartEvents.getCartObject(request);
- shoppingCart.setShippingContactMechId(contactMech.contactMechId);
+ shoppingCart.setAllShippingContactMechId(contactMech.contactMechId);
}
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy?rev=1538096&r1=1538095&r2=1538096&view=diff==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy Sat Nov 2 00:07:10 2013
@@ -59,7 +59,7 @@ if (shoppingCart.getShipmentMethodTypeId
// other profile defaults
if (!shoppingCart.getShippingAddress() && profiledefs?.defaultShipAddr) {
- shoppingCart.setShippingContactMechId(profiledefs.defaultShipAddr);
+ shoppingCart.setAllShippingContactMechId(profiledefs.defaultShipAddr);
}
if (shoppingCart.selectedPayments() == 0 && profiledefs?.defaultPayMeth) {
shoppingCart.addPayment(profiledefs.defaultPayMeth);