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 2014/07/07 19:22:03 UTC
svn commit: r1608517 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Author: jleroux
Date: Mon Jul 7 17:22:02 2014
New Revision: 1608517
URL: http://svn.apache.org/r1608517
Log:
If there are no shipping methods, at least show "no shipping"!
Fixes indentation
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1608517&r1=1608516&r2=1608517&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Jul 7 17:22:02 2014
@@ -252,20 +252,20 @@ under the License.
-->
<select name="shipmentMethod">
<#if shipGroup.shipmentMethodTypeId?has_content>
- <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
+ <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
<#else>
- <option value=""/>
+ <option value="NO_SHIPPING@_NA_@CARRIER"> No Shipping</option>
</#if>
<#list productStoreShipmentMethList as productStoreShipmentMethod>
- <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId>
- <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content>
- <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option>
- </#if>
+ <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId>
+ <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content>
+ <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option>
+ </#if>
</#list>
</select>
<#else>
<#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_">
- ${shipGroup.carrierPartyId?if_exists}
+ ${shipGroup.carrierPartyId?if_exists}
</#if>
<#if shipmentMethodType?has_content>
${shipmentMethodType.get("description",locale)?default("")}