You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/09/20 11:05:50 UTC
svn commit: r1626404 - in /ofbiz/trunk/applications/order/webapp/ordermgr:
WEB-INF/actions/entry/ShipSettings.groovy entry/shipsettings.ftl
Author: ashish
Date: Sat Sep 20 09:05:50 2014
New Revision: 1626404
URL: http://svn.apache.org/r1626404
Log:
Applied fix from jira issue OFBIZ-2990 - New Order ship to partyid is ignored.
Thanks Mridul Pathak for the contribution.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1626404&r1=1626403&r2=1626404&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Sat Sep 20 09:05:50 2014
@@ -104,5 +104,15 @@ if ("SALES_ORDER".equals(cart.getOrderTy
}
context.facilityMaps = facilityMaps;
}
+ // Ship to another party
+ if (shipToPartyId) {
+ shipToParty = delegator.findOne("Party", [partyId : shipToPartyId], false);
+ if (shipToParty)
+ {
+ context.shipToParty = shipToParty;
+ shipToPartyShippingContactMechList = ContactHelper.getContactMech(shipToParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false);
+ context.shipToPartyShippingContactMechList = shipToPartyShippingContactMechList;
+ }
+ }
}
-}
+}
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=1626404&r1=1626403&r2=1626404&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Sat Sep 20 09:05:50 2014
@@ -29,7 +29,7 @@ under the License.
</#if>
<table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxboutside">
<tr>
- <td>
+ <td colspan="4">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a>
@@ -107,6 +107,38 @@ under the License.
</#list>
</td>
</tr>
+ <#if shipToPartyShippingContactMechList?has_content>
+ <tr><td colspan="4"><hr /></td></tr>
+ <tr><td colspan="4">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
+ <tr><td colspan="4"><hr /></td></tr>
+ <#list shipToPartyShippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <tr>
+ <td valign="top" nowrap="nowrap">
+ <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/>
+ </td>
+ <td nowrap="nowrap"> </td>
+ <td valign="top" width="100%" nowrap="nowrap">
+ <div>
+ <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if>
+ <#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br /></#if>
+ <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if>
+ <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
+ <#if shippingAddress.city?has_content>${shippingAddress.city}</#if>
+ <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if>
+ <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if>
+ <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if>
+ </div>
+ </td>
+ <td>
+ <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="4"><hr /></td></tr>
+ </#if>
+ </#list>
+ </#if>
</table>
</form>