svn commit: r1221591 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

[hansbak-2]

Author: hansbak
Date: Wed Dec 21 03:49:59 2011
New Revision: 1221591

URL: http://svn.apache.org/viewvc?rev=1221591&view=rev
Log:
downloadable product does not have a carrierpartyId causing problems in orderoverview

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=1221591&r1=1221590&r2=1221591&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Dec 21 03:49:59 2011
@@ -264,10 +264,12 @@ under the License.
                                 </#list>
                             </select>
                             <#else>
-                            <#if shipGroup.carrierPartyId != "_NA_">
-                            ${shipGroup.carrierPartyId?if_exists}
-                            </#if>
-                            ${shipmentMethodType?if_exists.get("description",locale)?default("")}
+                                <#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_">
+                                ${shipGroup.carrierPartyId?if_exists}
+                                </#if>
+                                <#if shipmentMethodType?has_content>
+                                    ${shipmentMethodType.get("description",locale)?default("")}
+                                </#if>
                             </#if>
                         </div>
                     </td>