You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/08/07 11:05:14 UTC
svn commit: r801915 -
/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
Author: mor
Date: Fri Aug 7 09:05:14 2009
New Revision: 801915
URL: http://svn.apache.org/viewvc?rev=801915&view=rev
Log:
Fixed shipping information block on Order Detail Page. Reported by Sumit Pandit in jira issue OFBIZ-2808 (https://issues.apache.org/jira/browse/OFBIZ-2808)
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=801915&r1=801914&r2=801915&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Aug 7 09:05:14 2009
@@ -552,18 +552,20 @@
<td valign="top" width="80%">
<#list shipGroupShipments as shipment>
<div>
- ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a>
- <#assign shipmentRoutSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId":shipment.shipmentId}))>
- <#if "UPS" == shipmentRoutSegment.carrierPartyId?if_exists && "ORDER_COMPLETED" == orderHeader.statusId>
- <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a>
+ ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a>
+ <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
+ <#if "SALES_ORDER" == orderHeader.orderTypeId>
+ <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("ShipmentRouteSegment", {"shipmentId":shipment.shipmentId}))>
+ <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists && "ORDER_COMPLETED" == orderHeader.statusId>
+ <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a>
</#if>
- <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
+ <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="orderId" value="${orderId}"/>
+ <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/>
+ <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRouteSegment.shipmentRouteSegmentId}>
+ </form>
+ </#if>
</div>
- <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="orderId" value="${orderId}"/>
- <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/>
- <input type="hidden" name="shipmentRouteSegmentId" value=${shipmentRoutSegment.shipmentRouteSegmentId}>
- </form>
</#list>
</td>
</tr>