svn commit: r1618554 [12/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [12/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Aug 18 07:42:27 2014 @@ -48,7 +48,7 @@ under the License. } </script> -<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")> +<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (!orderHeader.salesChannelEnumId?? || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")> <div class="screenlet"> <div class="screenlet-title-bar"> <ul><li class="h3"> ${uiLabelMap.OrderActions}</li></ul> @@ -100,7 +100,7 @@ under the License. <li> <form name="receiveInventoryForm" action="/facility/control/ReceiveInventory" method="post"> <input type="hidden" name="initialSelected" value="Y"/> - <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/> + <input type="hidden" name="purchaseOrderId" value="${orderId!}"/> <select name="facilityId"> <#list ownedFacilities as facility> <option value="${facility.facilityId}">${facility.facilityName}</option> @@ -112,7 +112,7 @@ under the License. <li> <form name="partialReceiveInventoryForm" action="/facility/control/ReceiveInventory" method="post"> <input type="hidden" name="initialSelected" value="Y"/> - <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/> + <input type="hidden" name="purchaseOrderId" value="${orderId!}"/> <input type="hidden" name="partialReceive" value="Y"/> <select name="facilityId"> <#list ownedFacilities as facility> @@ -156,7 +156,7 @@ under the License. <li> <form name="quickreturn" method="post" action="<@ofbizUrl>quickreturn</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> - <input type="hidden" name="party_id" value="${partyId?if_exists}"/> + <input type="hidden" name="party_id" value="${partyId!}"/> <input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/> <input type="hidden" name="needsInventoryReceive" value="${needsInventoryReceive?default("N")}"/> </form> @@ -189,10 +189,10 @@ under the License. </div> </#if> -<#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")> +<#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?? || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")> <#list shipGroups as shipGroup> - <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)?if_exists> - <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists> + <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)!> + <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -204,10 +204,10 @@ under the License. </div> <div class="screenlet-body" id="ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}"> <form name="updateOrderItemShipGroup" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/> <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> - <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/> + <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/> <table class="basic-table" cellspacing='0'> <tr> <td align="right" valign="top" width="15%"> @@ -218,13 +218,13 @@ under the License. <div> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> <select name="contactMechId"> - <option selected="selected" value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> + <option selected="selected" value="${shipGroup.contactMechId!}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> <#if shippingContactMechList?has_content> <option disabled="disabled" value=""></option> <#list shippingContactMechList as shippingContactMech> - <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress", false)?if_exists> + <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress", false)!> <#if shippingContactMech.contactMechId?has_content> - <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option> + <option value="${shippingContactMech.contactMechId!}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option> </#if> </#list> </#if> @@ -252,18 +252,18 @@ under the License. --> <select name="shipmentMethod"> <#if shipGroup.shipmentMethodTypeId?has_content> - <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> + <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?? && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> </#if> <#list productStoreShipmentMethList as productStoreShipmentMethod> <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId> <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> - <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> + <option value="${shipmentMethodTypeAndParty!}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId!}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> </#if> </#list> </select> <#else> <#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_"> - ${shipGroup.carrierPartyId?if_exists} + ${shipGroup.carrierPartyId!} </#if> <#if shipmentMethodType?has_content> ${shipmentMethodType.get("description",locale)?default("")} @@ -296,10 +296,10 @@ under the License. </form> <div id="newShippingAddressForm" class="popup" style="display: none;"> <form id="addShippingAddress" name="addShippingAddress" method="post" action="addShippingAddress"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="partyId" value="${partyId?if_exists}"/> - <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${partyId!}"/> + <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/> <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> <div class="form-row"> <label for="address1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-address1" style="display: none" class="custom-advice">(required)</span></label> @@ -321,7 +321,7 @@ under the License. <label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> <div class="form-field"> <select name="shipToCountryGeoId" id="countryGeoId" class="required"> - <#if countryGeoId?exists> + <#if countryGeoId??> <option value="${countryGeoId}">${countryGeoId}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#countries")} @@ -396,8 +396,8 @@ under the License. <tr> <td> <#assign shipmentMethodAndAmount = shippingRate.shipmentMethodTypeId + "@" + "UPS" + "*" + shippingRate.rate> - <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount?if_exists}' /> - UPS ${shippingRate.shipmentMethodDescription?if_exists} + <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount!}' /> + UPS ${shippingRate.shipmentMethodDescription!} <#if (shippingRate.rate > -1)> <@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/> <#else> @@ -406,14 +406,14 @@ under the License. </td> </tr> </#list> - <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegmentId?if_exists}"/> - <input type="hidden" name="shipmentId" value="${pickedShipmentId?if_exists}"/> - <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegmentId!}"/> + <input type="hidden" name="shipmentId" value="${pickedShipmentId!}"/> + <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/> <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> - <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/> - <input type="hidden" name="shippingAmount" value="${shippingAmount?if_exists}"/> + <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/> + <input type="hidden" name="shippingAmount" value="${shippingAmount!}"/> <tr> <td valign="top" width="80%"> <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> @@ -441,7 +441,7 @@ under the License. </#if> <#if orderShipmentInfoSummaryList?has_content> <#list orderShipmentInfoSummaryList as orderShipmentInfoSummary> - <#if orderShipmentInfoSummary.shipGroupSeqId?if_exists == shipGroup.shipGroupSeqId?if_exists> + <#if orderShipmentInfoSummary.shipGroupSeqId! == shipGroup.shipGroupSeqId!> <div> <#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if> ${uiLabelMap.CommonIdCode}: ${orderShipmentInfoSummary.trackingCode?default("[${uiLabelMap.OrderNotYetKnown}]")} @@ -508,7 +508,7 @@ under the License. <a href="javascript:addInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addInstruction_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a> </#if> <a href="javascript:saveInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveInstruction_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a> - <textarea name="shippingInstructions" id="shippingInstructions_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions?if_exists}</textarea> + <textarea name="shippingInstructions" id="shippingInstructions_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions!}</textarea> </form> <#else> <#if shipGroup.shippingInstructions?has_content> @@ -537,7 +537,7 @@ under the License. <#else> <a href="javascript:addGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addGiftMessage_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a> </#if> - <textarea name="giftMessage" id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.giftMessage?if_exists}</textarea> + <textarea name="giftMessage" id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.giftMessage!}</textarea> <a href="javascript:saveGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveGiftMessage_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a> </form> </td> @@ -554,9 +554,9 @@ under the License. <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <br/> - <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> </form> </td> @@ -578,7 +578,7 @@ under the License. <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)> <#if shipmentRouteSegments?has_content> <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)> - <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists> + <#if "UPS" == (shipmentRouteSegment.carrierPartyId)!> <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a> </#if> <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>"> @@ -605,7 +605,7 @@ under the License. <#if orderHeader.orderTypeId == "SALES_ORDER"> <#if !shipGroup.supplierPartyId?has_content> <#if orderHeader.statusId == "ORDER_APPROVED"> - <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> + <a href="/facility/control/PackOrder?facilityId=${storeFacilityId!}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> <br /> </#if> <a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> @@ -613,8 +613,8 @@ under the License. <input type="hidden" name="primaryOrderId" value="${orderId}"/> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <input type="hidden" name="statusId" value="SHIPMENT_INPUT" /> - <input type="hidden" name="facilityId" value="${storeFacilityId?if_exists}" /> - <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate?if_exists}"/> + <input type="hidden" name="facilityId" value="${storeFacilityId!}" /> + <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate!}"/> </form> </#if> <#else> @@ -627,8 +627,8 @@ under the License. <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/> <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/> <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/> - <input type="hidden" name="estimatedShipDate" value="${shipGroup.estimatedShipDate?if_exists}"/> - <input type="hidden" name="estimatedArrivalDate" value="${shipGroup.estimatedDeliveryDate?if_exists}"/> + <input type="hidden" name="estimatedShipDate" value="${shipGroup.estimatedShipDate!}"/> + <input type="hidden" name="estimatedArrivalDate" value="${shipGroup.estimatedDeliveryDate!}"/> <select name="destinationFacilityId"> <#list facilities as facility> <option value="${facility.facilityId}">${facility.facilityName}</option> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/receivepayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/receivepayment.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/receivepayment.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/receivepayment.ftl Mon Aug 18 07:42:27 2014 @@ -30,7 +30,7 @@ under the License. <a href="javascript:document.paysetupform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> <form method="post" action="<@ofbizUrl>receiveOfflinePayments/${donePage}</@ofbizUrl>" name="paysetupform"> - <#if requestParameters.workEffortId?exists> + <#if requestParameters.workEffortId??> <input type="hidden" name="workEffortId" value="${requestParameters.workEffortId}" /> </#if> <input type="hidden" name="partyId" value="${orderRoles[0].partyId}" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Mon Aug 18 07:42:27 2014 @@ -30,11 +30,11 @@ under the License. <a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a> <br /> <form method="post" action="<@ofbizUrl>sendconfirmationmail/${donePage}</@ofbizUrl>" name="sendConfirmationForm"> - <input type="hidden" name="orderId" value="${orderId?if_exists}" /> - <#if ! productStoreEmailSetting?exists> + <input type="hidden" name="orderId" value="${orderId!}" /> + <#if ! productStoreEmailSetting??> <#assign productStoreEmailSetting = {} /> </#if> - <input type="hidden" name="partyId" value="${partyId?if_exists}" /> + <input type="hidden" name="partyId" value="${partyId!}" /> <input type="hidden" name="contentType" value="${productStoreEmailSetting.contentType?default("")}" /> <table class="basic-table" cellspacing='0'> <tr> @@ -65,7 +65,7 @@ under the License. <tr> <td width="26%" align="right" class="label">${uiLabelMap.CommonFrom} </td> <td width="54%"> - <#if productStoreEmailSetting.fromAddress?exists> + <#if productStoreEmailSetting.fromAddress??> <input type="hidden" name="sendFrom" value="${productStoreEmailSetting.fromAddress}" /> <#else> <input type="text" size="40" name="sendFrom" value="" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl Mon Aug 18 07:42:27 2014 @@ -68,26 +68,26 @@ under the License. <fo:table-body> <fo:table-row> <fo:table-cell number-rows-spanned="4"> - <#assign address = data.address?if_exists> - <fo:block>${uiLabelMap.CommonTo}: ${address.toName?if_exists}</fo:block> + <#assign address = data.address!> + <fo:block>${uiLabelMap.CommonTo}: ${address.toName!}</fo:block> <#if address.attnName?has_content> - <fo:block>${uiLabelMap.CommonAttn}: ${address.attnName?if_exists}</fo:block> + <fo:block>${uiLabelMap.CommonAttn}: ${address.attnName!}</fo:block> </#if> - <fo:block>${address.address1?if_exists}</fo:block> - <fo:block>${address.address2?if_exists}</fo:block> + <fo:block>${address.address1!}</fo:block> + <fo:block>${address.address2!}</fo:block> <fo:block> - ${address.city?if_exists}<#if address.stateProvinceGeoId?has_content>, ${address.stateProvinceGeoId}</#if> - ${address.postalCode?if_exists} ${address.countryGeoId?if_exists} + ${address.city!}<#if address.stateProvinceGeoId?has_content>, ${address.stateProvinceGeoId}</#if> + ${address.postalCode!} ${address.countryGeoId!} </fo:block> - <#if data.phoneNumber?exists> - <fo:block><#if data.phoneNumber.areaCode?exists>(${data.phoneNumber.areaCode}) </#if>${data.phoneNumber.contactNumber}</fo:block> + <#if data.phoneNumber??> + <fo:block><#if data.phoneNumber.areaCode??>(${data.phoneNumber.areaCode}) </#if>${data.phoneNumber.contactNumber}</fo:block> </#if> </fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.ProductShipmentMethod}</fo:block></fo:table-cell> - <fo:table-cell><#if data.carrierShipmentMethod?exists><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></#if></fo:table-cell> + <fo:table-cell><#if data.carrierShipmentMethod??><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></#if></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block font-weight="bold">${uiLabelMap.OrderShipBeforeDate}</fo:block></fo:table-cell> @@ -141,7 +141,7 @@ under the License. <fo:block>${line.product.productId}</fo:block> </fo:table-cell> <fo:table-cell background-color="${rowColor}"> - <fo:block>${line.orderItem.itemDescription?if_exists}</fo:block> + <fo:block>${line.orderItem.itemDescription!}</fo:block> </fo:table-cell> <fo:table-cell background-color="${rowColor}"> <fo:block text-align="right">${line.quantityInGroup?default(0)}</fo:block> @@ -155,7 +155,7 @@ under the License. </fo:table-row> - <#list line.expandedList?if_exists as expandedLine> + <#list line.expandedList! as expandedLine> <fo:table-row> <fo:table-cell background-color="${rowColor}" font-style="italic"> <fo:block margin-left="20pt">${expandedLine.product.productId}</fo:block> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/transitions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/transitions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/transitions.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/transitions.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if inProcess?exists> +<#if inProcess??> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -64,7 +64,7 @@ under the License. </div> </#if> <br /> -<#if wfTransitions?exists && wfTransitions?has_content> +<#if wfTransitions?? && wfTransitions?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -88,7 +88,7 @@ under the License. <#list wfTransitions as trans> <#if trans.extendedAttributes?has_content> <#assign attrs = Static["org.ofbiz.base.util.StringUtil"].strToMap(trans.extendedAttributes)> - <#if attrs.approvalCode?exists> + <#if attrs.approvalCode??> <option value="${attrs.approvalCode}">${trans.transitionName}</option> </#if> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/CopyQuote.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/CopyQuote.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/CopyQuote.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/CopyQuote.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 quote?exists> +<#if quote??> <form action="<@ofbizUrl>copyQuote</@ofbizUrl>" method="post"> <input type="hidden" name="quoteId" value="${quoteId}"/> <div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Mon Aug 18 07:42:27 2014 @@ -50,7 +50,7 @@ under the License. <#assign totalQuoteAmount = 0.0> <#assign alt_row = false/> <#list quoteItems as quoteItem> - <#if quoteItem.productId?exists> + <#if quoteItem.productId??> <#assign product = quoteItem.getRelatedOne("Product", false)> <#else> <#assign product = null> <#-- don't drag it along to the next iteration --> @@ -71,7 +71,7 @@ under the License. <tr <#if alt_row>class="alternate-row" </#if>> <td > <div> - <#if showQuoteManagementLinks?exists && quoteItem.isPromo?default("N") == "N" && quote.statusId=="QUO_CREATED"> + <#if showQuoteManagementLinks?? && quoteItem.isPromo?default("N") == "N" && quote.statusId=="QUO_CREATED"> <a href="<@ofbizUrl>EditQuoteItem?quoteId=${quoteItem.quoteId}&quoteItemSeqId=${quoteItem.quoteItemSeqId}</@ofbizUrl>" class="buttontext">${quoteItem.quoteItemSeqId}</a> <#else> ${quoteItem.quoteItemSeqId} @@ -81,23 +81,23 @@ under the License. </td> <td valign="top"> <div> - ${(product.internalName)?if_exists} - <#if showQuoteManagementLinks?exists> - <a href="/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}" class="buttontext"> - <#if quoteItem.productId?exists> + ${(product.internalName)!} + <#if showQuoteManagementLinks??> + <a href="/catalog/control/EditProduct?productId=${quoteItem.productId!}" class="buttontext"> + <#if quoteItem.productId??> ${quoteItem.productId} <#else> ${uiLabelMap.ProductCreateProduct} </#if> </a> <#else> - <a href="<@ofbizUrl>product?product_id=${quoteItem.productId?if_exists}</@ofbizUrl>" class="buttontext">${quoteItem.productId?if_exists}</a> + <a href="<@ofbizUrl>product?product_id=${quoteItem.productId!}</@ofbizUrl>" class="buttontext">${quoteItem.productId!}</a> </#if> </div> </td> <td></td> - <td align="right" valign="top">${quoteItem.quantity?if_exists}</td> - <td align="right" valign="top">${quoteItem.selectedAmount?if_exists}</td> + <td align="right" valign="top">${quoteItem.quantity!}</td> + <td align="right" valign="top">${quoteItem.selectedAmount!}</td> <td align="right" valign="top"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></td> <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></td> <td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></td> @@ -105,10 +105,10 @@ under the License. <#list quoteTerms as quoteTerm> <#assign termDescription = delegator.findOne("TermType",{"termTypeId":quoteTerm.termTypeId}, false)> <tr <#if alt_row>class="alternate-row" </#if>> - <td valign="top"> ${termDescription.description?if_exists}</td> - <td valign="top"> ${quoteTerm.termValue?if_exists}</td> - <td valign="top"><#if quoteTerm.termDays?exists> ${quoteTerm.termDays?if_exists}</#if></td> - <td valign="top"><#if quoteTerm.description?exists> ${quoteTerm.description}</#if></td> + <td valign="top"> ${termDescription.description!}</td> + <td valign="top"> ${quoteTerm.termValue!}</td> + <td valign="top"><#if quoteTerm.termDays??> ${quoteTerm.termDays!}</#if></td> + <td valign="top"><#if quoteTerm.description??> ${quoteTerm.description}</#if></td> <td align="right" valign="top"></td> <td align="right" valign="top"></td> <td align="right" valign="top"></td> @@ -119,7 +119,7 @@ under the License. <#list quoteItemAdjustments as quoteItemAdjustment> <#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType", false)> <tr class="alternate-row"> - <td align="right" colspan="4"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td> + <td align="right" colspan="4"><span class="label">${adjustmentType.get("description",locale)!}</span></td> <td align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></td> <td> </td> </tr> @@ -137,10 +137,10 @@ under the License. <#assign findAdjustment = false> <#list quoteAdjustments as quoteAdjustment> <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)> - <#if !quoteAdjustment.quoteItemSeqId?exists> + <#if !quoteAdjustment.quoteItemSeqId??> <#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount> <tr> - <td align="right" colspan="6"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td> + <td align="right" colspan="6"><span class="label">${adjustmentType.get("description",locale)!}</span></td> <td align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></td> </tr> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteDate.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteDate.ftl Mon Aug 18 07:42:27 2014 @@ -28,7 +28,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(quote.issueDate.toString())?if_exists} + ${(quote.issueDate.toString())!} </td> </tr> <tr><td colspan="3"><hr /></td></tr> @@ -38,7 +38,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(quote.validFromDate.toString())?if_exists} + ${(quote.validFromDate.toString())!} </td> </tr> <tr><td colspan="3"><hr /></td></tr> @@ -48,7 +48,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(quote.validThruDate.toString())?if_exists} + ${(quote.validThruDate.toString())!} </td> </tr> </table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Mon Aug 18 07:42:27 2014 @@ -29,7 +29,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)} + ${(quoteType.get("description",locale))?default(quote.quoteTypeId!)} </td> </tr> <tr><td colspan="3"><hr /></td></tr> @@ -41,7 +41,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)} + ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId!)} </td> </tr> <tr><td colspan="3"><hr /></td></tr> @@ -53,7 +53,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${(statusItem.get("description", locale))?default(quote.statusId?if_exists)} + ${(statusItem.get("description", locale))?default(quote.statusId!)} </td> </tr> <#-- party --> @@ -64,7 +64,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${quote.partyId?if_exists} + ${quote.partyId!} </td> </tr> <#-- quote name --> @@ -75,7 +75,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${quote.quoteName?if_exists} + ${quote.quoteName!} </td> </tr> <#-- quote description --> @@ -86,7 +86,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - ${quote.description?if_exists} + ${quote.description!} </td> </tr> <#-- quote currency --> @@ -97,7 +97,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - <#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if> + <#if currency??>${currency.get("description",locale)?default(quote.currencyUomId!)}</#if> </td> </tr> <#-- quote currency --> @@ -108,7 +108,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="80%"> - <#if store?exists>${store.storeName?default(quote.productStoreId?if_exists)}</#if> + <#if store??>${store.storeName?default(quote.productStoreId!)}</#if> </td> </tr> </table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Mon Aug 18 07:42:27 2014 @@ -41,7 +41,7 @@ under the License. <#assign rowColor = "white"> <#assign totalQuoteAmount = 0.0> <#list quoteItems as quoteItem> - <#if quoteItem.productId?exists> + <#if quoteItem.productId??> <#assign product = quoteItem.getRelatedOne("Product", false)> </#if> <#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0)> @@ -58,13 +58,13 @@ under the License. <fo:block>${quoteItem.quoteItemSeqId}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${(product.internalName)?if_exists} [${quoteItem.productId?if_exists}]</fo:block> + <fo:block>${(product.internalName)!} [${quoteItem.productId!}]</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block text-align="right">${quoteItem.quantity?if_exists}</fo:block> + <fo:block text-align="right">${quoteItem.quantity!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block text-align="right">${quoteItem.selectedAmount?if_exists}</fo:block> + <fo:block text-align="right">${quoteItem.selectedAmount!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> <fo:block text-align="right"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></fo:block> @@ -89,7 +89,7 @@ under the License. <fo:table-cell padding="2pt" background-color="${rowColor}"> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block font-size="7pt" text-align="right">${adjustmentType.get("description",locale)?if_exists}</fo:block> + <fo:block font-size="7pt" text-align="right">${adjustmentType.get("description",locale)!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> <fo:block font-size="7pt" text-align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></fo:block> @@ -127,11 +127,11 @@ under the License. <#assign totalQuoteHeaderAdjustmentAmount = 0.0> <#list quoteAdjustments as quoteAdjustment> <#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)> - <#if !quoteAdjustment.quoteItemSeqId?exists> + <#if !quoteAdjustment.quoteItemSeqId??> <#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount> <fo:table-row> <fo:table-cell padding="2pt"> - <fo:block font-weight="bold" text-align="right">${adjustmentType.get("description", locale)?if_exists}</fo:block> + <fo:block font-weight="bold" text-align="right">${adjustmentType.get("description", locale)!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt"> <fo:block text-align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></fo:block> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl Mon Aug 18 07:42:27 2014 @@ -26,7 +26,7 @@ under the License. <fo:table-cell> <fo:block> <fo:block font-weight="bold">${uiLabelMap.OrderAddress}: </fo:block> - <#if quote.partyId?exists> + <#if quote.partyId??> <#assign quotePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quote.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/> <fo:block>${quotePartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}</fo:block> <#else> @@ -38,7 +38,7 @@ under the License. <fo:table-row> <fo:table-cell> <fo:block> - <#if toPostalAddress?exists> + <#if toPostalAddress??> ${setContextField("postalAddress", toPostalAddress)} ${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressPdfFormatter")} </#if> @@ -55,23 +55,23 @@ under the License. <fo:table-body> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.OrderOrderQuoteName}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${quote.quoteName?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${quote.quoteName!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonDescription}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${quote.description?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${quote.description!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonCurrency}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block><#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if></fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if currency??>${currency.get("description",locale)?default(quote.currencyUomId!)}</#if></fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonValidFromDate}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${(quote.validFromDate.toString())?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${(quote.validFromDate.toString())!}</fo:block></fo:table-cell> </fo:table-row> <fo:table-row> <fo:table-cell><fo:block>${uiLabelMap.CommonValidThruDate}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${(quote.validThruDate.toString())?if_exists}</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell> </fo:table-row> </fo:table-body> </fo:table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl Mon Aug 18 07:42:27 2014 @@ -24,7 +24,7 @@ under the License. <fo:block font-weight="bold">${uiLabelMap.OrderOrderQuoteType}</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block font-weight="bold">${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)}</fo:block> + <fo:block font-weight="bold">${(quoteType.get("description",locale))?default(quote.quoteTypeId!)}</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> @@ -32,7 +32,7 @@ under the License. <fo:block>${uiLabelMap.OrderOrderQuoteIssueDate}</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block>${(quote.issueDate.toString())?if_exists}</fo:block> + <fo:block>${(quote.issueDate.toString())!}</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> @@ -48,7 +48,7 @@ under the License. <fo:block>${uiLabelMap.CommonStatus}</fo:block> </fo:list-item-label> <fo:list-item-body start-indent="body-start()"> - <fo:block font-weight="bold">${(statusItem.get("description", locale))?default(quote.statusId?if_exists)}</fo:block> + <fo:block font-weight="bold">${(statusItem.get("description", locale))?default(quote.statusId!)}</fo:block> </fo:list-item-body> </fo:list-item> </fo:list-block> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Mon Aug 18 07:42:27 2014 @@ -30,7 +30,7 @@ under the License. <#assign rolePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quoteRole.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/> <tr> <td align="right" valign="top" width="15%" class="label"> - ${roleType.get("description",locale)?if_exists} + ${roleType.get("description",locale)!} </td> <td width="5%"> </td> <td valign="top" width="80%"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl Mon Aug 18 07:42:27 2014 @@ -70,29 +70,29 @@ under the License. <fo:table-row> <#if showProductStore> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchasePaymentSummary.productStoreId?if_exists}</fo:block> + <fo:block>${orderPurchasePaymentSummary.productStoreId!}</fo:block> </fo:table-cell> </#if> <#if showOriginFacility> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchasePaymentSummary.originFacilityId?if_exists}</fo:block> + <fo:block>${orderPurchasePaymentSummary.originFacilityId!}</fo:block> </fo:table-cell> </#if> <#if showTerminal> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchasePaymentSummary.terminalId?if_exists}</fo:block> + <fo:block>${orderPurchasePaymentSummary.terminalId!}</fo:block> </fo:table-cell> </#if> <#if showStatus> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchasePaymentSummary.statusId?if_exists}</fo:block> + <fo:block>${orderPurchasePaymentSummary.statusId!}</fo:block> </fo:table-cell> </#if> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchasePaymentSummary.get("description",locale)?if_exists}</fo:block> + <fo:block>${orderPurchasePaymentSummary.get("description",locale)!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchasePaymentSummary.maxAmount?if_exists}</fo:block> + <fo:block>${orderPurchasePaymentSummary.maxAmount!}</fo:block> </fo:table-cell> </fo:table-row> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl Mon Aug 18 07:42:27 2014 @@ -74,35 +74,35 @@ under the License. <fo:table-row> <#if showProductStore> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.productStoreId?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.productStoreId!}</fo:block> </fo:table-cell> </#if> <#if showOriginFacility> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.originFacilityId?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.originFacilityId!}</fo:block> </fo:table-cell> </#if> <#if showTerminal> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.terminalId?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.terminalId!}</fo:block> </fo:table-cell> </#if> <#if showStatus> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.statusId?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.statusId!}</fo:block> </fo:table-cell> </#if> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.productId?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.productId!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.internalName?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.internalName!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.quantity?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.quantity!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${orderPurchaseProductSummary.cancelQuantity?if_exists}</fo:block> + <fo:block>${orderPurchaseProductSummary.cancelQuantity!}</fo:block> </fo:table-cell> </fo:table-row> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/PurchasesByOrganizationReport.fo.ftl Mon Aug 18 07:42:27 2014 @@ -62,13 +62,13 @@ under the License. <#list productReportList as productReport> <fo:table-row> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.internalName?if_exists} (${productReport.productId?if_exists})</fo:block> + <fo:block>${productReport.internalName!} (${productReport.productId!})</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.quantity?if_exists}</fo:block> + <fo:block>${productReport.quantity!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.unitPrice?if_exists}</fo:block> + <fo:block>${productReport.unitPrice!}</fo:block> </fo:table-cell> </fo:table-row> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/reports/SalesByStoreReport.fo.ftl Mon Aug 18 07:42:27 2014 @@ -38,7 +38,7 @@ under the License. <fo:page-sequence master-reference="main"> <fo:flow flow-name="xsl-region-body" font-family="Helvetica"> <fo:block font-size="14pt">${uiLabelMap.OrderReportSalesByStore}</fo:block> - <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName?if_exists}</fo:block></#if> + <#if !showProductStore><fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductProductStore}: ${parameters.productStoreId} - ${productReportList.get(0).storeName!}</fo:block></#if> <#if !showToParty><fo:block font-size="10pt">${uiLabelMap.PartyParty}: ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, toPartyId, false)}</fo:block></#if> <fo:block font-size="10pt">${uiLabelMap.FormFieldTitle_orderStatusId}: <#if parameters.orderStatusId?has_content>${parameters.orderStatusId}<#else>${uiLabelMap.CommonAny}</#if> @@ -66,21 +66,21 @@ under the License. <fo:table-body> <#assign rowColor = "white"> <#list productReportList as productReport> - <#if productReport.quantityOrdered?exists && (productReport.quantityOrdered > 0)> + <#if productReport.quantityOrdered?? && (productReport.quantityOrdered > 0)> <fo:table-row> <#if showProductStore> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.productStoreId?if_exists}</fo:block> + <fo:block>${productReport.productStoreId!}</fo:block> </fo:table-cell> </#if> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.internalName?default("")} (${productReport.productId?if_exists})</fo:block> + <fo:block>${productReport.internalName?default("")} (${productReport.productId!})</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.quantityOrdered?if_exists}</fo:block> + <fo:block>${productReport.quantityOrdered!}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt" background-color="${rowColor}"> - <fo:block>${productReport.unitPrice?if_exists}</fo:block> + <fo:block>${productReport.unitPrice!}</fo:block> </fo:table-cell> </fo:table-row> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl Mon Aug 18 07:42:27 2014 @@ -20,17 +20,17 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title}</title> - <link rel="stylesheet" href="${baseSecureUrl?if_exists}/images/maincss.css" type="text/css"/> + <link rel="stylesheet" href="${baseSecureUrl!}/images/maincss.css" type="text/css"/> </head> <body> <h2>${title}</h2> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br /> - ${StringUtil.wrapString(noteData.noteInfo?if_exists)} + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has a note added to it:<br /> + ${StringUtil.wrapString(noteData.noteInfo!)} <br /><br /> Please login to the url below and add another note as a reply if required.<br /><br /> The status and used hours can always be checked <br /> - <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> + <a href="${StringUtil.wrapString(baseSecureUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Mon Aug 18 07:42:27 2014 @@ -20,15 +20,15 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title}</title> - <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl?if_exists)}/images/maincss.css" type="text/css"/> + <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> </head> <body> <h1>${title}</h1> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has been completed. <br /><br /> The status and used hours can always be checked at the url: <br /> - <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> + <a href="${StringUtil.wrapString(baseUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl!}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if custRequestItem?exists> +<#if custRequestItem??> <form action="<@ofbizUrl>copyCustRequestItem</@ofbizUrl>" method="post"> <input type="hidden" name="custRequestId" value="${custRequestItem.custRequestId}"/> <input type="hidden" name="custRequestItemSeqId" value="${custRequestItem.custRequestItemSeqId}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Mon Aug 18 07:42:27 2014 @@ -20,17 +20,17 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title}</title> - <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl?if_exists)}/images/maincss.css" type="text/css"/> + <link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> </head> <body> <h1>${title}</h1> - <p>Hello ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been created successfully. + <p>Hello ${person.firstName!} ${person.middleName!} ${person.lastName!},</p> + <p>Your Customer Request ${custRequest.custRequestName!} [${custRequest.custRequestId}] has been created successfully. <br /><br /> We will solve/implement the request as soon as possible <br /><br /> The status and used hours can always be checked <br /> - <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> + <a href="${StringUtil.wrapString(baseUrl!)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> <br /><br /> Regards. <br /><br /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/QuoteLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/QuoteLinks.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/QuoteLinks.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/QuoteLinks.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if custRequestItem?exists> +<#if custRequestItem??> <#if quoteId?has_content> <div><a href="<@ofbizUrl>EditQuoteItemForRequest?quoteId=${quoteId}&custRequestId=${custRequestItem.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleEditQuoteItemForCustRequest}</a> [${quoteId}]</div> <#else> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl Mon Aug 18 07:42:27 2014 @@ -33,13 +33,13 @@ under the License. </tr> <#assign alt_row = false> <#list requestItems as requestItem> - <#if requestItem.productId?exists> + <#if requestItem.productId??> <#assign product = requestItem.getRelatedOne("Product", false)> </#if> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td valign="top"> <div> - <#if showRequestManagementLinks?exists> + <#if showRequestManagementLinks??> <a href="<@ofbizUrl>EditRequestItem?custRequestId=${requestItem.custRequestId}&custRequestItemSeqId=${requestItem.custRequestItemSeqId}</@ofbizUrl>" class="buttontext">${requestItem.custRequestItemSeqId}</a> <#else> ${requestItem.custRequestItemSeqId} @@ -48,16 +48,16 @@ under the License. </td> <td valign="top"> <div> - ${(product.internalName)?if_exists} - <#if showRequestManagementLinks?exists> - <a href="/catalog/control/EditProduct?productId=${requestItem.productId?if_exists}" class="buttontext">${requestItem.productId?if_exists}</a> + ${(product.internalName)!} + <#if showRequestManagementLinks??> + <a href="/catalog/control/EditProduct?productId=${requestItem.productId!}" class="buttontext">${requestItem.productId!}</a> <#else> - <a href="<@ofbizUrl>product?product_id=${requestItem.productId?if_exists}</@ofbizUrl>" class="buttontext">${requestItem.productId?if_exists}</a> + <a href="<@ofbizUrl>product?product_id=${requestItem.productId!}</@ofbizUrl>" class="buttontext">${requestItem.productId!}</a> </#if> </div> </td> - <td align="right" valign="top">${requestItem.quantity?if_exists}</td> - <td align="right" valign="top">${requestItem.selectedAmount?if_exists}</td> + <td align="right" valign="top">${requestItem.quantity!}</td> + <td align="right" valign="top">${requestItem.selectedAmount!}</td> <td align="right" valign="top"><@ofbizCurrency amount=requestItem.maximumAmount isoCode=request.maximumAmountUomId/></td> </tr> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestContactMech.ftl Mon Aug 18 07:42:27 2014 @@ -21,13 +21,13 @@ under the License. <#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId> <#assign label = uiLabelMap.PartyAddressMailingShipping> - <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)?if_exists> + <#assign postalAddress = fulfillContactMech.getRelatedOne("PostalAddress", true)!> <#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId> <#assign label = uiLabelMap.PartyToEmailAddress> - <#assign emailAddress = fulfillContactMech.infoString?if_exists> + <#assign emailAddress = fulfillContactMech.infoString!> <#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId> <#assign label = uiLabelMap.PartyPhoneNumber> - <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)?if_exists> + <#assign telecomNumber = fulfillContactMech.getRelatedOne("TelecomNumber", true)!> </#if> <div class="screenlet"> @@ -48,14 +48,14 @@ under the License. <#if postalAddress?has_content> <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br /></#if> - ${postalAddress.address1?if_exists}<br /> + ${postalAddress.address1!}<br /> <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if> - ${postalAddress.city?if_exists}, + ${postalAddress.city!}, <#if postalAddress.stateProvinceGeoId?has_content> <#assign stateProvince = postalAddress.getRelatedOne("StateProvinceGeo", true)> ${stateProvince.abbreviation?default(stateProvince.geoId)} </#if> - ${postalAddress.postalCode?if_exists} + ${postalAddress.postalCode!} <#if postalAddress.countryGeoId?has_content><br /> <#assign country = postalAddress.getRelatedOne("CountryGeo", true)> ${country.geoName?default(country.geoId)} @@ -63,7 +63,7 @@ under the License. </#if> <#if telecomNumber?has_content> - ${telecomNumber.countryCode?if_exists} + ${telecomNumber.countryCode!} <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")} <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestDate.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestDate.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/request/requestDate.ftl Mon Aug 18 07:42:27 2014 @@ -28,7 +28,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="70%"> - ${(custRequest.custRequestDate.toString())?if_exists} + ${(custRequest.custRequestDate.toString())!} </td> </tr> <tr><td colspan="7"><hr /></td></tr> @@ -38,7 +38,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="70%"> - ${(custRequest.createdDate.toString())?if_exists} + ${(custRequest.createdDate.toString())!} </td> </tr> <tr><td colspan="7"><hr /></td></tr> @@ -48,7 +48,7 @@ under the License. </td> <td width="5%"> </td> <td valign="top" width="70%"> - ${(custRequest.lastModifiedDate.toString())?if_exists} + ${(custRequest.lastModifiedDate.toString())!} </td> </tr> </table> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |