svn commit: r785541 - /ofbiz/trunk/applications/prod
Locked
 
|
Author: ashish
Date: Wed Jun 17 10:25:26 2009 New Revision: 785541 URL: http://svn.apache.org/viewvc?rev=785541&view=rev Log: No functional change. Only formated the file. Thanks Akash for your contribution. Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=785541&r1=785540&r2=785541&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Wed Jun 17 10:25:26 2009 @@ -18,137 +18,194 @@ --> <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> -<#if !(showWarningForm)> - <div class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.ProductWeightPackageOnly} in ${facility.facilityName?if_exists} [${(facility.facilityId)?if_exists}]</li> - </ul> - <br class="clear"/> - </div> - <div class="screenlet-body"> - <#if invoiceIds?has_content> - <div> - ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/PackingSlip.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> ${uiLabelMap.CommonOr} - ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/ShipmentBarCode.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductBarcode}</a> ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> - </div> - <#if invoiceIds?exists && invoiceIds?has_content> + <#if !(showWarningForm)> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.ProductWeightPackageOnly} in ${facility.facilityName?if_exists} [${(facility.facilityId)?if_exists}]</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#if invoiceIds?has_content> <div> - <p>${uiLabelMap.AccountingInvoices}:</p> - <ul> - <#list invoiceIds as invoiceId> - <li> - #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a> - (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>) - </li> - </#list> - </ul> + ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/PackingSlip.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> ${uiLabelMap.CommonOr} + ${uiLabelMap.CommonView} <a href="<@ofbizUrl>/ShipmentBarCode.pdf?shipmentId=${shipmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductBarcode}</a> ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} <a href="<@ofbizUrl>/ViewShipment?shipmentId=${shipmentId}</@ofbizUrl>" class="buttontext">${shipmentId}</a> </div> - </#if> - </#if> - <#if shipmentPackageRouteSegList?exists && shipmentPackageRouteSegList?has_content> - <#list shipmentPackageRouteSegList as shipmentPackageRouteSeg> - <form name="viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}" method="post" action="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage</@ofbizUrl>"> - <input type="hidden" name="shipmentId" value ="${(shipmentPackageRouteSeg.shipmentId)?if_exists}"/> - <input type="hidden" name ="shipmentPackageSeqId" value = "${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists}"/> - <input type="hidden" name="shipmentRouteSegmentId" value ="${(shipmentPackageRouteSeg.shipmentRouteSegmentId)?if_exists}"/> + <#if invoiceIds?exists && invoiceIds?has_content> <div> - <span class="label">${uiLabelMap.ProductPackage}</span> ${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists} - <#if shipmentPackageRouteSeg.labelImage?exists> - <a href="javascript:document.viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a> - </#if> + <p>${uiLabelMap.AccountingInvoices}:</p> + <ul> + <#list invoiceIds as invoiceId> + <li> + #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a> + (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>) + </li> + </#list> + </ul> </div> - </form> - </#list> - </#if> - <br/> - <#if (invoiceIds?has_content) || !(orderId?has_content)> - <form name="selectOrderForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> - <table cellspacing="0" class="basic-table"> - <tr> - <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td> - <td width="1"> </td> - <td width="25%"> - <input type="text" name="orderId" size="20" maxlength="20" value="${primaryOrderId?if_exists}"/> - / - <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> - </td> - <td> </td> - </tr> - <tr> - <td colspan="2"> </td> - <td colspan="2"> - <a href="javascript:document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductWeightPackageOnly}</a> - <a href="javascript:document.selectOrderForm.action='<@ofbizUrl>PackOrder</@ofbizUrl>';document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> - </td> - </tr> - </table> - </form> + </#if> + </#if> + <#if shipmentPackageRouteSegList?exists && shipmentPackageRouteSegList?has_content> + <#list shipmentPackageRouteSegList as shipmentPackageRouteSeg> + <form name="viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}" method="post" action="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage</@ofbizUrl>"> + <input type="hidden" name="shipmentId" value ="${(shipmentPackageRouteSeg.shipmentId)?if_exists}"/> + <input type="hidden" name ="shipmentPackageSeqId" value = "${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists}"/> + <input type="hidden" name="shipmentRouteSegmentId" value ="${(shipmentPackageRouteSeg.shipmentRouteSegmentId)?if_exists}"/> + <div> + <span class="label">${uiLabelMap.ProductPackage}</span> ${(shipmentPackageRouteSeg.shipmentPackageSeqId)?if_exists} + <#if shipmentPackageRouteSeg.labelImage?exists> + <a href="javascript:document.viewShipmentPackageRouteSegLabelImageForm_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a> + </#if> + </div> + </form> + </#list> + </#if> <br/> - <!-- select picklist bin form --> - <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> - <table cellspacing="0" class="basic-table"> - <tr> - <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td> - <td width="1"> </td> - <td width="25%"> - <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> - </td> - <td> </td> - </tr> - <tr> - <td colspan="2"> </td> - <td colspan="1"> - <a href="javascript:document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductWeightPackageOnly}</a> - <a href="javascript:document.selectPicklistBinForm.action='<@ofbizUrl>PackOrder</@ofbizUrl>';document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> - </td> - </tr> - </table> - </form> - <#else> - <#assign packedLines = weightPackageSession.getPackedLines(orderId)/> - <#if !(shipmentPackages?has_content)> - <#if packedLines?has_content> - <table class="basic-table" cellpadding="2" cellspacing='0'> - <tr> - <th> - ${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): - </th> - <th> - ${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}): - </th> - <th> - ${uiLabelMap.ProductPackageInputBox}: - </th> - </tr> - <#list packedLines as packedLine> - <form name="updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}" method="post" action="<@ofbizUrl>updatePackedLine</@ofbizUrl>"> - <input type="hidden" name="orderId" value ="${orderId?if_exists}"/> + <#if (invoiceIds?has_content) || !(orderId?has_content)> + <form name="selectOrderForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>"> + <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> + <table cellspacing="0" class="basic-table"> + <tr> + <td width="25%" align="right"><span class="label">${uiLabelMap.ProductOrderId}</span></td> + <td width="1"> </td> + <td width="25%"> + <input type="text" name="orderId" size="20" maxlength="20" value="${primaryOrderId?if_exists}"/> + / + <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> + </td> + <td> </td> + </tr> + <tr> + <td colspan="2"> </td> + <td colspan="2"> + <a href="javascript:document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductWeightPackageOnly}</a> + <a href="javascript:document.selectOrderForm.action='<@ofbizUrl>PackOrder</@ofbizUrl>';document.selectOrderForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> + </td> + </tr> + </table> + </form> + <br/> + <!-- select picklist bin form --> + <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>" style="margin: 0;"> + <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> + <table cellspacing="0" class="basic-table"> + <tr> + <td width="25%" align='right'><span class="label">${uiLabelMap.FormFieldTitle_picklistBinId}</span></td> + <td width="1"> </td> + <td width="25%"> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId?if_exists}"/> + </td> + <td> </td> + </tr> + <tr> + <td colspan="2"> </td> + <td colspan="1"> + <a href="javascript:document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductWeightPackageOnly}</a> + <a href="javascript:document.selectPicklistBinForm.action='<@ofbizUrl>PackOrder</@ofbizUrl>';document.selectPicklistBinForm.submit();" class="buttontext">${uiLabelMap.ProductPackOrder}</a> + </td> + </tr> + </table> + </form> + <#else> + <#assign packedLines = weightPackageSession.getPackedLines(orderId)/> + <#if !(shipmentPackages?has_content)> + <#if packedLines?has_content> + <table class="basic-table" cellpadding="2" cellspacing='0'> + <tr> + <th> + ${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): + </th> + <th> + ${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}): + </th> + <th> + ${uiLabelMap.ProductPackageInputBox}: + </th> + </tr> + <#list packedLines as packedLine> + <form name="updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}" method="post" action="<@ofbizUrl>updatePackedLine</@ofbizUrl>"> + <input type="hidden" name="orderId" value ="${orderId?if_exists}"/> + <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/> + <input type="hidden" name="weightPackageSeqId" value ="${packedLine.getWeightPackageSeqId()}"/> + <tr> + <td> + <span class="label"> + ${uiLabelMap.ProductPackage} ${packedLine.getWeightPackageSeqId()} + <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())?if_exists}"> + </span> + </td> + <td> + <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="${(packedLine.getPackageLength())?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="${(packedLine.getPackageWidth())?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="${(packedLine.getPackageHeight())?if_exists}" size="5"/></span> + </td> + <td> + <select name="shipmentBoxTypeId"> + <#if shipmentBoxTypes?has_content> + <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())?if_exists}"/> + <#list shipmentBoxTypes as shipmentBoxType> + <#if shipmentBoxTypeId == "${shipmentBoxType.shipmentBoxTypeId}"> + <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option> + </#if> + </#list> + <option value=""></option> + <#list shipmentBoxTypes as shipmentBoxType> + <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option> + </#list> + </#if> + </select> + </td> + <td align="right"><a href="javascript:document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> + <td align="right"><a href="javascript:document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.action='<@ofbizUrl>deletePackedLine</@ofbizUrl>';document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></div> + </tr> + </form> + </#list> + </table> + <div align="right"> + <a href="javascript:document.completePackageForm.submit()" class="buttontext">${uiLabelMap.ProductComplete}</a> + </div> + <form name="completePackageForm" method ="post" action="<@ofbizUrl>completePackage</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> + <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> + <input type="hidden" name="dimensionUomId" value="${defaultDimensionUomId}"/> + <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> + <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/> + <input type="hidden" name="estimatedShippingCost" value="${estimatedShippingCost?if_exists}"/> + <input type="hidden" name="newEstimatedShippingCost" value="${newEstimatedShippingCost?if_exists}"/> + </form> + </#if> + <table class="basic-table" cellpadding="2" cellspacing='0'> + <form name="weightPackageForm" method ="post" action="<@ofbizUrl>setPackageInfo</@ofbizUrl>"> + <input type="hidden" name = "shipGroupSeqId" value = "${shipGroupSeqId?if_exists}"/> <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/> - <input type="hidden" name="weightPackageSeqId" value ="${packedLine.getWeightPackageSeqId()}"/> + <input type="hidden" name = "orderId" value = "${orderId?if_exists}"/> + <#assign packedLines = weightPackageSession.getPackedLines(orderId)/> + <#if packedLines?has_content> + <hr> + </#if> <tr> <td> - <span class="label"> - ${uiLabelMap.ProductPackage} ${packedLine.getWeightPackageSeqId()} - <input type="text" size="7" name="packageWeight" value="${(packedLine.getPackageWeight())?if_exists}"> + <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): + <br/> + ${uiLabelMap.ProductPackage} + <input type="text" size="7" name="packageWeight" value=""/> </span> </td> <td> - <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="${(packedLine.getPackageLength())?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="${(packedLine.getPackageWidth())?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="${(packedLine.getPackageHeight())?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}):</span> + <br/> + <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="" size="5"/></span> + <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="" size="5"/></span> + <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="" size="5"/></span> </td> <td> + <span class="label">${uiLabelMap.ProductPackageInputBox}:</span> + <br/> <select name="shipmentBoxTypeId"> <#if shipmentBoxTypes?has_content> - <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())?if_exists}"/> - <#list shipmentBoxTypes as shipmentBoxType> - <#if shipmentBoxTypeId == "${shipmentBoxType.shipmentBoxTypeId}"> - <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option> - </#if> - </#list> <option value=""></option> <#list shipmentBoxTypes as shipmentBoxType> <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option> @@ -156,145 +213,88 @@ </#if> </select> </td> - <td align="right"><a href="javascript:document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> - <td align="right"><a href="javascript:document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.action='<@ofbizUrl>deletePackedLine</@ofbizUrl>';document.updateWeightPackageForm_${packedLine.getWeightPackageSeqId()}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a></div> + <td align="right"><a href="javascript:document.weightPackageForm.submit()" class="buttontext">${uiLabelMap.ProductNextPackage}</a></td> </tr> </form> - </#list> - </table> - <div align="right"> - <a href="javascript:document.completePackageForm.submit()" class="buttontext">${uiLabelMap.ProductComplete}</a> + </table> + <#else> + <table class="basic-table" cellpadding="2" cellspacing='0'> + <tr> + <th> + ${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): + </th> + <th> + ${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}): + </th> + <th> + ${uiLabelMap.ProductPackageInputBox}: + </th> + </tr> + <form name="completePackForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> + <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> + <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/> + <#list shipmentPackages?sort_by("shipmentPackageSeqId") as shipmentPackage> + <tr> + <td> + <span class="label"> + ${uiLabelMap.ProductPackage} ${(shipmentPackage_index + 1)} + <input type="text" size="7" readonly name="packageWeight" value="${(shipmentPackage.weight)?if_exists}"> + </span> + </td> + <td> + <span class="label">${uiLabelMap.CommonLength}<input type="text" readonly name="packageLength" value="${(shipmentPackage.boxLength)?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.ProductWidth}<input type="text" readonly name="packageWidth" value="${(shipmentPackage.boxWidth)?if_exists}" size="5"/></span> + <span class="label">${uiLabelMap.PartyHeight}<input type="text" readonly name="packageHeight" value="${(shipmentPackage.boxHeight)?if_exists}" size="5"/></span> + </td> + <td> + <#if (shipmentPackage.shipmentBoxTypeId)?has_content> + <#assign shipmentBoxType = delegator.findOne("ShipmentBoxType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentBoxTypeId", shipmentPackage.shipmentBoxTypeId), true)> + </#if> + <input type="text" readonly name="shipmentBoxTypeId" value="${(shipmentBoxType.description)?if_exists}" size="50"/> + </td> + </tr> + </#list> + </form> + </table> + <div align="right"> + <a href="javascript:document.completePackForm.submit()" class="buttontext">${uiLabelMap.ProductComplete}</a> + </div> + </#if> + </#if> + </div> + </div> + <#else> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.WebtoolsWarningLogLevel}:</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <div> + <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges} [${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>]</h3> </div> - <form name="completePackageForm" method ="post" action="<@ofbizUrl>completePackage</@ofbizUrl>"> + <form name="shipNowForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> - <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> - <input type="hidden" name="dimensionUomId" value="${defaultDimensionUomId}"/> <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> - <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/> - <input type="hidden" name="estimatedShippingCost" value="${estimatedShippingCost?if_exists}"/> - <input type="hidden" name="newEstimatedShippingCost" value="${newEstimatedShippingCost?if_exists}"/> </form> - </#if> - <table class="basic-table" cellpadding="2" cellspacing='0'> - <form name="weightPackageForm" method ="post" action="<@ofbizUrl>setPackageInfo</@ofbizUrl>"> - <input type="hidden" name = "shipGroupSeqId" value = "${shipGroupSeqId?if_exists}"/> - <input type="hidden" name = "facilityId" value = "${(facility.facilityId)?if_exists}"/> - <input type="hidden" name = "orderId" value = "${orderId?if_exists}"/> - <#assign packedLines = weightPackageSession.getPackedLines(orderId)/> - <#if packedLines?has_content> - <hr> - </#if> - <tr> - <td> - <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): - <br/> - ${uiLabelMap.ProductPackage} - <input type="text" size="7" name="packageWeight" value=""/> - </span> - </td> - <td> - <span class="label">${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}):</span> - <br/> - <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="" size="5"/></span> - <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="" size="5"/></span> - <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="" size="5"/></span> - </td> - <td> - <span class="label">${uiLabelMap.ProductPackageInputBox}:</span> - <br/> - <select name="shipmentBoxTypeId"> - <#if shipmentBoxTypes?has_content> - <option value=""></option> - <#list shipmentBoxTypes as shipmentBoxType> - <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option> - </#list> - </#if> - </select> - </td> - <td align="right"><a href="javascript:document.weightPackageForm.submit()" class="buttontext">${uiLabelMap.ProductNextPackage}</a></td> - </tr> + <form name="holdShipmentForm" method="post" action="<@ofbizUrl>HoldShipment</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> </form> - </table> - <#else> - <table class="basic-table" cellpadding="2" cellspacing='0'> - <tr> - <th> - ${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): - </th> - <th> - ${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}): - </th> - <th> - ${uiLabelMap.ProductPackageInputBox}: - </th> - </tr> - <form name="completePackForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> - <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> - <input type="hidden" name="invoiceId" value="${(invoice.invoiceId)?if_exists}"/> - <#list shipmentPackages?sort_by("shipmentPackageSeqId") as shipmentPackage> - <tr> - <td> - <span class="label"> - ${uiLabelMap.ProductPackage} ${(shipmentPackage_index + 1)} - <input type="text" size="7" readonly name="packageWeight" value="${(shipmentPackage.weight)?if_exists}"> - </span> - </td> - <td> - <span class="label">${uiLabelMap.CommonLength}<input type="text" readonly name="packageLength" value="${(shipmentPackage.boxLength)?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.ProductWidth}<input type="text" readonly name="packageWidth" value="${(shipmentPackage.boxWidth)?if_exists}" size="5"/></span> - <span class="label">${uiLabelMap.PartyHeight}<input type="text" readonly name="packageHeight" value="${(shipmentPackage.boxHeight)?if_exists}" size="5"/></span> - </td> - <td> - <#if (shipmentPackage.shipmentBoxTypeId)?has_content> - <#assign shipmentBoxType = delegator.findOne("ShipmentBoxType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentBoxTypeId", shipmentPackage.shipmentBoxTypeId), true)> - </#if> - <input type="text" readonly name="shipmentBoxTypeId" value="${(shipmentBoxType.description)?if_exists}" size="50"/> - </td> - </tr> - </#list> - </form> - </table> - <div align="right"> - <a href="javascript:document.completePackForm.submit()" class="buttontext">${uiLabelMap.ProductComplete}</a> + <div> + <a href="javascript:document.shipNowForm.submit()" class="buttontext">${uiLabelMap.FacilityShip} ${uiLabelMap.CommonNow}</a> + + <a href="javascript:document.holdShipmentForm.submit()" class="buttontext">${uiLabelMap.FacilityHoldShipment}</a> </div> - </#if> - </#if> - </div> - </div> -<#else> - <div class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.WebtoolsWarningLogLevel}:</li> - </ul> - <br class="clear"/> - </div> - <div class="screenlet-body"> - <div> - <h3>${uiLabelMap.FacilityWarningMessageThereIsMuchDifferenceInShippingCharges} [${uiLabelMap.FacilityEstimatedShippingCharges} = <@ofbizCurrency amount=estimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>, ${uiLabelMap.FacilityActualShippingCharges} = <@ofbizCurrency amount=newEstimatedShippingCost?if_exists isoCode=shipment.currencyUomId?if_exists/>]</h3> - </div> - <form name="shipNowForm" method="post" action="<@ofbizUrl>shipNow</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> - <input type="hidden" name="shipmentId" value="${(shipment.shipmentId)?if_exists}"/> - </form> - <form name="holdShipmentForm" method="post" action="<@ofbizUrl>HoldShipment</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> - <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"/> - </form> - <div> - <a href="javascript:document.shipNowForm.submit()" class="buttontext">${uiLabelMap.FacilityShip} ${uiLabelMap.CommonNow}</a> - - <a href="javascript:document.holdShipmentForm.submit()" class="buttontext">${uiLabelMap.FacilityHoldShipment}</a> </div> </div> - </div> -</#if> + </#if> </#if> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |