Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Sat Jan 5 15:17:57 2008 @@ -17,362 +17,418 @@ under the License. --> <#if shipment?exists> -<table width="100%" cellspacing="0" cellpadding="2" border="1"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.ProductSegment}</div></td> - <td> - <div class="tableheadtext">${uiLabelMap.ProductCarrierShipmentMethod}</div> - <div class="tableheadtext">${uiLabelMap.ProductOriginDestinationFacility}</div> - <div class="tableheadtext">${uiLabelMap.ProductOriginDestinationAddressId}</div> - <div class="tableheadtext">${uiLabelMap.ProductOriginDestinationPhoneId}</div> - <div class="tableheadtext">${uiLabelMap.ProductShipmentThirdPartyAccountNumber}</div> - <div class="tableheadtext">${uiLabelMap.ProductShipmentThirdPartyPostalCode}</div> - <div class="tableheadtext">${uiLabelMap.ProductShipmentThirdPartyCountryCode}</div> - </td> - <td> - <div class="tableheadtext">${uiLabelMap.ProductShipmentFedexHomeDeliveryTypeDate}</div> - <div class="tableheadtext">${uiLabelMap.ProductCarrierStatus}</div> - <div class="tableheadtext">${uiLabelMap.ProductTrackingNumber}</div> - <div class="tableheadtext">${uiLabelMap.ProductEstimatedStartArrive}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualStartArrive}</div> - </td> - <td> - <div class="tableheadtext">${uiLabelMap.ProductBillingWeightUom}</div> - <div class="tableheadtext">${uiLabelMap.ProductCurrencyUom}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualTransport}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualServices}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualOther}</div> - <div class="tableheadtext">${uiLabelMap.ProductActualTotal}</div> - </td> - <td><div class="tableheadtext"> </div></td> - <td><div class="tableheadtext"> </div></td> - </tr> -<#list shipmentRouteSegmentDatas as shipmentRouteSegmentData> - <#assign shipmentRouteSegment = shipmentRouteSegmentData.shipmentRouteSegment> - <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs?if_exists> - <#assign originFacility = shipmentRouteSegmentData.originFacility?if_exists> - <#assign destFacility = shipmentRouteSegmentData.destFacility?if_exists> - <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType?if_exists> - <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson?if_exists> - <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup?if_exists> - <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress?if_exists> - <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress?if_exists> - <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber?if_exists> - <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber?if_exists> - <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem?if_exists> - <#assign currencyUom = shipmentRouteSegmentData.currencyUom?if_exists> - <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> - <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> - <form action="<@ofbizUrl>updateShipmentRouteSegment</@ofbizUrl>" name="updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> - <tr> - <td><div class="tabletext">${shipmentRouteSegment.shipmentRouteSegmentId}</div></td> - <td><span class="tabletext"></span> - <select name="carrierPartyId" class="selectBox"> - <#if shipmentRouteSegment.carrierPartyId?has_content> - <option value="${shipmentRouteSegment.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId}]</option> - <option value="${shipmentRouteSegment.carrierPartyId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list carrierPartyDatas as carrierPartyData> - <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)?if_exists} ${(carrierPartyData.person.middleName)?if_exists} ${(carrierPartyData.person.lastName)?if_exists} ${(carrierPartyData.partyGroup.groupName)?if_exists} [${carrierPartyData.party.partyId}]</option> - </#list> - </select> - <select name="shipmentMethodTypeId" class="selectBox"> - <#if shipmentMethodType?has_content> - <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option> - <option value="${shipmentMethodType.shipmentMethodTypeId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list shipmentMethodTypes as shipmentMethodTypeOption> - <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> - </#list> - </select> - <br/> - <select name="originFacilityId" class="selectBox"> - <#if originFacility?has_content> - <option value="${originFacility.facilityId}">${originFacility.facilityName} [${originFacility.facilityId}]</option> - <option value="${originFacility.facilityId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list facilities as facility> - <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> - </#list> - </select> - <select name="destFacilityId" class="selectBox"> - <#if destFacility?has_content> - <option value="${destFacility.facilityId}">${destFacility.facilityName} [${destFacility.facilityId}]</option> - <option value="${destFacility.facilityId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list facilities as facility> - <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> - </#list> - </select> - <br/> - <div class="tabletext"> - <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId?if_exists}" class="inputBox"/> - <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo}: ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]</#if> - </div> - <div class="tabletext"> - <input type="text" size="15" name="destContactMechId" value="${shipmentRouteSegment.destContactMechId?if_exists}" class="inputBox"/> - <#if destPostalAddress?has_content>[${uiLabelMap.CommonTo}: ${destPostalAddress.toName?if_exists},${uiLabelMap.CommonAttn}: ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}]</#if> - </div> - <div class="tabletext"> - <input type="text" size="15" name="originTelecomNumberId" value="${shipmentRouteSegment.originTelecomNumberId?if_exists}" class="inputBox"/> - <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]</#if> - </div> - <div class="tabletext"> - <input type="text" size="15" name="destTelecomNumberId" value="${shipmentRouteSegment.destTelecomNumberId?if_exists}" class="inputBox"/> - <#if destTelecomNumber?has_content>[${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}]</#if> - </div> - <div class="tabletext"> - <input type="text" size="15" name="thirdPartyAccountNumber" value="${shipmentRouteSegment.thirdPartyAccountNumber?if_exists}" class="inputBox"/> - </div> - <div class="tabletext"> - <input type="text" size="15" name="thirdPartyPostalCode" value="${shipmentRouteSegment.thirdPartyPostalCode?if_exists}" class="inputBox"/> - </div> - <div class="tabletext"> - <input type="text" size="15" name="thirdPartyCountryGeoCode" value="${shipmentRouteSegment.thirdPartyCountryGeoCode?if_exists}" class="inputBox"/> - </div> - </td> - <td> - <#if "UPS" == shipmentRouteSegment.carrierPartyId?if_exists> - <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="<@ofbizUrl>upsShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> - <br/> - ${uiLabelMap.ProductShipmentUpsResidential}: - <input type="checkbox" name="homeDeliveryType" class="checkBox" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}> - <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="<@ofbizUrl>upsShipmentAccept?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> - <br/> - <a href="<@ofbizUrl>upsVoidShipment?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> - <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="<@ofbizUrl>upsTrackShipment?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductTrackUpsShipment}</a> - <br/> - <a href="<@ofbizUrl>upsVoidShipment?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductVoidUpsShipment}</a> - </#if> - </#if> - <#if "DHL" == shipmentRouteSegment.carrierPartyId?if_exists> - <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="<@ofbizUrl>dhlShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentDHL}</a> - </#if> - </#if> - <#if "FEDEX" == shipmentRouteSegment.carrierPartyId?if_exists> - <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> - <a href="<@ofbizUrl>fedexShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a> - <br/> - <#if shipmentMethodType?exists && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> - <select name="homeDeliveryType" class="selectBox"> - <option value="">${uiLabelMap.ProductShipmentNone}</option> - <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="DATECERTAIN")?string("selected=\"selected\"","")} value="DATECERTAIN">${uiLabelMap.ProductShipmentFedexHomeDateCertain}</option> - <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="EVENING")?string("selected=\"selected\"","")} value="EVENING">${uiLabelMap.ProductShipmentFedexHomeEvening}</option> - <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="APPOINTMENT")?string("selected=\"selected\"","")} value="APPOINTMENT">${uiLabelMap.ProductShipmentFedexHomeAppointment}</option> - </select> - <input type="text" size="25" name="homeDeliveryDate" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}" class="inputBox"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.homeDeliveryDate, '${(shipmentRouteSegment.homeDeliveryDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleEditShipmentRouteSegments}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td valign="top">${uiLabelMap.ProductSegment}</td> + <td valign="top"> + <div>${uiLabelMap.ProductCarrierShipmentMethod}</div> + <div>${uiLabelMap.ProductOriginDestinationFacility}</div> + <div>${uiLabelMap.ProductOriginDestinationAddressId}</div> + <div>${uiLabelMap.ProductOriginDestinationPhoneId}</div> + <div>${uiLabelMap.ProductShipmentThirdPartyAccountNumber}</div> + <div>${uiLabelMap.ProductShipmentThirdPartyPostalCode}</div> + <div>${uiLabelMap.ProductShipmentThirdPartyCountryCode}</div> + </td> + <td valign="top"> + <div>${uiLabelMap.ProductShipmentFedexHomeDeliveryTypeDate}</div> + <div>${uiLabelMap.ProductCarrierStatus}</div> + <div>${uiLabelMap.ProductTrackingNumber}</div> + <div>${uiLabelMap.ProductEstimatedStartArrive}</div> + <div>${uiLabelMap.ProductActualStartArrive}</div> + </td> + <td valign="top"> + <div>${uiLabelMap.ProductBillingWeightUom}</div> + <div>${uiLabelMap.ProductCurrencyUom}</div> + <div>${uiLabelMap.ProductActualTransport}</div> + <div>${uiLabelMap.ProductActualServices}</div> + <div>${uiLabelMap.ProductActualOther}</div> + <div>${uiLabelMap.ProductActualTotal}</div> + </td> + </tr> + <#assign alt_row = false> + <#list shipmentRouteSegmentDatas as shipmentRouteSegmentData> + <#assign shipmentRouteSegment = shipmentRouteSegmentData.shipmentRouteSegment> + <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs?if_exists> + <#assign originFacility = shipmentRouteSegmentData.originFacility?if_exists> + <#assign destFacility = shipmentRouteSegmentData.destFacility?if_exists> + <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType?if_exists> + <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson?if_exists> + <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup?if_exists> + <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress?if_exists> + <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress?if_exists> + <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber?if_exists> + <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber?if_exists> + <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem?if_exists> + <#assign currencyUom = shipmentRouteSegmentData.currencyUom?if_exists> + <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> + <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> + <form action="<@ofbizUrl>updateShipmentRouteSegment</@ofbizUrl>" name="updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td valign="top"> + <div> + ${shipmentRouteSegment.shipmentRouteSegmentId} + <br/> + <a href="javascript:document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> + <br/> + <a href="<@ofbizUrl>duplicateShipmentRouteSegment?shipmentId=${shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDuplicate}</a> + <br/> + <a href="<@ofbizUrl>deleteShipmentRouteSegment?shipmentId=${shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> + </div> + </td> + <td valign="top"> + <div> + <select name="carrierPartyId"> + <#if shipmentRouteSegment.carrierPartyId?has_content> + <option value="${shipmentRouteSegment.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId}]</option> + <option value="${shipmentRouteSegment.carrierPartyId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list carrierPartyDatas as carrierPartyData> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)?if_exists} ${(carrierPartyData.person.middleName)?if_exists} ${(carrierPartyData.person.lastName)?if_exists} ${(carrierPartyData.partyGroup.groupName)?if_exists} [${carrierPartyData.party.partyId}]</option> + </#list> + </select> + <select name="shipmentMethodTypeId"> + <#if shipmentMethodType?has_content> + <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option> + <option value="${shipmentMethodType.shipmentMethodTypeId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list shipmentMethodTypes as shipmentMethodTypeOption> + <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> + </#list> + </select> + <br/> + <select name="originFacilityId"> + <#if originFacility?has_content> + <option value="${originFacility.facilityId}">${originFacility.facilityName} [${originFacility.facilityId}]</option> + <option value="${originFacility.facilityId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list facilities as facility> + <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> + </#list> + </select> + <select name="destFacilityId"> + <#if destFacility?has_content> + <option value="${destFacility.facilityId}">${destFacility.facilityName} [${destFacility.facilityId}]</option> + <option value="${destFacility.facilityId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list facilities as facility> + <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> + </#list> + </select> + <br/> + <div> + <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId?if_exists}"/> + <#if originPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</span></#if> + </div> + <div> + <input type="text" size="15" name="destContactMechId" value="${shipmentRouteSegment.destContactMechId?if_exists}"/> + <#if destPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${destPostalAddress.toName?if_exists},${uiLabelMap.CommonAttn}: ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}</span></#if> + </div> + <div> + <input type="text" size="15" name="originTelecomNumberId" value="${shipmentRouteSegment.originTelecomNumberId?if_exists}"/> + <#if originTelecomNumber?has_content><span class="tooltip">${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</span></#if> + </div> + <div> + <input type="text" size="15" name="destTelecomNumberId" value="${shipmentRouteSegment.destTelecomNumberId?if_exists}"/> + <#if destTelecomNumber?has_content><span class="tooltip">${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</span></#if> + </div> + <div> + <input type="text" size="15" name="thirdPartyAccountNumber" value="${shipmentRouteSegment.thirdPartyAccountNumber?if_exists}"/> + </div> + <div> + <input type="text" size="15" name="thirdPartyPostalCode" value="${shipmentRouteSegment.thirdPartyPostalCode?if_exists}"/> + </div> + <div> + <input type="text" size="15" name="thirdPartyCountryGeoCode" value="${shipmentRouteSegment.thirdPartyCountryGeoCode?if_exists}"/> + </div> + </div> + </td> + <td valign="top"> + <div> + <#if "UPS" == shipmentRouteSegment.carrierPartyId?if_exists> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <a href="<@ofbizUrl>upsShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> + <br/> + ${uiLabelMap.ProductShipmentUpsResidential}: + <input type="checkbox" name="homeDeliveryType" class="checkBox" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}> + <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <a href="<@ofbizUrl>upsShipmentAccept?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> + <br/> + <a href="<@ofbizUrl>upsVoidShipment?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> + <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <a href="<@ofbizUrl>upsTrackShipment?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductTrackUpsShipment}</a> + <br/> + <a href="<@ofbizUrl>upsVoidShipment?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductVoidUpsShipment}</a> + </#if> </#if> - <#else> - <#-- Todo: implement closeout with Fedex --> - <#-- Todo: implement shipment cancellation with Fedex --> - <#-- Todo: implement shipment tracking with Fedex --> - ${shipmentRouteSegment.homeDeliveryType?default(uiLabelMap.ProductShipmentNone)} - <#if shipmentRouteSegment.homeDeliveryDate?exists> - (${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")}) + <#if "DHL" == shipmentRouteSegment.carrierPartyId?if_exists> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <a href="<@ofbizUrl>dhlShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentDHL}</a> + </#if> </#if> + <#if "FEDEX" == shipmentRouteSegment.carrierPartyId?if_exists> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <a href="<@ofbizUrl>fedexShipmentConfirm?shipmentId=${shipmentRouteSegment.shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a> + <br/> + <#if shipmentMethodType?exists && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> + <select name="homeDeliveryType"> + <option value="">${uiLabelMap.ProductShipmentNone}</option> + <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="DATECERTAIN")?string("selected=\"selected\"","")} value="DATECERTAIN">${uiLabelMap.ProductShipmentFedexHomeDateCertain}</option> + <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="EVENING")?string("selected=\"selected\"","")} value="EVENING">${uiLabelMap.ProductShipmentFedexHomeEvening}</option> + <option ${(shipmentRouteSegment.homeDeliveryType?default("")=="APPOINTMENT")?string("selected=\"selected\"","")} value="APPOINTMENT">${uiLabelMap.ProductShipmentFedexHomeAppointment}</option> + </select> + <input type="text" size="25" name="homeDeliveryDate" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.homeDeliveryDate, '${(shipmentRouteSegment.homeDeliveryDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + </#if> + <#else> + <#-- Todo: implement closeout with Fedex --> + <#-- Todo: implement shipment cancellation with Fedex --> + <#-- Todo: implement shipment tracking with Fedex --> + ${shipmentRouteSegment.homeDeliveryType?default(uiLabelMap.ProductShipmentNone)} + <#if shipmentRouteSegment.homeDeliveryDate?exists> + (${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")}) + </#if> + <br/> + </#if> + </#if> + <br/> + <select name="carrierServiceStatusId"> + <#if carrierServiceStatusItem?has_content> + <option value="${carrierServiceStatusItem.statusId}">${carrierServiceStatusItem.description}</option> + <option value="${carrierServiceStatusItem.statusId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list carrierServiceStatusValidChangeToDetails as carrierServiceStatusValidChangeToDetail> + <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> + </#list> + </select> <br/> - </#if> - </#if> - <br/> - <select name="carrierServiceStatusId" class="selectBox"> - <#if carrierServiceStatusItem?has_content> - <option value="${carrierServiceStatusItem.statusId}">${carrierServiceStatusItem.description}</option> - <option value="${carrierServiceStatusItem.statusId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list carrierServiceStatusValidChangeToDetails as carrierServiceStatusValidChangeToDetail> - <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> - </#list> - </select> - <br/> - <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}" class="inputBox"/> - <br/> - <input type="text" size="25" name="estimatedStartDate" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}" class="inputBox"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedStartDate, '${(shipmentRouteSegment.estimatedStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <input type="text" size="25" name="estimatedArrivalDate" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}" class="inputBox"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedArrivalDate, '${(shipmentRouteSegment.estimatedArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <br/> - <input type="text" size="25" name="actualStartDate" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}" class="inputBox"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualStartDate, '${(shipmentRouteSegment.actualStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <input type="text" size="25" name="actualArrivalDate" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}" class="inputBox"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualArrivalDate, '${(shipmentRouteSegment.actualArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - </td> - <td> - <input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight?if_exists}" class="inputBox"/> - <select name="billingWeightUomId" class="selectBox"> - <#if billingWeightUom?has_content> - <option value="${billingWeightUom.uomId}">${billingWeightUom.get("description",locale)} [${billingWeightUom.abbreviation}]</option> - <option value="${billingWeightUom.uomId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list weightUoms as weightUom> - <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> - </#list> - </select> - <br/> - <select name="currencyUomId" class="selectBox"> - <#if currencyUom?has_content> - <option value="${currencyUom.uomId}">${currencyUom.get("description",locale)} [${currencyUom.uomId}]</option> - <option value="${currencyUom.uomId}">---</option> - <#else> - <option value=""> </option> - </#if> - <#list currencyUoms as altCurrencyUom> - <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> - </#list> - </select> - <br/> - <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost?if_exists}" class="inputBox"/> - <br/> - <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost?if_exists}" class="inputBox"/> - <br/> - <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost?if_exists}" class="inputBox"/> - <br/> - <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost?if_exists}" class="inputBox"/> - </td> - <td><a href="javascript:document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> - <br/><div class="tabletext"><a href="<@ofbizUrl>duplicateShipmentRouteSegment?shipmentId=${shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDuplicate}</a></div></td> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteShipmentRouteSegment?shipmentId=${shipmentId}&shipmentRouteSegmentId=${shipmentRouteSegment.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td> - </tr> - </form> + <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> + <br/> + <input type="text" size="25" name="estimatedStartDate" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedStartDate, '${(shipmentRouteSegment.estimatedStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + <input type="text" size="25" name="estimatedArrivalDate" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedArrivalDate, '${(shipmentRouteSegment.estimatedArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + <br/> + <input type="text" size="25" name="actualStartDate" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualStartDate, '${(shipmentRouteSegment.actualStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + <input type="text" size="25" name="actualArrivalDate" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualArrivalDate, '${(shipmentRouteSegment.actualArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + </div> + </td> + <td valign="top"> + <input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight?if_exists}"/> + <select name="billingWeightUomId"> + <#if billingWeightUom?has_content> + <option value="${billingWeightUom.uomId}">${billingWeightUom.get("description",locale)} [${billingWeightUom.abbreviation}]</option> + <option value="${billingWeightUom.uomId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list weightUoms as weightUom> + <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> + </#list> + </select> + <br/> + <select name="currencyUomId"> + <#if currencyUom?has_content> + <option value="${currencyUom.uomId}">${currencyUom.get("description",locale)} [${currencyUom.uomId}]</option> + <option value="${currencyUom.uomId}">---</option> + <#else> + <option value=""> </option> + </#if> + <#list currencyUoms as altCurrencyUom> + <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> + </#list> + </select> + <br/> + <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost?if_exists}"/> + <br/> + <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost?if_exists}"/> + <br/> + <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost?if_exists}"/> + <br/> + <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost?if_exists}"/> + </td> + </tr> + </form> <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> <form action="<@ofbizUrl>updateRouteSegmentShipmentPackage</@ofbizUrl>" name="updateShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}${shipmentPackageRouteSeg_index}"> <input type="hidden" name="shipmentId" value="${shipmentId}"/> <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentPackageRouteSeg.shipmentRouteSegmentId}"/> <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackageRouteSeg.shipmentPackageSeqId}"/> - <tr> - <td><div class="tabletext"> </div></td> - <td> - <div class="tabletext"> - ${uiLabelMap.ProductPackage} :${shipmentPackageRouteSeg.shipmentPackageSeqId} + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td valign="top"> + <div> + <span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageRouteSeg.shipmentPackageSeqId} <#if shipmentPackageRouteSeg.labelImage?exists> <a href="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage?shipmentId=${shipmentPackageRouteSeg.shipmentId}&shipmentRouteSegmentId=${shipmentPackageRouteSeg.shipmentRouteSegmentId}&shipmentPackageSeqId=${shipmentPackageRouteSeg.shipmentPackageSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a> </#if> + <span class="label">${uiLabelMap.ProductTrack} #</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/> + </div> + </td> + <td valign="top"> + <div> + <span class="label">${uiLabelMap.ProductBox} #</span> + <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}"/> + </div> + </td> + <td valign="top"> + <div> + <a href="javascript:document.updateShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>deleteRouteSegmentShipmentPackage?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentId=${shipmentPackageRouteSeg.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> </div> </td> - <td><span class="tabletext">${uiLabelMap.ProductTrack} #:</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}" class="inputBox"/></td> - <td><span class="tabletext">${uiLabelMap.ProductBox} #:</span><input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}" class="inputBox"/></td> - <td><a href="javascript:document.updateShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a></td> - <td><div class="tabletext"><a href="<@ofbizUrl>deleteRouteSegmentShipmentPackage?shipmentId=${shipmentId}&shipmentPackageSeqId=${shipmentPackageRouteSeg.shipmentPackageSeqId}&shipmentRouteSegmentId=${shipmentPackageRouteSeg.shipmentRouteSegmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div></td> </tr> </form> </#list> - <#-- - <tr> - <form action="<@ofbizUrl>createRouteSegmentShipmentPackage</@ofbizUrl>" name="createShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> - <td><div class="tabletext"> </div></td> - <td> - <div class="tabletext">${uiLabelMap.ProductAddPackageInfo} : - <select name="shipmentPackageSeqId" class="selectBox"> - <#list shipmentPackages as shipmentPackage> - <option>${shipmentPackage.shipmentPackageSeqId}</option> - </#list> - </select> - </div> - </td> - <td><span class="tabletext">Track#:</span><input type="text" size="22" name="trackingCode" class="inputBox"/></td> - <td><span class="tabletext">Box#:</span><input type="text" size="5" name="boxNumber" class="inputBox"/></td> - <td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> - <td><div class="tabletext"> </div></td> - </form> - </tr> - --> -</#list> -<form action="<@ofbizUrl>createShipmentRouteSegment</@ofbizUrl>" name="createShipmentRouteSegmentForm"> - <input type="hidden" name="shipmentId" value="${shipmentId}"/> - <tr> - <td><div class="tabletext">${uiLabelMap.ProductNewSegment} :</div></td> - <td><span class="tabletext"></span> - <select name="carrierPartyId" class="selectBox"> - <option value=""> </option> - <#list carrierPartyDatas as carrierPartyData> - <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)?if_exists} ${(carrierPartyData.person.middleName)?if_exists} ${(carrierPartyData.person.lastName)?if_exists} ${(carrierPartyData.partyGroup.groupName)?if_exists} [${carrierPartyData.party.partyId}]</option> - </#list> - </select> - <select name="shipmentMethodTypeId" class="selectBox"> - <#list shipmentMethodTypes as shipmentMethodTypeOption> - <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> - </#list> - </select> - <br/> - <select name="originFacilityId" class="selectBox"> - <option value=""> </option> - <#list facilities as facility> - <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> - </#list> - </select> - <select name="destFacilityId" class="selectBox"> - <option value=""> </option> - <#list facilities as facility> - <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> - </#list> - </select> - <br/> - <input type="text" size="15" name="originContactMechId" value="" class="inputBox"/> - <input type="text" size="15" name="destContactMechId" value="" class="inputBox"/> - <br/> - <input type="text" size="15" name="originTelecomNumberId" value="" class="inputBox"/> - <input type="text" size="15" name="destTelecomNumberId" value="" class="inputBox"/> - </td> - <td> - <select name="carrierServiceStatusId" class="selectBox"> - <option value=""> </option> - <#list carrierServiceStatusValidChangeToDetails?if_exists as carrierServiceStatusValidChangeToDetail> - <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> - </#list> - </select> - <br/> - <input type="text" size="24" name="trackingIdNumber" value="" class="inputBox"/> - <br/> - <input type="text" size="25" name="estimatedStartDate" value="" class="inputBox"/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <input type="text" size="25" name="estimatedArrivalDate" value="" class="inputBox"/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <br/> - <input type="text" size="25" name="actualStartDate" value="" class="inputBox"/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <input type="text" size="25" name="actualArrivalDate" value="" class="inputBox"/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - </td> - <td> - <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)?if_exists}" class="inputBox"/> - <select name="billingWeightUomId" class="selectBox"> - <option value=""> </option> - <#list weightUoms as weightUom> - <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> - </#list> - </select> - <br/> - <select name="currencyUomId" class="selectBox"> - <option value=""> </option> - <#list currencyUoms as altCurrencyUom> - <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> - </#list> - </select> - <br/> - <input type="text" size="8" name="actualTransportCost" class="inputBox"/> - <br/> - <input type="text" size="8" name="actualServiceCost" class="inputBox"/> - <br/> - <input type="text" size="8" name="actualOtherCost" class="inputBox"/> - <br/> - <input type="text" size="8" name="actualCost" class="inputBox"/> - </td> - <td><a href="javascript:document.createShipmentRouteSegmentForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a></td> - <td> </td> - </tr> -</form> -</table> + <#-- + <tr> + <form action="<@ofbizUrl>createRouteSegmentShipmentPackage</@ofbizUrl>" name="createShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> + <td> </td> + <td> + <div>${uiLabelMap.ProductAddPackageInfo} : + <select name="shipmentPackageSeqId"> + <#list shipmentPackages as shipmentPackage> + <option>${shipmentPackage.shipmentPackageSeqId}</option> + </#list> + </select> + </div> + </td> + <td><span class="label">Track#:</span><input type="text" size="22" name="trackingCode"/></td> + <td><span class="label">Box#:</span><input type="text" size="5" name="boxNumber"/></td> + <td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td> + <td> </td> + </form> + </tr> + --> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </div> +</div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleAddShipmentRouteSegment}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" class="basic-table"> + <form action="<@ofbizUrl>createShipmentRouteSegment</@ofbizUrl>" name="createShipmentRouteSegmentForm"> + <input type="hidden" name="shipmentId" value="${shipmentId}"/> + <tr> + <td valign="top"> + <div> + <span class="label">${uiLabelMap.ProductNewSegment}</span> + <br/> + <a href="javascript:document.createShipmentRouteSegmentForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a> + </div> + </td> + <td valign="top"> + <div> + <select name="carrierPartyId"> + <option value=""> </option> + <#list carrierPartyDatas as carrierPartyData> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)?if_exists} ${(carrierPartyData.person.middleName)?if_exists} ${(carrierPartyData.person.lastName)?if_exists} ${(carrierPartyData.partyGroup.groupName)?if_exists} [${carrierPartyData.party.partyId}]</option> + </#list> + </select> + <select name="shipmentMethodTypeId"> + <#list shipmentMethodTypes as shipmentMethodTypeOption> + <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> + </#list> + </select> + <br/> + <select name="originFacilityId"> + <option value=""> </option> + <#list facilities as facility> + <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> + </#list> + </select> + <select name="destFacilityId"> + <option value=""> </option> + <#list facilities as facility> + <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> + </#list> + </select> + <br/> + <input type="text" size="15" name="originContactMechId" value=""/> + <input type="text" size="15" name="destContactMechId" value=""/> + <br/> + <input type="text" size="15" name="originTelecomNumberId" value=""/> + <input type="text" size="15" name="destTelecomNumberId" value=""/> + </div> + </td> + <td valign="top"> + <select name="carrierServiceStatusId"> + <option value=""> </option> + <#list carrierServiceStatusValidChangeToDetails?if_exists as carrierServiceStatusValidChangeToDetail> + <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> + </#list> + </select> + <br/> + <input type="text" size="24" name="trackingIdNumber" value=""/> + <br/> + <input type="text" size="25" name="estimatedStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + <input type="text" size="25" name="estimatedArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + <br/> + <input type="text" size="25" name="actualStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + <input type="text" size="25" name="actualArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> + </td> + <td valign="top"> + <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)?if_exists}"/> + <select name="billingWeightUomId"> + <option value=""> </option> + <#list weightUoms as weightUom> + <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> + </#list> + </select> + <br/> + <select name="currencyUomId"> + <option value=""> </option> + <#list currencyUoms as altCurrencyUom> + <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> + </#list> + </select> + <br/> + <input type="text" size="8" name="actualTransportCost"/> + <br/> + <input type="text" size="8" name="actualServiceCost"/> + <br/> + <input type="text" size="8" name="actualOtherCost"/> + <br/> + <input type="text" size="8" name="actualCost"/> + </td> + </tr> + </form> + </table> + </div> +</div> <#else> - <h3>${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</h3> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + </ul> + <br class="clear"/> + </div> +</div> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=609235&r1=609234&r2=609235&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Sat Jan 5 15:17:57 2008 @@ -29,39 +29,32 @@ } // --> </script> - -<form method="post" name="lookupShipmentForm" action="<@ofbizUrl>FindShipment</@ofbizUrl>"> -<input type="hidden" name="lookupFlag" value="Y"> -<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside"> - <tr> - <td width="100%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop"> - <tr> - <td><div class="boxhead">${uiLabelMap.ProductFindShipment}</div></td> - <td align="right"> - <div class="tabletext"> - <#if requestParameters.facilityId?has_content> - <a href="<@ofbizUrl>quickShipOrder?facilityId=${requestParameters.facilityId}</@ofbizUrl>" class="submenutext">${uiLabelMap.ProductQuickShipOrder}</a></#if> - <a href="<@ofbizUrl>EditShipment</@ofbizUrl>" class="submenutext">${uiLabelMap.ProductNewShipment}</a> - <a href="javascript:lookupShipments();" class="submenutextright">${uiLabelMap.ProductLookupShipment}</a> - </div> - </td> - </tr> - </table> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="boxbottom"> - <tr> - <td align="center" width="100%"> - <table border="0" cellspacing="0" cellpadding="2"> +<div id="findOrders" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductFindShipment}</li> + <#if requestParameters.facilityId?has_content> + <li><a href="<@ofbizUrl>quickShipOrder?facilityId=${requestParameters.facilityId}</@ofbizUrl>">${uiLabelMap.ProductQuickShipOrder}</a></li> + </#if> + <li><a href="<@ofbizUrl>EditShipment</@ofbizUrl>">${uiLabelMap.ProductNewShipment}</a></li> + <li><a href="javascript:lookupShipments();">${uiLabelMap.ProductLookupShipment}</a></li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <form method="post" name="lookupShipmentForm" action="<@ofbizUrl>FindShipment</@ofbizUrl>"> + <input type="hidden" name="lookupFlag" value="Y"> + <table cellspacing="0" cellpadding="2" class="basic-table"> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductShipmentId} :</div></td> + <td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentId}</td> <td width="5%"> </td> - <td><input type="text" class="inputBox" name="shipmentId" value="${shipmentId?if_exists}"></td> + <td><input type="text" name="shipmentId" value="${shipmentId?if_exists}"></td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductShipmentType} :</div></td> + <td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td> <td width="5%"> </td> <td> - <select name="shipmentTypeId" class="selectBox"> + <select name="shipmentTypeId"> <#if currentShipmentType?has_content> <option value="${currentShipmentType.shipmentTypeId}">${currentShipmentType.get("description",locale)}</option> <option value="${currentShipmentType.shipmentTypeId}">---</option> @@ -74,10 +67,10 @@ </td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductOriginFacility} :</div></td> + <td width="25%" align="right" class="label">${uiLabelMap.ProductOriginFacility}</td> <td width="5%"> </td> <td> - <select name="originFacilityId" class="selectBox"> + <select name="originFacilityId"> <#if currentOriginFacility?has_content> <option value="${currentOriginFacility.facilityId}">${currentOriginFacility.facilityName} [${currentOriginFacility.facilityId}]</option> <option value="${currentOriginFacility.facilityId}">---</option> @@ -90,10 +83,10 @@ </td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductDestinationFacility} :</div></td> + <td width="25%" align="right" class="label">${uiLabelMap.ProductDestinationFacility}</td> <td width="5%"> </td> <td> - <select name="destinationFacilityId" class="selectBox"> + <select name="destinationFacilityId"> <#if currentDestinationFacility?has_content> <option value="${currentDestinationFacility.facilityId}">${currentDestinationFacility.facilityName} [${currentDestinationFacility.facilityId}]</option> <option value="${currentDestinationFacility.facilityId}">---</option> @@ -106,10 +99,10 @@ </td> </tr> <tr> - <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.ProductStatus} :</div></td> + <td width="25%" align="right" class="label">${uiLabelMap.ProductStatus}</td> <td width="5%"> </td> <td> - <select name="statusId" class="selectBox"> + <select name="statusId"> <#if currentStatus?has_content> <option value="${currentStatus.statusId}">${currentStatus.get("description",locale)}</option> <option value="${currentStatus.statusId}">---</option> @@ -123,119 +116,96 @@ <#list purchaseShipmentStatuses as shipmentStatus> <option value="${shipmentStatus.statusId}">${shipmentStatus.get("description",locale)}</option> </#list> - </select> </td> </tr> <tr> - <td width="25%" align="right"> - <div class="tableheadtext">${uiLabelMap.ProductDateFilter} :</div> - </td> + <td width="25%" align="right" class="label">${uiLabelMap.ProductDateFilter}</td> <td width="5%"> </td> <td> - <table border="0" cellspacing="0" cellpadding="0"> + <table cellspacing="0" class="basic-table"> <tr> <td> - <input type="text" size="25" class="inputBox" name="minDate" value="${requestParameters.minDate?if_exists}"> + <input type="text" size="25" name="minDate" value="${requestParameters.minDate?if_exists}"> <a href="javascript:call_cal(document.lookupShipmentForm.minDate, '${fromDateStr}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <span class="tabletext">${uiLabelMap.CommonFrom}</span> + <span class="label">${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td> - <input type="text" size="25" class="inputBox" name="maxDate" value="${requestParameters.maxDate?if_exists}"> + <input type="text" size="25" name="maxDate" value="${requestParameters.maxDate?if_exists}"> <a href="javascript:call_cal(document.lookupShipmentForm.maxDate, '${thruDateStr}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <span class="tabletext">${uiLabelMap.CommonThru}</span> + <span class="label">${uiLabelMap.CommonThru}</span> </td> </tr> </table> </td> </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> -</table> -</form> - - + </table> + </form> + </div> +</div> <#if shipmentList?exists> -<br/> -<table border="0" width="100%" cellspacing="0" cellpadding="0" class="boxoutside"> - <tr> - <td width="100%"> - <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop"> - <tr> - <td width="50%"><div class="boxhead">${uiLabelMap.ProductShipmentsFound}</div></td> - <td width="50%"> - <div class="boxhead" align="right"> - <#if 0 < shipmentList?size> +<div id="findOrders" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.ProductShipmentsFound}</li> + <#if 0 < shipmentList?size> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${paramList}&lookupFlag=Y</@ofbizUrl>" class="submenutext">${uiLabelMap.CommonPrevious}</a> + <li><a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}${paramList}&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li> <#else> - <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span> + <li>${uiLabelMap.CommonPrevious}</li> </#if> <#if (listSize > 0)> - <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</li> </#if> <#if (listSize > highIndex)> - <a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${paramList}&lookupFlag=Y</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a> + <li><a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${paramList}&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li> <#else> - <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span> + <li>${uiLabelMap.CommonNext}</li> </#if> - </#if> - - </div> - </td> - </tr> - </table> - <table width="100%" border="0" cellspacing="0" cellpadding="2" class="boxbottom"> - <tr> - <td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.ProductShipmentId}</div></td> - <td width="15%" align="left"><div class="tableheadtext">${uiLabelMap.ProductShipmentType}</div></td> - <td width="10%" align="left"><div class="tableheadtext">${uiLabelMap.ProductStatus}</div></td> - <td width="25%" align="left"><div class="tableheadtext">${uiLabelMap.ProductOriginFacility}</div></td> - <td width="25%" align="left"><div class="tableheadtext">${uiLabelMap.ProductDestFacility}</div></td> - <td width="15%" align="left"><div class="tableheadtext">${uiLabelMap.ProductShipDate}</div></td> + </#if> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table cellspacing="0" cellpadding="2" class="basic-table hover-bar"> + <tr class="header-row"> + <td width="5%" align="left">${uiLabelMap.ProductShipmentId}</td> + <td width="15%" align="left">${uiLabelMap.ProductShipmentType}</td> + <td width="10%" align="left">${uiLabelMap.ProductStatus}</td> + <td width="25%" align="left">${uiLabelMap.ProductOriginFacility}</td> + <td width="25%" align="left">${uiLabelMap.ProductDestFacility}</td> + <td width="15%" align="left">${uiLabelMap.ProductShipDate}</td> <td width="5%"> </td> - </tr> - <tr> - <td colspan="10"><hr class="sepbar"></td> - </tr> + </tr> <#if shipmentList?has_content> - <#assign rowClass = "viewManyTR2"> + <#assign alt_row = false> <#list shipmentList as shipment> <#assign originFacility = shipment.getRelatedOneCache("OriginFacility")?if_exists> <#assign destinationFacility = shipment.getRelatedOneCache("DestinationFacility")?if_exists> <#assign statusItem = shipment.getRelatedOneCache("StatusItem")> <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")?if_exists> - <tr class="${rowClass}"> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${shipment.shipmentId}</a></td> - <td><div class="tabletext">${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</div></td> - <td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td> - <td><div class="tabletext">${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</div></td> - <td><div class="tabletext">${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</div></td> - <td><div class="tabletext"><span style="white-space: nowrap;">${(shipment.estimatedShipDate.toString())?if_exists}</span></div></td> + <td>${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</td> + <td>${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</td> + <td>${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</td> + <td>${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</td> + <td><span style="white-space: nowrap;">${(shipment.estimatedShipDate.toString())?if_exists}</span></td> <td align="right"> <a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a> </td> </tr> <#-- toggle the row color --> - <#if rowClass == "viewManyTR2"> - <#assign rowClass = "viewManyTR1"> - <#else> - <#assign rowClass = "viewManyTR2"> - </#if> + <#assign alt_row = !alt_row> </#list> <#else> <tr> - <td colspan="4"><h3>${uiLabelMap.ProductNoShipmentsFound}.</h3></td> + <td colspan="7"><h3>${uiLabelMap.ProductNoShipmentsFound}.</h3></td> </tr> </#if> - </table> - </td> - </tr> -</table> -</#if> + </table> + </div> +</div> +</#if> \ No newline at end of file |
Free forum by Nabble | Edit this page |