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 2013/11/02 01:08:13 UTC
svn commit: r1538097 - in /ofbiz/branches/release13.07: ./
applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
Author: jleroux
Date: Sat Nov 2 00:08:12 2013
New Revision: 1538097
URL: http://svn.apache.org/r1538097
Log:
"Applied fix from trunk for revision: 1538096 "
------------------------------------------------------------------------
r1538096 | jleroux | 2013-11-02 01:07:10 +0100 (sam. 02 nov. 2013) | 2 lignes
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/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1538096
Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy?rev=1538097&r1=1538096&r2=1538097&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy Sat Nov 2 00:08:12 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/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy?rev=1538097&r1=1538096&r2=1538097&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy Sat Nov 2 00:08:12 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);