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:50:43 UTC
svn commit: r1626408 -
/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
Author: ashish
Date: Sat Sep 20 09:50:42 2014
New Revision: 1626408
URL: http://svn.apache.org/r1626408
Log:
No functional changes, Only done formating changes.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
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=1626408&r1=1626407&r2=1626408&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:50:42 2014
@@ -21,22 +21,19 @@ under the License.
<#-- Purchase Orders -->
-<#if facilityMaps??>
- <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
- <input type="hidden" name="finalizeMode" value="ship"/>
- <#if (cart.getShipGroupSize() > 1)>
- <input type="hidden" name="finalizeReqShipGroups" value="true"/>
- </#if>
+ <#if facilityMaps??>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="ship"/>
+ <#if (cart.getShipGroupSize() > 1)>
+ <input type="hidden" name="finalizeReqShipGroups" value="true"/>
+ </#if>
<table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxboutside">
<tr>
<td colspan="4">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a>
-
-
-<#list 1..cart.getShipGroupSize() as currIndex>
-<#assign shipGroupIndex = currIndex - 1>
-
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a>
+ <#list 1..cart.getShipGroupSize() as currIndex>
+ <#assign shipGroupIndex = currIndex - 1>
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td colspan="4">
<h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1>
@@ -45,66 +42,69 @@ under the License.
<#assign i = 0>
<#assign shipGroup = cart.getShipInfo(shipGroupIndex)>
<#list facilityMaps as facilityMap>
- <#assign facility = facilityMap.facility>
- <#assign facilityContactMechList = facilityMap.facilityContactMechList>
- <tr>
- <td colspan="4">
- <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div>
- </td>
- </tr>
- <tr><td colspan="4"><hr /></td></tr>
-
- <#-- company postal addresses -->
-
- <#if facilityContactMechList?has_content>
- <#list facilityContactMechList as shippingContactMech>
- <#if shippingContactMech.postalAddress??>
- <#assign shippingAddress = shippingContactMech.postalAddress>
+ <#assign facility = facilityMap.facility>
+ <#assign facilityContactMechList = facilityMap.facilityContactMechList>
<tr>
- <td valign="top" nowrap="nowrap">
- <#assign checked='' />
- <#if shipGroup?has_content && (shipGroup.getFacilityId()?has_content && shipGroup.getFacilityId() == facility.facilityId) && (shipGroup.getContactMechId()?has_content && shipGroup.getContactMechId() == shippingAddress.contactMechId) >
- <#assign checked='checked' />
- <#elseif i == 0>
- <#assign checked='checked' />
- </#if>
- <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}_@_${facility.facilityId}" ${checked} />
- </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="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ <td colspan="4">
+ <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div>
</td>
</tr>
- <#if shippingContactMech_has_next>
- <tr><td colspan="4"><hr /></td></tr>
- </#if>
- </#if>
- <#assign i = i + 1>
- </#list>
- <#else>
<tr>
- <td colspan="4">
- <div>
- ${uiLabelMap.CommonNoContactInformationOnFile}:
- <a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&preContactMechTypeId=POSTAL_ADDRESS" target="_blank" class="buttontext">${uiLabelMap.CommonNew}</a>
- </div>
- </td>
- </#if>
+ <td colspan="4"><hr /></td>
+ </tr>
+
+<#-- company postal addresses -->
+
+ <#if facilityContactMechList?has_content>
+ <#list facilityContactMechList as shippingContactMech>
+ <#if shippingContactMech.postalAddress??>
+ <#assign shippingAddress = shippingContactMech.postalAddress>
+ <tr>
+ <td valign="top" nowrap="nowrap">
+ <#assign checked='' />
+ <#if shipGroup?has_content && (shipGroup.getFacilityId()?has_content && shipGroup.getFacilityId() == facility.facilityId) && (shipGroup.getContactMechId()?has_content && shipGroup.getContactMechId() == shippingAddress.contactMechId) >
+ <#assign checked='checked' />
+ <#elseif i == 0>
+ <#assign checked='checked' />
+ </#if>
+ <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}_@_${facility.facilityId}" ${checked} />
+ </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="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="4"><hr /></td></tr>
+ </#if>
+ </#if>
+ <#assign i = i + 1>
+ </#list>
+ <#else>
+ <tr>
+ <td colspan="4">
+ <div>
+ ${uiLabelMap.CommonNoContactInformationOnFile}:
+ <a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&preContactMechTypeId=POSTAL_ADDRESS" target="_blank" class="buttontext">${uiLabelMap.CommonNew}</a>
+ </div>
+ </td>
+ </tr>
+ </#if>
</#list>
- </table>
-</#list>
+ </table>
+ </#list>
</td>
</tr>
<#if shipToPartyShippingContactMechList?has_content>
@@ -140,37 +140,35 @@ under the License.
</#list>
</#if>
</table>
- </form>
-
-<#else>
+ </form>
+ <#else>
<#-- Sales Orders -->
- <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
- <input type="hidden" name="finalizeMode" value="ship"/>
- <#if (cart.getShipGroupSize() > 1)>
- <input type="hidden" name="finalizeReqShipGroups" value="true"/>
- </#if>
+ <form method="post" action="<@o...@ofbizUrl>" name="checkoutsetupform">
+ <input type="hidden" name="finalizeMode" value="ship"/>
+ <#if (cart.getShipGroupSize() > 1)>
+ <input type="hidden" name="finalizeReqShipGroups" value="true"/>
+ </#if>
<table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxoutside">
<tr>
<td>
-<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a>
-<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShippingAddress}</a>
-<#list 1..cart.getShipGroupSize() as currIndex>
-<#assign shipGroupIndex = currIndex - 1>
-
-<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!>
-<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!>
-<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!>
- <hr />
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td colspan="3">
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShippingAddress}</a>
+ <#list 1..cart.getShipGroupSize() as currIndex>
+ <#assign shipGroupIndex = currIndex - 1>
+ <#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!>
+ <#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!>
+ <#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!>
+ <hr />
+ <table width="100%" border="0" cellpadding="1" cellspacing="0">
+ <tr>
+ <td colspan="3">
<h1>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</h1>
- </td>
- </tr>
- <tr>
- <td colspan="3">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
<div>
${uiLabelMap.PartySupplier}:
<select name="${shipGroupIndex?default("0")}_supplierPartyId">
@@ -188,121 +186,118 @@ under the License.
</#list>
</select>
</div>
- </td>
- </tr>
- <#if shippingContactMechList?has_content>
- <tr><td colspan="3"><hr /></td></tr>
- <#assign i = 0>
- <#list shippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
- <#if currShipContactMechId?? && currShipContactMechId?has_content>
+ </td>
+ </tr>
+ <#if shippingContactMechList?has_content>
+ <tr><td colspan="3"><hr /></td></tr>
+ <#assign i = 0>
+ <#list shippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <#if currShipContactMechId?? && currShipContactMechId?has_content>
<#if currShipContactMechId == shippingContactMech.contactMechId>
<#assign checkedValue = "checked='checked'">
<#else>
<#assign checkedValue = "">
</#if>
- <#else>
+ <#else>
<#if i == 0>
- <#assign checkedValue = "checked='checked'">
+ <#assign checkedValue = "checked='checked'">
<#else>
- <#assign checkedValue = "">
+ <#assign checkedValue = "">
</#if>
- </#if>
- <tr>
- <td valign="top" width="1%" nowrap="nowrap">
- <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} />
- </td>
- <td valign="top" width="99%" 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>
+ </#if>
+ <tr>
+ <td valign="top" width="1%" nowrap="nowrap">
+ <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} />
+ </td>
+ <td valign="top" width="99%" 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="3"><hr /></td></tr>
+ </#if>
+ <#assign i = i + 1>
+ </#list>
+ </#if>
+ <#if shipToPartyShippingContactMechList?has_content>
<tr><td colspan="3"><hr /></td></tr>
- </#if>
- <#assign i = i + 1>
- </#list>
- </#if>
- <#if shipToPartyShippingContactMechList?has_content>
- <tr><td colspan="3"><hr /></td></tr>
- <tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
- <tr><td colspan="3"><hr /></td></tr>
- <#list shipToPartyShippingContactMechList as shippingContactMech>
- <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
- <tr>
- <td valign="top" width="1%" nowrap="nowrap">
- <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/>
- </td>
- <td valign="top" width="99%" 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> </td>
- </tr>
- <#if shippingContactMech_has_next>
+ <tr><td colspan="3">${uiLabelMap.OrderShipToAnotherParty}: <b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(shipToParty)}</b></td></tr>
<tr><td colspan="3"><hr /></td></tr>
- </#if>
- </#list>
- </#if>
- </table>
-</#list>
+ <#list shipToPartyShippingContactMechList as shippingContactMech>
+ <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)>
+ <tr>
+ <td valign="top" width="1%" nowrap="nowrap">
+ <input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/>
+ </td>
+ <td valign="top" width="99%" 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> </td>
+ </tr>
+ <#if shippingContactMech_has_next>
+ <tr><td colspan="3"><hr /></td></tr>
+ </#if>
+ </#list>
+ </#if>
+ </table>
+ </#list>
</td>
</tr>
</table>
+ </form>
+ </#if>
- </form>
-</#if>
-
-
-
- <#-- select a party id to ship to instead -->
+<#-- select a party id to ship to instead -->
- <br />
- <form method="post" action="setShipping" name="partyshipform">
- <div class="screenlet">
- <div class="screenlet-title-bar">
- <ul>
- <li class="h3">${uiLabelMap.OrderShipToAnotherParty}</li>
- </ul>
- <br class="clear" />
- </div>
- <div class="screenlet-body">
- <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
- <tr><td colspan="4"> </td></tr>
- <tr>
- <td> </td>
- <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td>
- <td> </td>
- <td valign='middle'>
- <div class='tabletext'>
- <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/>
- <input type="submit" class="smallSubmit" value="Continue" />
- </div>
- </td>
- </tr>
- </table>
- </div>
+ <br />
+ <form method="post" action="setShipping" name="partyshipform">
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <ul>
+ <li class="h3">${uiLabelMap.OrderShipToAnotherParty}</li>
+ </ul>
+ <br class="clear" />
</div>
- </form>
+ <div class="screenlet-body">
+ <table width="100%" border='0' cellspacing='0' cellpadding='0' class='boxbottom'>
+ <tr><td colspan="4"> </td></tr>
+ <tr>
+ <td> </td>
+ <td align='right' valign='middle' nowrap="nowrap"><div class='tableheadtext'>${uiLabelMap.PartyPartyId}</div></td>
+ <td> </td>
+ <td valign='middle'>
+ <div class='tabletext'>
+ <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/>
+ <input type="submit" class="smallSubmit" value="Continue" />
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </form>
<#else>
<h3>${uiLabelMap.OrderViewPermissionError}</h3>
-</#if>
+</#if>
\ No newline at end of file