svn commit: r1618554 [22/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [22/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if shipment?exists> +<#if shipment??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -56,20 +56,20 @@ under the License. <#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> + <#assign shipmentPackageRouteSegs = shipmentRouteSegmentData.shipmentPackageRouteSegs!> + <#assign originFacility = shipmentRouteSegmentData.originFacility!> + <#assign destFacility = shipmentRouteSegmentData.destFacility!> + <#assign shipmentMethodType = shipmentRouteSegmentData.shipmentMethodType!> + <#assign carrierPerson = shipmentRouteSegmentData.carrierPerson!> + <#assign carrierPartyGroup = shipmentRouteSegmentData.carrierPartyGroup!> + <#assign originPostalAddress = shipmentRouteSegmentData.originPostalAddress!> + <#assign destPostalAddress = shipmentRouteSegmentData.destPostalAddress!> + <#assign originTelecomNumber = shipmentRouteSegmentData.originTelecomNumber!> + <#assign destTelecomNumber = shipmentRouteSegmentData.destTelecomNumber!> + <#assign carrierServiceStatusItem = shipmentRouteSegmentData.carrierServiceStatusItem!> + <#assign currencyUom = shipmentRouteSegmentData.currencyUom!> + <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom!> + <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails!> <form name="duplicateShipmentRouteSegment_${shipmentRouteSegmentData_index}" method="post" action="<@ofbizUrl>duplicateShipmentRouteSegment</@ofbizUrl>"> <input type="hidden" name="shipmentId" value="${shipmentRouteSegment.shipmentId}"/> <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}"/> @@ -97,13 +97,13 @@ under the License. <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}">${(carrierPerson.firstName)!} ${(carrierPerson.middleName)!} ${(carrierPerson.lastName)!} ${(carrierPartyGroup.groupName)!} [${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> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)!} ${(carrierPartyData.person.middleName)!} ${(carrierPartyData.person.lastName)!} ${(carrierPartyData.partyGroup.groupName)!} [${carrierPartyData.party.partyId}]</option> </#list> </select> <select name="shipmentMethodTypeId"> @@ -142,74 +142,74 @@ under the License. </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> + <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId!}"/> + <#if originPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${originPostalAddress.toName!}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName!}, ${originPostalAddress.address1!}, ${originPostalAddress.address2!}, ${originPostalAddress.city!}, ${originPostalAddress.stateProvinceGeoId!}, ${originPostalAddress.postalCode!}, ${originPostalAddress.countryGeoId!}</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> + <input type="text" size="15" name="destContactMechId" value="${shipmentRouteSegment.destContactMechId!}"/> + <#if destPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${destPostalAddress.toName!},${uiLabelMap.CommonAttn}: ${destPostalAddress.attnName!}, ${destPostalAddress.address1!}, ${destPostalAddress.address2!}, ${destPostalAddress.city!}, ${destPostalAddress.stateProvinceGeoId!}, ${destPostalAddress.postalCode!}, ${destPostalAddress.countryGeoId!}</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> + <input type="text" size="15" name="originTelecomNumberId" value="${shipmentRouteSegment.originTelecomNumberId!}"/> + <#if originTelecomNumber?has_content><span class="tooltip">${originTelecomNumber.countryCode!} ${originTelecomNumber.areaCode!} ${originTelecomNumber.contactNumber!}</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> + <input type="text" size="15" name="destTelecomNumberId" value="${shipmentRouteSegment.destTelecomNumberId!}"/> + <#if destTelecomNumber?has_content><span class="tooltip">${destTelecomNumber.countryCode!} ${destTelecomNumber.areaCode!} ${destTelecomNumber.contactNumber!}</span></#if> </div> <div> - <input type="text" size="15" name="thirdPartyAccountNumber" value="${shipmentRouteSegment.thirdPartyAccountNumber?if_exists}"/> + <input type="text" size="15" name="thirdPartyAccountNumber" value="${shipmentRouteSegment.thirdPartyAccountNumber!}"/> </div> <div> - <input type="text" size="15" name="thirdPartyPostalCode" value="${shipmentRouteSegment.thirdPartyPostalCode?if_exists}"/> + <input type="text" size="15" name="thirdPartyPostalCode" value="${shipmentRouteSegment.thirdPartyPostalCode!}"/> </div> <div> - <input type="text" size="15" name="thirdPartyCountryGeoCode" value="${shipmentRouteSegment.thirdPartyCountryGeoCode?if_exists}"/> + <input type="text" size="15" name="thirdPartyCountryGeoCode" value="${shipmentRouteSegment.thirdPartyCountryGeoCode!}"/> </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> + <#if "UPS" == shipmentRouteSegment.carrierPartyId!> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.upsShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> <br /> ${uiLabelMap.ProductShipmentUpsResidential}: <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")} /> - <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> - <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> + <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.upsTrackShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductTrackUpsShipment}</a> <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" 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> + <#if "DHL" == shipmentRouteSegment.carrierPartyId!> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.dhlShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" 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> + <#if "FEDEX" == shipmentRouteSegment.carrierPartyId!> + <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId!> <a href="javascript:document.fedexShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a> <br /> - <#if shipmentMethodType?exists && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> + <#if shipmentMethodType?? && 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> - <@htmlTemplate.renderDateTimeField name="homeDeliveryDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.homeDeliveryDate.toString())?if_exists}" size="25" maxlength="30" id="homeDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="homeDeliveryDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.homeDeliveryDate.toString())!}" size="25" maxlength="30" id="homeDeliveryDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#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> + <#if shipmentRouteSegment.homeDeliveryDate??> (${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")}) </#if> <br /> @@ -228,17 +228,17 @@ under the License. </#list> </select> <br /> - <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> + <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber!}"/> <br /> - <@htmlTemplate.renderDateTimeField name="estimatedStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="estimatedArrivalDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedStartDate.toString())!}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="estimatedArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())!}" size="25" maxlength="30" id="estimatedArrivalDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <br /> - <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}" size="25" maxlength="30" id="actualStartDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}" size="25" maxlength="30" id="actualArrivalDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualStartDate.toString())!}" size="25" maxlength="30" id="actualStartDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(shipmentRouteSegment.actualArrivalDate.toString())!}" size="25" maxlength="30" id="actualArrivalDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> <td valign="top"> - <input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight?if_exists}"/> + <input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight!}"/> <select name="billingWeightUomId"> <#if billingWeightUom?has_content> <option value="${billingWeightUom.uomId}">${billingWeightUom.get("description",locale)} [${billingWeightUom.abbreviation}]</option> @@ -263,13 +263,13 @@ under the License. </#list> </select> <br /> - <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost?if_exists}"/> + <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost!}"/> <br /> - <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost?if_exists}"/> + <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost!}"/> <br /> - <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost?if_exists}"/> + <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost!}"/> <br /> - <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost?if_exists}"/> + <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost!}"/> </td> </tr> </form> @@ -309,16 +309,16 @@ under the License. <td valign="top"> <div> <span class="label">${uiLabelMap.ProductPackage}</span> ${shipmentPackageRouteSeg.shipmentPackageSeqId} - <#if shipmentPackageRouteSeg.labelImage?exists> + <#if shipmentPackageRouteSeg.labelImage??> <a href="javascript:document.viewShipmentPackageRouteSegLabelImage_${shipmentRouteSegmentData_index}_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a> </#if> - <span class="label">${uiLabelMap.ProductTrack} ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/> + <span class="label">${uiLabelMap.ProductTrack} ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode!}"/> </div> </td> <td valign="top"> <div> <span class="label">${uiLabelMap.ProductBox} ${uiLabelMap.CommonNbr}</span> - <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}"/> + <input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber!}"/> </div> </td> <td valign="top"> @@ -392,7 +392,7 @@ under the License. <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> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)!} ${(carrierPartyData.person.middleName)!} ${(carrierPartyData.person.lastName)!} ${(carrierPartyData.partyGroup.groupName)!} [${carrierPartyData.party.partyId}]</option> </#list> </select> <select name="shipmentMethodTypeId"> @@ -424,7 +424,7 @@ under the License. <td valign="top"> <select name="carrierServiceStatusId"> <option value=""> </option> - <#list carrierServiceStatusValidChangeToDetails?if_exists as carrierServiceStatusValidChangeToDetail> + <#list carrierServiceStatusValidChangeToDetails! as carrierServiceStatusValidChangeToDetail> <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> </#list> </select> @@ -438,7 +438,7 @@ under the License. <@htmlTemplate.renderDateTimeField name="actualArrivalDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualArrivalDate3" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> <td valign="top"> - <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)?if_exists}"/> + <input type="text" size="5" name="billingWeight" value="${(shipmentRouteSegment.billingWeight)!}"/> <select name="billingWeightUomId"> <option value=""> </option> <#list weightUoms as weightUom> @@ -470,7 +470,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId!}]</li> </ul> <br class="clear"/> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/FindShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/FindShipment.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/FindShipment.ftl Mon Aug 18 07:42:27 2014 @@ -48,7 +48,7 @@ function lookupShipments() { <tr> <td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentId}</td> <td width="5%"> </td> - <td><input type="text" name="shipmentId" value="${shipmentId?if_exists}" /></td> + <td><input type="text" name="shipmentId" value="${shipmentId!}" /></td> </tr> <tr> <td width="25%" align="right" class="label">${uiLabelMap.ProductShipmentType}</td> @@ -133,13 +133,13 @@ function lookupShipments() { <table cellspacing="0" class="basic-table"> <tr> <td> - <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.minDate?if_exists}" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="minDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.minDate!}" size="25" maxlength="30" id="minDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class="label">${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td> - <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.maxDate?if_exists}" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="maxDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.maxDate!}" size="25" maxlength="30" id="maxDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span class="label">${uiLabelMap.CommonThru}</span> </td> </tr> @@ -150,7 +150,7 @@ function lookupShipments() { </form> </div> </div> -<#if shipmentList?exists> +<#if shipmentList??> <div id="findOrders_2" class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -185,17 +185,17 @@ function lookupShipments() { <#if shipmentList?has_content> <#assign alt_row = false> <#list shipmentList as shipment> - <#assign originFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.originFacilityId), true)?if_exists /> - <#assign destinationFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.destinationFacilityId), true)?if_exists /> - <#assign statusItem = delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", shipment.statusId), true)?if_exists/> - <#assign shipmentType = delegator.findOne("ShipmentType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentTypeId", shipment.shipmentTypeId), true)?if_exists/> + <#assign originFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.originFacilityId), true)! /> + <#assign destinationFacility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", shipment.destinationFacilityId), true)! /> + <#assign statusItem = delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", shipment.statusId), true)!/> + <#assign shipmentType = delegator.findOne("ShipmentType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentTypeId", shipment.shipmentTypeId), true)!/> <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>${(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>${(originFacility.facilityName)!} [${shipment.originFacilityId!}]</td> + <td>${(destinationFacility.facilityName)!} [${shipment.destinationFacilityId!}]</td> + <td><span style="white-space: nowrap;">${(shipment.estimatedShipDate.toString())!}</span></td> <td align="right"> <a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl Mon Aug 18 07:42:27 2014 @@ -42,7 +42,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductPackOrder} in ${facility.facilityName?if_exists} [${facilityId?if_exists}]</li> + <li class="h3">${uiLabelMap.ProductPackOrder} in ${facility.facilityName!} [${facilityId!}]</li> </ul> <br class="clear"/> </div> @@ -70,13 +70,13 @@ under the License. <!-- select order form --> <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> <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="${orderId?if_exists}"/> + <input type="text" name="orderId" size="20" maxlength="20" value="${orderId!}"/> / <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/> </td> @@ -97,13 +97,13 @@ under the License. <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> <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}"/> + <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId!}"/> </td> <td><span class="label">${uiLabelMap.ProductHideGrid}</span> <input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></td> <td> </td> @@ -119,14 +119,14 @@ under the License. </table> </form> <form name="clearPackForm" method="post" action="<@ofbizUrl>ClearPackAll</@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="${facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> </form> <form name="incPkgSeq" method="post" action="<@ofbizUrl>SetNextPackageSeq</@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="${facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> </form> <form name="clearPackLineForm" method="post" action="<@ofbizUrl>ClearPackLine</@ofbizUrl>"> <input type="hidden" name="facilityId"/> @@ -172,7 +172,7 @@ under the License. ${postalAddress.address2} <br /> </#if> - ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} + ${postalAddress.city!}, ${postalAddress.stateProvinceGeoId!} ${postalAddress.postalCode!} <br /> ${postalAddress.countryGeoId!} <br /> @@ -199,7 +199,7 @@ under the License. <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span> <br /> <#if shipmentCostEstimateForShipGroup?exists> - <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/> + <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()!/> <br /> </#if> </td> @@ -220,7 +220,7 @@ under the License. <input type="hidden" name="packageSeq" value="${packingSession.getCurrentPackageSeq()}"/> <input type="hidden" name="orderId" value="${orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId}"/> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="hideGrid" value="${hideGrid}"/> <table cellpadding="2" cellspacing="0" class="basic-table"> <tr> @@ -244,14 +244,14 @@ under the License. </#if> <!-- auto grid form --> - <#assign itemInfos = packingSession.getItemInfos()?if_exists> + <#assign itemInfos = packingSession.getItemInfos()!> <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> <br /> <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="orderId" value="${orderId?if_exists}" /> - <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}" /> - <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="orderId" value="${orderId!}" /> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}" /> + <input type="hidden" name="originFacilityId" value="${facilityId!}" /> <input type="hidden" name="hideGrid" value="${hideGrid}"/> <table class="basic-table" cellspacing='0'> @@ -278,10 +278,10 @@ under the License. <#list itemInfos as itemInfo> <#-- <#list itemInfos as orderItem> --> <#assign orderItem = itemInfo.orderItem/> - <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)?if_exists> + <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)!> <#assign orderItemQuantity = itemInfo.quantity/> - <#assign orderProduct = orderItem.getRelatedOne("Product", false)?if_exists/> - <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)?if_exists/> + <#assign orderProduct = orderItem.getRelatedOne("Product", false)!/> + <#assign product = Static["org.ofbiz.product.product.ProductWorker"].findProduct(delegator, itemInfo.productId)!/> <#-- <#if orderItem.cancelQuantity?exists> <#assign orderItemQuantity = orderItem.quantity - orderItem.cancelQuantity> @@ -300,9 +300,9 @@ under the License. </#if> </td> <td> - <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a> + <a href="/catalog/control/EditProduct?productId=${orderProduct.productId!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)!}</a> <#if orderProduct.productId != product.productId> - [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>] + [<a href="/catalog/control/EditProduct?productId=${product.productId!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)!}</a>] </#if> </td> <td align="right">${orderItemQuantity}</td> @@ -346,7 +346,7 @@ under the License. <td align="right"> <input type="text" size="7" name="numPackages_${rowKey}" value="1" /> </td> - <input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId?if_exists}"/> + <input type="hidden" name="prd_${rowKey}" value="${itemInfo.productId!}"/> <input type="hidden" name="ite_${rowKey}" value="${orderItem.orderItemSeqId}"/> </tr> <#assign rowKey = rowKey + 1> @@ -368,9 +368,9 @@ under the License. <!-- complete form --> <#if showInput != "N"> <form name="completePackForm" method="post" action="<@ofbizUrl>CompletePack</@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="${facilityId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="forceComplete" value="${forceComplete?default('false')}"/> <input type="hidden" name="weightUomId" value="${defaultWeightUomId}"/> <input type="hidden" name="showInput" value="N"/> @@ -384,22 +384,22 @@ under the License. <br /> <#list packageSeqIds as packageSeqId> ${uiLabelMap.ProductPackage} ${packageSeqId} - <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}" /> + <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)!}" /> <br /> </#list> <#if orderItemShipGroup?has_content> - <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId?if_exists}"/> - <input type="hidden" name="shipmentMethodTypeId" value="${orderItemShipGroup.shipmentMethodTypeId?if_exists}"/> - <input type="hidden" name="carrierPartyId" value="${orderItemShipGroup.carrierPartyId?if_exists}"/> - <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId?if_exists}"/> - <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/> + <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId!}"/> + <input type="hidden" name="shipmentMethodTypeId" value="${orderItemShipGroup.shipmentMethodTypeId!}"/> + <input type="hidden" name="carrierPartyId" value="${orderItemShipGroup.carrierPartyId!}"/> + <input type="hidden" name="carrierRoleTypeId" value="${orderItemShipGroup.carrierRoleTypeId!}"/> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> </#if> </td> </#if> <td nowrap="nowrap"> <span class="label">${uiLabelMap.ProductAdditionalShippingCharge}:</span> <br /> - <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> + <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()!}" size="20"/> <#if packageSeqIds?has_content> <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> <br /> @@ -408,7 +408,7 @@ under the License. <td> <span class="label">${uiLabelMap.ProductHandlingInstructions}:</span> <br /> - <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> + <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()!}</textarea> </td> <td align="right"> <div> @@ -428,14 +428,14 @@ under the License. </div> <!-- display items in packages, per packed package and in order --> - <#assign linesByPackageResultMap = packingSession.getPackingSessionLinesByPackage()?if_exists> - <#assign packageMap = linesByPackageResultMap.get("packageMap")?if_exists> - <#assign sortedKeys = linesByPackageResultMap.get("sortedKeys")?if_exists> + <#assign linesByPackageResultMap = packingSession.getPackingSessionLinesByPackage()!> + <#assign packageMap = linesByPackageResultMap.get("packageMap")!> + <#assign sortedKeys = linesByPackageResultMap.get("sortedKeys")!> <#if ((packageMap?has_content) && (sortedKeys?has_content))> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductPackages} : ${sortedKeys.size()?if_exists}</li> + <li class="h3">${uiLabelMap.ProductPackages} : ${sortedKeys.size()!}</li> </ul> <br class="clear"/> </div> @@ -444,8 +444,8 @@ under the License. <#assign packedLines = packageMap.get(key)> <#if packedLines?has_content> <br /> - <#assign packedLine = packedLines.get(0)?if_exists> - <span class="label" style="font-size:1.2em">${uiLabelMap.ProductPackage} ${packedLine.getPackageSeq()?if_exists}</span> + <#assign packedLine = packedLines.get(0)!> + <span class="label" style="font-size:1.2em">${uiLabelMap.ProductPackage} ${packedLine.getPackageSeq()!}</span> <br /> <table class="basic-table" cellspacing='0'> <tr class="header-row"> @@ -464,11 +464,11 @@ under the License. <td>${line.getOrderItemSeqId()}</td> <td>${line.getProductId()?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName!?default("[N/A]")}</a> </td> <td>${line.getInventoryItemId()}</td> <td align="right">${line.getQuantity()}</td> - <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)?if_exists})</td> + <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)!})</td> <td align="right">${line.getPackageSeq()}</td> <td align="right"><a href="javascript:clearLine('${facilityId}', '${line.getOrderId()}', '${line.getOrderItemSeqId()}', '${line.getProductId()?default("")}', '${line.getShipGroupSeqId()}', '${line.getInventoryItemId()}', '${line.getPackageSeq()}')" class="buttontext">${uiLabelMap.CommonClear}</a></td> </tr> @@ -481,12 +481,12 @@ under the License. </#if> <!-- packed items display --> - <#assign packedLines = packingSession.getLines()?if_exists> + <#assign packedLines = packingSession.getLines()!> <#if packedLines?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ProductItems} (${uiLabelMap.ProductPackages}): ${packedLines.size()?if_exists}</li> + <li class="h3">${uiLabelMap.ProductItems} (${uiLabelMap.ProductPackages}): ${packedLines.size()!}</li> </ul> <br class="clear"/> </div> @@ -508,11 +508,11 @@ under the License. <td>${line.getOrderItemSeqId()}</td> <td>${line.getProductId()?default("N/A")}</td> <td> - <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a> + <a href="/catalog/control/EditProduct?productId=${line.getProductId()!}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName!?default("[N/A]")}</a> </td> <td>${line.getInventoryItemId()}</td> <td align="right">${line.getQuantity()}</td> - <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)?if_exists})</td> + <td align="right">${line.getWeight()} (${packingSession.getPackageWeight(line.getPackageSeq()?int)!})</td> <td align="right">${line.getPackageSeq()}</td> <td align="right"><a href="javascript:clearLine('${facilityId}', '${line.getOrderId()}', '${line.getOrderItemSeqId()}', '${line.getProductId()?default("")}', '${line.getShipGroupSeqId()}', '${line.getInventoryItemId()}', '${line.getPackageSeq()}')" class="buttontext">${uiLabelMap.CommonClear}</a></td> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl Mon Aug 18 07:42:27 2014 @@ -20,7 +20,7 @@ under the License. <#escape x as x?xml> <#if hasPermission> - <#assign shipGroup = shipment.getRelatedOne("PrimaryOrderItemShipGroup", false)?if_exists> + <#assign shipGroup = shipment.getRelatedOne("PrimaryOrderItemShipGroup", false)!> <#assign carrier = (shipGroup.carrierPartyId)?default("N/A")> <#if packages?has_content> <#list packages as package> @@ -54,15 +54,15 @@ under the License. <fo:table-cell padding="2pt"> <fo:block> <#if destinationPostalAddress?has_content> - <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName!}</fo:block> <#if destinationPostalAddress.attnName?has_content> - <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName!}</fo:block> </#if> - <fo:block>${destinationPostalAddress.address1?if_exists}</fo:block> - <fo:block>${destinationPostalAddress.address2?if_exists}</fo:block> + <fo:block>${destinationPostalAddress.address1!}</fo:block> + <fo:block>${destinationPostalAddress.address2!}</fo:block> <fo:block> - ${destinationPostalAddress.city?if_exists}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> - ${destinationPostalAddress.postalCode?if_exists} ${destinationPostalAddress.countryGeoId?if_exists} + ${destinationPostalAddress.city!}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> + ${destinationPostalAddress.postalCode!} ${destinationPostalAddress.countryGeoId!} </fo:block> </#if> </fo:block> @@ -72,13 +72,13 @@ under the License. <#if carrier != "_NA_"> ${carrier} </#if> - <#if (shipGroup.shipmentMethodTypeId)?exists> + <#if (shipGroup.shipmentMethodTypeId)??> ${(shipGroup.getRelatedOne("ShipmentMethodType", false).get("description", locale))?default(shipGroup.shipmentMethodTypeId)} </#if> </fo:block> </fo:table-cell> <fo:table-cell padding="2pt"> - <fo:block text-align="right">${shipment.handlingInstructions?if_exists}</fo:block> + <fo:block text-align="right">${shipment.handlingInstructions!}</fo:block> </fo:table-cell> </fo:table-row> </fo:table-body> @@ -148,7 +148,7 @@ under the License. <fo:table> <fo:table-column column-width="450pt"/> <fo:table-body> - <#if shipGroup.giftMessage?exists > + <#if shipGroup.giftMessage?? > <fo:table-row font-weight="bold"> <fo:table-cell> <fo:block>${uiLabelMap.OrderGiftMessage}</fo:block> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Mon Aug 18 07:42:27 2014 @@ -24,7 +24,7 @@ function setWeight(weight) { </script> <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> - <h1>${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]</h1> + <h1>${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName!} [${uiLabelMap.CommonId}:${facilityId!}]</h1> <div class="button-bar"> <a href="<@ofbizUrl>quickShipOrder?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNextShipment}</a> <#if shipment?has_content> @@ -32,26 +32,26 @@ function setWeight(weight) { </#if> </div> - <#if shipment?exists> + <#if shipment??> <#if 1 < shipmentPackages.size()> <#-- multiple packages --> <div><font color="red">${uiLabelMap.ProductMorePackageFoundShipment}.</font></div> <#else> <#-- single package --> - <#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))?if_exists> + <#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))!> <#if shipmentPackage?has_content> <#assign weight = (shipmentPackage.weight)?default(0.00)> - <#if (0 < weight?double) && !requestParameters.reweigh?exists> + <#if (0 < weight?double) && !requestParameters.reweigh??> <#if 1 < shipmentRoutes.size()> <#-- multiple routes --> <div><font color="red">${uiLabelMap.ProductMoreRouteSegmentFound}.</font></div> - <#elseif !requestParameters.shipmentRouteSegmentId?exists || requestAttributes._ERROR_MESSAGE_?exists> + <#elseif !requestParameters.shipmentRouteSegmentId?? || requestAttributes._ERROR_MESSAGE_??> <form name="routeForm" method="post" action="<@ofbizUrl>setQuickRouteInfo</@ofbizUrl>"> - <#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))?if_exists> - <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson", false))?if_exists> - <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup", false))?if_exists> - <#assign shipmentMethodType = (shipmentRoute.getRelatedOne("ShipmentMethodType", false))?if_exists> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))!> + <#assign carrierPerson = (shipmentRoute.getRelatedOne("CarrierPerson", false))!> + <#assign carrierPartyGroup = (shipmentRoute.getRelatedOne("CarrierPartyGroup", false))!> + <#assign shipmentMethodType = (shipmentRoute.getRelatedOne("ShipmentMethodType", false))!> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="shipmentId" value="${shipmentRoute.shipmentId}"/> <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRoute.shipmentRouteSegmentId}"/> <table border="0" cellpadding="2" cellspacing="0"> @@ -61,13 +61,13 @@ function setWeight(weight) { <td width="1%" nowrap="nowrap"> <select name="carrierPartyId"> <#if shipmentRoute.carrierPartyId?has_content> - <option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRoute.carrierPartyId}]</option> + <option value="${shipmentRoute.carrierPartyId}">${(carrierPerson.firstName)!} ${(carrierPerson.middleName)!} ${(carrierPerson.lastName)!} ${(carrierPartyGroup.groupName)!} [${shipmentRoute.carrierPartyId}]</option> <option value="${shipmentRoute.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> + <option value="${carrierPartyData.party.partyId}">${(carrierPartyData.person.firstName)!} ${(carrierPartyData.person.middleName)!} ${(carrierPartyData.person.lastName)!} ${(carrierPartyData.partyGroup.groupName)!} [${carrierPartyData.party.partyId}]</option> </#list> </select> </td> @@ -123,8 +123,8 @@ function setWeight(weight) { </#if> <#else> <form name="weightForm" method="post" action="<@ofbizUrl>setQuickPackageWeight</@ofbizUrl>"> - <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom", false)?if_exists> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <#assign weightUom = shipmentPackage.getRelatedOne("WeightUom", false)!> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="shipmentId" value="${shipmentPackage.shipmentId}"/> <input type="hidden" name="shipmentPackageSeqId" value="${shipmentPackage.shipmentPackageSeqId}"/> <table cellspacing="0" class="basic-table"> @@ -176,15 +176,15 @@ function setWeight(weight) { </#if> <#else> <form name="selectOrderForm" method="post" action="<@ofbizUrl>createQuickShipment</@ofbizUrl>"> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}" /> - <input type="hidden" name="originFacilityId" value="${facilityId?if_exists}" /> + <input type="hidden" name="facilityId" value="${facilityId!}" /> + <input type="hidden" name="originFacilityId" value="${facilityId!}" /> <input type="hidden" name="setPackedOnly" value="Y" /> <table border='0' cellpadding='2' cellspacing='0'> <tr> <td width="25%" align='right'><span class="label">${uiLabelMap.ProductOrderNumber}</span></td> <td width="1"> </td> <td width="25%"> - <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId?if_exists}" /> + <input type="text" name="orderId" size="20" maxlength="20" value="${requestParameters.orderId!}" /> </td> <td> </td> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if shipment?exists> +<#if shipment??> <#-- JS to populate the quantity_o_# field required by the chained issueOrderItemToShipment service --> <script type="text/javascript"> @@ -31,7 +31,7 @@ under the License. } </script> - <#assign productId = parameters.productId?if_exists/> + <#assign productId = parameters.productId!/> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -45,26 +45,26 @@ under the License. <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductErrorShipmentNotPurchaseShipment?interpret><@uiLabelWithVar/> </div> - <#elseif orderId?has_content && !orderHeader?exists> + <#elseif orderId?has_content && !orderHeader??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderIdNotFound?interpret><@uiLabelWithVar/> </div> - <#elseif orderHeader?exists && orderHeader.orderTypeId != "PURCHASE_ORDER"> + <#elseif orderHeader?? && orderHeader.orderTypeId != "PURCHASE_ORDER"> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductErrorOrderNotPurchaseOrder?interpret><@uiLabelWithVar/> </div> - <#elseif ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?exists> + <#elseif ProductReceiveInventoryAgainstPurchaseOrderProductNotFound??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?interpret><@uiLabelWithVar/> <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> - <#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?exists> + <#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive??> <div class="errorMessage"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?interpret><@uiLabelWithVar/> <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> </div> </#if> - <#if ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?exists> + <#if ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder??> <div class="errorMessage" style="color:green"> <#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?interpret><@uiLabelWithVar/> <script type="text/javascript">window.onload=function(){showErrorAlert("${uiLabelMap.CommonErrorMessage2}","<@uiLabelWithVar/>");};</script> @@ -75,21 +75,21 @@ under the License. <form name="ReceiveInventoryAgainstPurchaseOrder" action="<@ofbizUrl>ReceiveInventoryAgainstPurchaseOrder</@ofbizUrl>"> <input type="hidden" name="clearAll" value="Y"/> <div> - <span class="label">${uiLabelMap.ProductShipmentId}</span> <input type="text" size="20" name="shipmentId" value="${shipmentId?if_exists}"/> + <span class="label">${uiLabelMap.ProductShipmentId}</span> <input type="text" size="20" name="shipmentId" value="${shipmentId!}"/> <span class="label">${uiLabelMap.ProductOrderId}</span> <span> - <@htmlTemplate.lookupField value="${orderId?if_exists}" formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/> + <@htmlTemplate.lookupField value="${orderId!}" formName="ReceiveInventoryAgainstPurchaseOrder" name="purchaseOrderId" id="purchaseOrderId" fieldFormName="LookupOrderHeaderAndShipInfo"/> </span> - <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> + <span class="label">${uiLabelMap.ProductOrderShipGroupId}</span> <input type="text" size="20" name="shipGroupSeqId" value="${shipGroupSeqId!}"/> <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/> </div> </form> -<#if shipment?exists> +<#if shipment??> <#if isPurchaseShipment> <#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/> - <#if orderItemDatas?exists> + <#if orderItemDatas??> <br /> <#assign rowCount = 0> <#assign totalReadyToReceive = 0/> @@ -119,22 +119,22 @@ under the License. </#if> </tr> <#assign alt_row = false> - <#list orderItemDatas?if_exists as orderItemData> + <#list orderItemDatas! as orderItemData> <#assign orderItem = orderItemData.orderItem> - <#assign product = orderItemData.product?if_exists> - <#assign itemShipGroupSeqId = orderItemData.shipGroupSeqId?if_exists> + <#assign product = orderItemData.product!> + <#assign itemShipGroupSeqId = orderItemData.shipGroupSeqId!> <#assign totalQuantityReceived = orderItemData.totalQuantityReceived?default(0)> <#assign availableToReceive = orderItemData.availableToReceive?default(0)> <#assign backOrderedQuantity = orderItemData.backOrderedQuantity?default(0)> <#assign fulfilledReservations = orderItemData.fulfilledReservations> <tr id="orderItemData_tableRow_${rowCount}" valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td>${(product.internalName)?if_exists} [${orderItem.productId?default("N/A")}]</div></td> + <td>${(product.internalName)!} [${orderItem.productId?default("N/A")}]</div></td> <td> <div> <#assign upcaLookup = Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", product.productId, "goodIdentificationTypeId", "UPCA")/> - <#assign upca = delegator.findOne("GoodIdentification", upcaLookup, true)?if_exists/> + <#assign upca = delegator.findOne("GoodIdentification", upcaLookup, true)!/> <#if upca?has_content> - ${upca.idValue?if_exists} + ${upca.idValue!} </#if> </div> </td> @@ -158,20 +158,20 @@ under the License. </td> <#if availableToReceive > 0 > <td> - <input type="hidden" name="productId_o_${rowCount}" value="${(product.productId)?if_exists}"/> + <input type="hidden" name="productId_o_${rowCount}" value="${(product.productId)!}"/> <input type="hidden" name="facilityId_o_${rowCount}" value="${facilityId}"/> <input type="hidden" name="shipmentId_o_${rowCount}" value="${shipmentId}"/> <input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/> - <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${itemShipGroupSeqId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${itemShipGroupSeqId!}"/> <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> <input type="hidden" name="unitCost_o_${rowCount}" value="${orderItem.unitPrice?default(0)}"/> <input type="hidden" name="currencyUomId_o_${rowCount}" value="${currencyUomId?default("")}"/> - <input type="hidden" name="ownerPartyId_o_${rowCount}" value="${(facility.ownerPartyId)?if_exists}"/> + <input type="hidden" name="ownerPartyId_o_${rowCount}" value="${(facility.ownerPartyId)!}"/> <input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}"/> <input type="hidden" name="quantityRejected_o_${rowCount}" value="0"/> <#-- quantity field required by the chained issueOrderItemToShipment service --> <input type="hidden" name="quantity_o_${rowCount}" id="quantity_o_${rowCount}" value=""/> - <#if itemQuantitiesToReceive?exists && itemQuantitiesToReceive.get(orderItem.orderItemSeqId)?exists> + <#if itemQuantitiesToReceive?? && itemQuantitiesToReceive.get(orderItem.orderItemSeqId)??> <#assign quantityToReceive = itemQuantitiesToReceive.get(orderItem.orderItemSeqId)> <#else> <#assign quantityToReceive = 0> @@ -243,5 +243,5 @@ under the License. </div> </div> <#elseif parameters.shipmentId?has_content> - <h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId?if_exists}]</h3> + <h3>${uiLabelMap.ProductShipmentNotFoundId}: [${shipmentId!}]</h3> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl Mon Aug 18 07:42:27 2014 @@ -36,11 +36,11 @@ under the License. <fo:block>${uiLabelMap.ProductRouteSegment}: ${shipmentRouteSegment.shipmentRouteSegmentId}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="#D4D0C8"> - <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty", false)?if_exists> + <#assign carrierParty = shipmentRouteSegment.getRelatedOne("CarrierParty", false)!> <fo:block text-align="center">${uiLabelMap.ProductCarrier}: <#if carrierParty.description?has_content>${carrierParty.description}<#else>${carrierParty.partyId}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="#D4D0C8"> - <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType", false)?if_exists> + <#assign shipmentMethodType = shipmentRouteSegment.getRelatedOne("ShipmentMethodType", false)!> <fo:block text-align="right">${uiLabelMap.ProductShipmentMethod}: <#if shipmentMethodType?has_content>${shipmentMethodType.description}<#else>${uiLabelMap.CommonNA}</#if></fo:block> </fo:table-cell> </fo:table-row> @@ -50,15 +50,15 @@ under the License. <fo:table-cell padding="2pt"> <fo:block> <#if originPostalAddress?has_content> - <fo:block>${uiLabelMap.CommonFrom}: ${originPostalAddress.toName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonFrom}: ${originPostalAddress.toName!}</fo:block> <#if originPostalAddress.attnName?has_content> - <fo:block>${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName!}</fo:block> </#if> - <fo:block>${originPostalAddress.address1?if_exists}</fo:block> - <fo:block>${originPostalAddress.address2?if_exists}</fo:block> + <fo:block>${originPostalAddress.address1!}</fo:block> + <fo:block>${originPostalAddress.address2!}</fo:block> <fo:block> - ${originPostalAddress.city?if_exists}<#if originPostalAddress.stateProvinceGeoId?has_content>, ${originPostalAddress.stateProvinceGeoId}</#if> - ${originPostalAddress.postalCode?if_exists} ${originPostalAddress.countryGeoId?if_exists} + ${originPostalAddress.city!}<#if originPostalAddress.stateProvinceGeoId?has_content>, ${originPostalAddress.stateProvinceGeoId}</#if> + ${originPostalAddress.postalCode!} ${originPostalAddress.countryGeoId!} </fo:block> </#if> </fo:block> @@ -66,15 +66,15 @@ under the License. <fo:table-cell padding="2pt"> <fo:block text-align="center"> <#if destinationPostalAddress?has_content> - <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName!}</fo:block> <#if destinationPostalAddress.attnName?has_content> - <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName!}</fo:block> </#if> - <fo:block>${destinationPostalAddress.address1?if_exists}</fo:block> - <fo:block>${destinationPostalAddress.address2?if_exists}</fo:block> + <fo:block>${destinationPostalAddress.address1!}</fo:block> + <fo:block>${destinationPostalAddress.address2!}</fo:block> <fo:block> - ${destinationPostalAddress.city?if_exists}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> - ${destinationPostalAddress.postalCode?if_exists} ${destinationPostalAddress.countryGeoId?if_exists} + ${destinationPostalAddress.city!}<#if destinationPostalAddress.stateProvinceGeoId?has_content>, ${destinationPostalAddress.stateProvinceGeoId}</#if> + ${destinationPostalAddress.postalCode!} ${destinationPostalAddress.countryGeoId!} </fo:block> </#if> </fo:block> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |