svn commit: r1618554 [9/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [9/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Mon Aug 18 07:42:27 2014 @@ -177,16 +177,16 @@ function submitForm(form, mode, value) { </td> <td valign="top"> <div> - <#if shoppingCart.getShippingContactMechId()?exists> + <#if shoppingCart.getShippingContactMechId()??> <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)> </#if> - <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists} + <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if> </div> </td> </tr> </#list> - <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> + <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> <tr> <td width="1%" valign="top"> <input type="radio" name="shipping_method" value="Default" checked="checked"/> @@ -231,11 +231,11 @@ function submitForm(form, mode, value) { </tr> <tr> <td colspan="2"> - <textarea cols="30" rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea> + <textarea cols="30" rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea> </td> </tr> <#if shipping == true> - <#if productStore.showCheckoutGiftOptions?if_exists != "N" && giftEnable?if_exists != "N"> + <#if productStore.showCheckoutGiftOptions! != "N" && giftEnable! != "N"> <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> @@ -254,7 +254,7 @@ function submitForm(form, mode, value) { </tr> <tr> <td colspan="2"> - <textarea cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea> + <textarea cols="30" rows="3" wrap="hard" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea> </td> </tr> <#else/> @@ -273,15 +273,15 @@ function submitForm(form, mode, value) { <div> <b> <#list emailList as email> - ${email.infoString?if_exists}<#if email_has_next>,</#if> + ${email.infoString!}<#if email_has_next>,</#if> </#list> </b> </div> - <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink?exists>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr" + <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<#if customerDetailLink??>${customerDetailLink}${shoppingCart.getPartyId()}" target="partymgr" <#else><@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout</@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div> <br /> <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div> - <input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/> + <input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()!}"/> </td> </tr> </table> @@ -302,10 +302,10 @@ function submitForm(form, mode, value) { <tr> <td colspan="2"> <span>${uiLabelMap.CommonAdd}:</span> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> <a href="javascript:submitForm(document.checkoutInfoForm, 'NC', '');" class="buttontext">${uiLabelMap.AccountingCreditCard}</a> </#if> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <a href="javascript:submitForm(document.checkoutInfoForm, 'NE', '');" class="buttontext">${uiLabelMap.AccountingEFTAccount}</a> </#if> </td> @@ -317,7 +317,7 @@ function submitForm(form, mode, value) { </td> </tr> <tr><td colspan="2"><hr /></td></tr> - <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??> <tr> <td width="1%"> <input type="radio" name="checkOutPaymentId" value="EXT_OFFLINE" <#if "EXT_OFFLINE" == checkOutPaymentId>checked="checked"</#if>/> @@ -327,7 +327,7 @@ function submitForm(form, mode, value) { </td> </tr> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_COD?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_COD??> <tr> <td width="1%"> <input type="radio" name="checkOutPaymentId" value="EXT_COD" <#if "EXT_COD" == checkOutPaymentId>checked="checked"</#if>/> @@ -337,7 +337,7 @@ function submitForm(form, mode, value) { </td> </tr> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_WORLDPAY??> <tr> <td width="1%"> <input type="radio" name="checkOutPaymentId" value="EXT_WORLDPAY" <#if "EXT_WORLDPAY" == checkOutPaymentId>checked="checked"</#if>/> @@ -347,7 +347,7 @@ function submitForm(form, mode, value) { </td> </tr> </#if> - <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??> <tr> <td width="1%"> <input type="radio" name="checkOutPaymentId" value="EXT_PAYPAL" <#if "EXT_PAYPAL" == checkOutPaymentId>checked="checked"</#if>/> @@ -382,7 +382,7 @@ function submitForm(form, mode, value) { <#else> <#list paymentMethodList as paymentMethod> <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD"> - <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??> <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> <tr> <td width="1%"> @@ -397,21 +397,21 @@ function submitForm(form, mode, value) { </tr> </#if> <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT"> - <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> + <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??> <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> <tr> <td width="1%"> <input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if shoppingCart.isPaymentSelected(paymentMethod.paymentMethodId)>checked="checked"</#if>/> </td> <td width="50%"> - <span>${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span> + <span>${uiLabelMap.AccountingEFTAccount}: ${eftAccount.bankName!}: ${eftAccount.accountNumber!}</span> <a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a> <#if paymentMethod.description?has_content><br /><span>(${paymentMethod.description})</span></#if> </td> </tr> </#if> <#elseif paymentMethod.paymentMethodTypeId == "GIFT_CARD"> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> <#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)> <#if giftCard?has_content && giftCard.cardNumber?has_content> @@ -446,7 +446,7 @@ function submitForm(form, mode, value) { </#if> <#-- special billing account functionality to allow use w/ a payment method --> - <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT?exists> + <#if productStorePaymentMethodTypeIdMap.EXT_BILLACT??> <#if billingAccountList?has_content> <tr><td colspan="2"><hr /></td></tr> <tr> @@ -476,7 +476,7 @@ function submitForm(form, mode, value) { </#if> <#-- end of special billing account functionality --> - <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> + <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??> <tr><td colspan="2"><hr /></td></tr> <tr> <td width="1%"> @@ -491,7 +491,7 @@ function submitForm(form, mode, value) { <div>${uiLabelMap.AccountingNumber}</div> </td> <td width="50%"> - <input type="text" size="15" name="giftCardNumber" value="${(requestParameters.giftCardNumber)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> + <input type="text" size="15" name="giftCardNumber" value="${(requestParameters.giftCardNumber)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> </td> </tr> <#if shoppingCart.isPinRequiredForGC(delegator)> @@ -500,7 +500,7 @@ function submitForm(form, mode, value) { <div>${uiLabelMap.AccountingPIN}</div> </td> <td width="50%"> - <input type="text" size="10" name="giftCardPin" value="${(requestParameters.giftCardPin)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> + <input type="text" size="10" name="giftCardPin" value="${(requestParameters.giftCardPin)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> </td> </tr> </#if> @@ -509,7 +509,7 @@ function submitForm(form, mode, value) { <div>${uiLabelMap.AccountingAmount}</div> </td> <td width="50%"> - <input type="text" size="6" name="giftCardAmount" value="${(requestParameters.giftCardAmount)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> + <input type="text" size="6" name="giftCardAmount" value="${(requestParameters.giftCardAmount)!}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> </td> </tr> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Mon Aug 18 07:42:27 2014 @@ -53,7 +53,7 @@ function toggleBillingAccount(box) { //]]> </script> -<#assign cart = shoppingCart?if_exists/> +<#assign cart = shoppingCart!/> <form method="post" name="checkoutInfoForm" style="margin:0;"> <input type="hidden" name="checkoutpage" value="shippingaddress"/> <div class="screenlet" style="height: 100%;"> @@ -100,7 +100,7 @@ function toggleBillingAccount(box) { </table> <div> ${uiLabelMap.AccountingAgreementInformation}</div> <table> - <#if agreements?exists> + <#if agreements??> <#if agreements.size()!=1> <tr> <td> </td> @@ -114,7 +114,7 @@ function toggleBillingAccount(box) { <div class='tabletext' valign='top'> <select name="agreementId"> <#list agreements as agreement> - <option value='${agreement.agreementId?if_exists}'>${agreement.agreementId} - ${agreement.description?if_exists}</option> + <option value='${agreement.agreementId!}'>${agreement.agreementId} - ${agreement.description!}</option> </#list> </select> </div> @@ -122,7 +122,7 @@ function toggleBillingAccount(box) { </tr> <#else> <#list agreements as agreement> - <input type="radio" name="agreementId" value="${agreement.agreementId?if_exists}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description?if_exists} will be used for this order. + <input type="radio" name="agreementId" value="${agreement.agreementId!}"<#if checkThisAddress> checked="checked"</#if> />${agreement.description!} will be used for this order. </#list> </#if> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl Mon Aug 18 07:42:27 2014 @@ -16,11 +16,11 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if partyTaxAuthInfoAndDetailList?exists> +<#if partyTaxAuthInfoAndDetailList??> <#list partyTaxAuthInfoAndDetailList as partyTaxAuthInfoAndDetail> <div> <a href="<@ofbizUrl>deleteCustomerTaxAuthInfo?partyId=${partyId}&taxAuthPartyId=${partyTaxAuthInfoAndDetail.taxAuthPartyId}&taxAuthGeoId=${partyTaxAuthInfoAndDetail.taxAuthGeoId}&fromDate=${partyTaxAuthInfoAndDetail.fromDate}</@ofbizUrl>" class="buttontext">X</a> - [${partyTaxAuthInfoAndDetail.geoCode}] ${partyTaxAuthInfoAndDetail.geoName} (${partyTaxAuthInfoAndDetail.groupName?if_exists}): ${uiLabelMap.PartyTaxId} [${partyTaxAuthInfoAndDetail.partyTaxId?default("N/A")}], ${uiLabelMap.PartyTaxIsExempt} [${partyTaxAuthInfoAndDetail.isExempt?default("N")}] + [${partyTaxAuthInfoAndDetail.geoCode}] ${partyTaxAuthInfoAndDetail.geoName} (${partyTaxAuthInfoAndDetail.groupName!}): ${uiLabelMap.PartyTaxId} [${partyTaxAuthInfoAndDetail.partyTaxId?default("N/A")}], ${uiLabelMap.PartyTaxIsExempt} [${partyTaxAuthInfoAndDetail.isExempt?default("N")}] </div> </#list> <div> @@ -28,7 +28,7 @@ under the License. <select name="taxAuthPartyGeoIds"> <option></option> <#list taxAuthorityAndDetailList as taxAuthorityAndDetail> - <option value="${taxAuthorityAndDetail.taxAuthPartyId}::${taxAuthorityAndDetail.taxAuthGeoId}">[${taxAuthorityAndDetail.geoCode}] ${taxAuthorityAndDetail.geoName} (${taxAuthorityAndDetail.groupName?if_exists})</option> + <option value="${taxAuthorityAndDetail.taxAuthPartyId}::${taxAuthorityAndDetail.taxAuthGeoId}">[${taxAuthorityAndDetail.geoCode}] ${taxAuthorityAndDetail.geoName} (${taxAuthorityAndDetail.groupName!})</option> </#list> </select> <span>${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/custsettings.ftl Mon Aug 18 07:42:27 2014 @@ -30,35 +30,35 @@ under the License. <td width="26%" align="right"><div>${uiLabelMap.CommonTitle}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="personalTitle" value="${requestParameters.personalTitle?if_exists}" size="10" maxlength="30"/> + <input type="text" name="personalTitle" value="${requestParameters.personalTitle!}" size="10" maxlength="30"/> </td> </tr> <tr> <td width="26%" align="right"><div>${uiLabelMap.PartyFirstName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="firstName" value="${requestParameters.firstName?if_exists}" size="30" maxlength="30"/> + <input type="text" name="firstName" value="${requestParameters.firstName!}" size="30" maxlength="30"/> *</td> </tr> <tr> <td width="26%" align="right"><div>${uiLabelMap.PartyMiddleInitial}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="middleName" value="${requestParameters.middleName?if_exists}" size="4" maxlength="4"/> + <input type="text" name="middleName" value="${requestParameters.middleName!}" size="4" maxlength="4"/> </td> </tr> <tr> <td width="26%" align="right"><div>${uiLabelMap.PartyLastName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="lastName" value="${requestParameters.lastName?if_exists}" size="30" maxlength="30"/> + <input type="text" name="lastName" value="${requestParameters.lastName!}" size="30" maxlength="30"/> *</td> </tr> <tr> <td width="26%" align="right"><div>${uiLabelMap.PartySuffix}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="suffix" value="${requestParameters.suffix?if_exists}" size="10" maxlength="30"/> + <input type="text" name="suffix" value="${requestParameters.suffix!}" size="10" maxlength="30"/> </td> </tr> <tr> @@ -68,10 +68,10 @@ under the License. <td width="26%" align="right"><div>${uiLabelMap.PartyHomePhone}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="homeCountryCode" value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/> - - <input type="text" name="homeAreaCode" value="${requestParameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>* - - <input type="text" name="homeContactNumber" value="${requestParameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>* - ext <input type="text" name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/> + <input type="text" name="homeCountryCode" value="${requestParameters.homeCountryCode!}" size="4" maxlength="10"/> + - <input type="text" name="homeAreaCode" value="${requestParameters.homeAreaCode!}" size="4" maxlength="10"/>* + - <input type="text" name="homeContactNumber" value="${requestParameters.homeContactNumber!}" size="15" maxlength="15"/>* + ext <input type="text" name="homeExt" value="${requestParameters.homeExt!}" size="6" maxlength="10"/> <br/> <select name="homeSol"> <#if (((requestParameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -86,10 +86,10 @@ under the License. <td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}<br/>${uiLabelMap.OrderAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"/> - - <input type="text" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10"/> - - <input type="text" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15"/> - ext <input type="text" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/> + <input type="text" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY!}" size="4" maxlength="10"/> + - <input type="text" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA!}" size="4" maxlength="10"/> + - <input type="text" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT!}" size="15" maxlength="15"/> + ext <input type="text" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT!}" size="6" maxlength="10"/> <br/> <select name="workSol"> <#if (((requestParameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -125,7 +125,7 @@ under the License. <td width="26%" align="right"><div>${uiLabelMap.CommonUsername}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" name="userLoginId" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="250"/> + <input type="text" name="userLoginId" value="${requestParameters.USERNAME!}" size="20" maxlength="250"/> </td> </tr> </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/editShipAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <td> <#if postalAddress?has_content> <form method="post" action="<@ofbizUrl>updatePostalAddressOrderEntry</@ofbizUrl>" name="checkoutsetupform"> - <input type="hidden" name="contactMechId" value="${shipContactMechId?if_exists}"/> + <input type="hidden" name="contactMechId" value="${shipContactMechId!}"/> <#else> <form method="post" action="<@ofbizUrl>createPostalAddress</@ofbizUrl>" name="checkoutsetupform"> <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/> @@ -33,14 +33,14 @@ under the License. </#if> <input type="hidden" name="partyId" value="${cart.getPartyId()?default("_NA_")}"/> <input type="hidden" name="finalizeMode" value="ship"/> - <#if orderPerson?exists && orderPerson?has_content> + <#if orderPerson?? && orderPerson?has_content> <#assign toName = ""> <#if orderPerson.personalTitle?has_content><#assign toName = orderPerson.personalTitle + " "></#if> <#assign toName = toName + orderPerson.firstName + " "> <#if orderPerson.middleName?has_content><#assign toName = toName + orderPerson.middleName + " "></#if> <#assign toName = toName + orderPerson.lastName> <#if orderPerson.suffix?has_content><#assign toName = toName + " " + orderPerson.suffix></#if> - <#elseif parameters.toName?exists> + <#elseif parameters.toName??> <#assign toName = parameters.toName> <#else> <#assign toName = ""> @@ -57,28 +57,28 @@ under the License. <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="attnName" value="${parameters.attnName?if_exists}"/> + <input type="text" size="30" maxlength="60" name="attnName" value="${parameters.attnName!}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="address1" value="${parameters.address1?if_exists}"/> + <input type="text" size="30" maxlength="30" name="address1" value="${parameters.address1!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="address2" value="${parameters.address2?if_exists}"/> + <input type="text" size="30" maxlength="30" name="address2" value="${parameters.address2!}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCity}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="30" name="city" value="${parameters.city?if_exists}"/> + <input type="text" size="30" maxlength="30" name="city" value="${parameters.city!}"/> *</td> </tr> <tr> @@ -95,7 +95,7 @@ under the License. <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="12" maxlength="10" name="postalCode" value="${parameters.postalCode?if_exists}"/> + <input type="text" size="12" maxlength="10" name="postalCode" value="${parameters.postalCode!}"/> *</td> </tr> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/optionsettings.ftl Mon Aug 18 07:42:27 2014 @@ -37,10 +37,10 @@ under the License. </tr> <tr> <td colspan="2"> - <textarea cols="30" rows="3" name="internal_order_notes"><#if (cart.getInternalOrderNotes().size()>0)>${(cart.getInternalOrderNotes()[0])?if_exists}</#if></textarea> + <textarea cols="30" rows="3" name="internal_order_notes"><#if (cart.getInternalOrderNotes().size()>0)>${(cart.getInternalOrderNotes()[0])!}</#if></textarea> </td> <td colspan="2"> - <textarea cols="30" rows="3" name="shippingNotes"><#if (cart.getOrderNotes().size()>0)>${(cart.getOrderNotes()[0])?if_exists}</#if></textarea> + <textarea cols="30" rows="3" name="shippingNotes"><#if (cart.getOrderNotes().size()>0)>${(cart.getOrderNotes()[0])!}</#if></textarea> </td> </tr> </table> @@ -52,11 +52,11 @@ under the License. <#list 1..cart.getShipGroupSize() as currIndex> <#assign shipGroupIndex = currIndex - 1> -<#if cart.getShipmentMethodTypeId(shipGroupIndex)?exists && cart.getCarrierPartyId(shipGroupIndex)?exists> +<#if cart.getShipmentMethodTypeId(shipGroupIndex)?? && cart.getCarrierPartyId(shipGroupIndex)??> <#assign chosenShippingMethod = cart.getShipmentMethodTypeId(shipGroupIndex) + '@' + cart.getCarrierPartyId(shipGroupIndex)> </#if> -<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists> -<#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId), false)?if_exists /> +<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!> +<#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId), false)! /> <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> <tr><td colspan="2"><hr /></td></tr> @@ -81,8 +81,8 @@ under the License. </td> <td valign="top"> <label for="${shipGroupIndex?default("0")}_shipping_method_${shippingMethod}"> - <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists} - <#if cart.getShippingContactMechId(shipGroupIndex)?exists> + <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!} + <#if cart.getShippingContactMechId(shipGroupIndex)??> <#assign shippingEst = shipEstimateWrapper.getShippingEstimate(carrierShipmentMethod)?default(-1)> <#if shippingEst?has_content> - @@ -97,7 +97,7 @@ under the License. </td> </tr> </#list> - <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> + <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0> <tr> <td width='1%' valign="top"> <input type='radio' name='${shipGroupIndex?default("0")}_shipping_method' value="Default" checked="checked" /> @@ -116,7 +116,7 @@ under the License. <tr> <input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="STANDARD@_NA_" /> <td> - <input type='text' name='${shipGroupIndex?default("0")}_ship_estimate' value="${cart.getItemShipGroupEstimate(shipGroupIndex?default('0'))?if_exists}"/> + <input type='text' name='${shipGroupIndex?default("0")}_ship_estimate' value="${cart.getItemShipGroupEstimate(shipGroupIndex?default('0'))!}"/> </td> </tr> </#if> @@ -149,7 +149,7 @@ under the License. <tr> <td colspan="2"> <div> - <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" event="" action="" value="${(cart.getShipBeforeDate(shipGroupIndex))?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipBeforeDate" event="" action="" value="${(cart.getShipBeforeDate(shipGroupIndex))!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipBeforeDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> </tr> @@ -161,7 +161,7 @@ under the License. <tr> <td colspan="2"> <div> - <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" event="" action="" value="${(cart.getShipAfterDate(shipGroupIndex))?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="sgi${shipGroupIndex?default('0')}_shipAfterDate" event="" action="" value="${(cart.getShipAfterDate(shipGroupIndex))!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="sgi${shipGroupIndex?default('0')}_shipAfterDate" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </div> </td> </tr> @@ -172,7 +172,7 @@ under the License. </tr> <tr> <td colspan="2"> - <textarea cols="30" rows="3" name="${shipGroupIndex?default("0")}_shipping_instructions">${cart.getShippingInstructions(shipGroupIndex)?if_exists}</textarea> + <textarea cols="30" rows="3" name="${shipGroupIndex?default("0")}_shipping_instructions">${cart.getShippingInstructions(shipGroupIndex)!}</textarea> </td> </tr> @@ -197,7 +197,7 @@ under the License. </tr> <tr> <td colspan="2"> - <textarea cols="30" rows="3" name="${shipGroupIndex?default('0')}_gift_message">${cart.getGiftMessage(shipGroupIndex)?if_exists}</textarea> + <textarea cols="30" rows="3" name="${shipGroupIndex?default('0')}_gift_message">${cart.getGiftMessage(shipGroupIndex)!}</textarea> </td> </tr> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Mon Aug 18 07:42:27 2014 @@ -34,7 +34,7 @@ under the License. <tr><td colspan="7"><hr /></td></tr> </#if> <#-- order for party --> - <#if (orderForParty?exists)> + <#if (orderForParty??)> <tr> <td align="right" valign="top" width="15%"> <span> <b>${uiLabelMap.OrderOrderFor}</b> </span> @@ -132,7 +132,7 @@ under the License. </tr> </#if> <tr><td colspan="7"><hr /></td></tr> - <#if orderType != "PURCHASE_ORDER" && (productStore.showCheckoutGiftOptions)?if_exists != "N"> + <#if orderType != "PURCHASE_ORDER" && (productStore.showCheckoutGiftOptions)! != "N"> <#-- gift settings --> <tr> <td align="right" valign="top" width="15%"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Mon Aug 18 07:42:27 2014 @@ -36,21 +36,21 @@ under the License. <td width="10%" align="right"><span><b>${uiLabelMap.OrderAdjustments}</b></span></td> <td width="10%" align="right"><span><b>${uiLabelMap.OrderSubTotal}</b></span></td> </tr> - <#list orderItems?if_exists as orderItem> - <#assign itemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists> + <#list orderItems! as orderItem> + <#assign itemType = orderItem.getRelatedOne("OrderItemType", false)!> <tr><td colspan="6"><hr /></td></tr> <tr> - <#if orderItem.productId?exists && orderItem.productId == "_?_"> + <#if orderItem.productId?? && orderItem.productId == "_?_"> <td colspan="1" valign="top"> <b><div> >> ${orderItem.itemDescription}</div></b> </td> <#else> <td valign="top"> <div> - <#if orderItem.productId?exists> + <#if orderItem.productId??> <a href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" class="buttontext">${orderItem.productId} - ${orderItem.itemDescription}</a> <#else> - <b>${itemType?if_exists.description?if_exists}</b> : ${orderItem.itemDescription?if_exists} + <b>${(itemType.description)!}</b> : ${orderItem.itemDescription!} </#if> </div> @@ -75,11 +75,11 @@ under the License. </#if> </tr> <#-- show info from workeffort if it was a rental item --> - <#if orderItem.orderItemTypeId?exists && orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM"> - <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)?if_exists> + <#if orderItem.orderItemTypeId?? && orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM"> + <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)!> <#if WorkOrderItemFulfillments?has_content> <#list WorkOrderItemFulfillments as WorkOrderItemFulfillment> - <#assign workEffort = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)?if_exists> + <#assign workEffort = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)!> <tr><td> </td><td> </td><td colspan="8"><div>${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNbrPersons}: ${workEffort.reservPersons}</div></td></tr> <#break><#-- need only the first one --> </#list> @@ -99,16 +99,16 @@ under the License. <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> <#if primaryGeo.geoName?has_content> - <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] + <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation!}] </#if> <#if orderItemAdjustment.secondaryGeoId?has_content> <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/> - (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) + (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation!}]) </#if> </#if> - <#if orderItemAdjustment.sourcePercentage?exists><b>${uiLabelMap.OrderRate}:</b> ${orderItemAdjustment.sourcePercentage}%</#if> + <#if orderItemAdjustment.sourcePercentage??><b>${uiLabelMap.OrderRate}:</b> ${orderItemAdjustment.sourcePercentage}%</#if> <#if orderItemAdjustment.customerReferenceId?has_content><b>${uiLabelMap.OrderCustomerTaxId}:</b> ${orderItemAdjustment.customerReferenceId}</#if> - <#if orderItemAdjustment.exemptAmount?exists><b>${uiLabelMap.OrderExemptAmount}:</b> ${orderItemAdjustment.exemptAmount}</#if> + <#if orderItemAdjustment.exemptAmount??><b>${uiLabelMap.OrderExemptAmount}:</b> ${orderItemAdjustment.exemptAmount}</#if> </#if> </div> </td> @@ -130,9 +130,9 @@ under the License. <tr><td colspan="8"><hr /></td></tr> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSubTotal}</b></div></td> - <td align="right" nowrap="nowrap"><div> <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td> + <td align="right" nowrap="nowrap"><div> <#if orderSubTotal??><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td> </tr> - <#list headerAdjustmentsToShow?if_exists as orderHeaderAdjustment> + <#list headerAdjustmentsToShow! as orderHeaderAdjustment> <tr> <td align="right" colspan="4"><div><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td> <td align="right" nowrap="nowrap"><div><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td> @@ -140,18 +140,18 @@ under the License. </#list> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.FacilityShippingAndHandling}</b></div></td> - <td align="right" nowrap="nowrap"><div><#if orderShippingTotal?exists><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td> + <td align="right" nowrap="nowrap"><div><#if orderShippingTotal??><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td> </tr> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSalesTax}</b></div></td> - <td align="right" nowrap="nowrap"><div><#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td> + <td align="right" nowrap="nowrap"><div><#if orderTaxTotal??><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td> </tr> <tr><td colspan=2></td><td colspan="8"><hr /></td></tr> <tr> <td align="right" colspan="4"><div><b>${uiLabelMap.OrderGrandTotal}</b></div></td> <td align="right" nowrap="nowrap"> - <div><#if orderGrandTotal?exists><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></#if></div> + <div><#if orderGrandTotal??><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></#if></div> </td> </tr> </table> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Mon Aug 18 07:42:27 2014 @@ -105,7 +105,7 @@ under the License. <td width="5"> </td> <td valign="top" width="80%"> <div> - #${billingAccount.billingAccountId?if_exists} - ${billingAccount.description?if_exists} + #${billingAccount.billingAccountId!} - ${billingAccount.description!} </div> </td> </tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Mon Aug 18 07:42:27 2014 @@ -24,9 +24,9 @@ and similar information. This is design standard order confirmation page and to be re-usable by other screens. --> -<#if !(cart?exists)><#assign cart = shoppingCart?if_exists/></#if> +<#if !(cart??)><#assign cart = shoppingCart!/></#if> -<#if cart?exists> +<#if cart??> <div class="screenlet"> <div class="screenlet-title-bar"> <div class="h3">${uiLabelMap.OrderShippingInformation}</div> @@ -63,34 +63,34 @@ standard order confirmation page and to <#-- address destination column (spans a number of rows = number of cart items in it) --> <td rowspan="${numberOfItems}"> - <#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)?if_exists /> + <#assign contactMech = delegator.findOne("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId), false)! /> <#if contactMech?has_content> - <#assign address = contactMech.getRelatedOne("PostalAddress", false)?if_exists /> + <#assign address = contactMech.getRelatedOne("PostalAddress", false)! /> </#if> - <#if address?exists> + <#if address??> <#if address.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${address.toName}<br /></#if> <#if address.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${address.attnName}<br /></#if> <#if address.address1?has_content>${address.address1}<br /></#if> <#if address.address2?has_content>${address.address2}<br /></#if> <#if address.city?has_content>${address.city}</#if> <#if address.stateProvinceGeoId?has_content> ${address.stateProvinceGeoId}</#if> - <#if address.postalCode?has_content>, ${address.postalCode?if_exists}</#if> + <#if address.postalCode?has_content>, ${address.postalCode!}</#if> </#if> </td> <#-- supplier id (for drop shipments) (also spans rows = number of items) --> <td rowspan="${numberOfItems}" valign="top"> - <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()), false)?if_exists /> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()), false)! /> <#if supplier?has_content>${supplier.groupName?default(supplier.partyId)}</#if> </td> <#-- carrier column (also spans rows = number of items) --> <td rowspan="${numberOfItems}" valign="top"> - <#assign carrier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()), false)?if_exists /> - <#assign method = delegator.findOne("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()), false)?if_exists /> + <#assign carrier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()), false)! /> + <#assign method = delegator.findOne("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()), false)! /> <#if carrier?has_content>${carrier.groupName?default(carrier.partyId)}</#if> <#if method?has_content>${method.description?default(method.shipmentMethodTypeId)}</#if> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderHeaderInfo.ftl Mon Aug 18 07:42:27 2014 @@ -17,12 +17,12 @@ specific language governing permissions under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <#assign currencyUomId = shoppingCart.getCurrency()> <#assign partyId = shoppingCart.getPartyId()> <#assign partyMap = Static["org.ofbiz.party.party.PartyWorker"].getPartyOtherValues(request, partyId, "party", "person", "partyGroup")> -<#assign agreementId = shoppingCart.getAgreementId()?if_exists> -<#assign quoteId = shoppingCart.getQuoteId()?if_exists> +<#assign agreementId = shoppingCart.getAgreementId()!> +<#assign quoteId = shoppingCart.getQuoteId()!> <#if shoppingCart?has_content> <#assign shoppingCartSize = shoppingCart.size()> @@ -44,12 +44,12 @@ under the License. </form> <p> <strong>${uiLabelMap.Party}</strong>: - <a href="${customerDetailLink}${partyId}${externalKeyParam?if_exists}" target="partymgr" class="buttontext">${partyId}</a> - <#if partyMap.person?exists> - ${partyMap.person.firstName?if_exists} ${partyMap.person.lastName?if_exists} + <a href="${customerDetailLink}${partyId}${externalKeyParam!}" target="partymgr" class="buttontext">${partyId}</a> + <#if partyMap.person??> + ${partyMap.person.firstName!} ${partyMap.person.lastName!} </#if> - <#if partyMap.partyGroup?exists> - ${partyMap.partyGroup.groupName?if_exists} + <#if partyMap.partyGroup??> + ${partyMap.partyGroup.groupName!} </#if> </p> <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderShortcuts.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -35,16 +35,16 @@ under the License. <#if shoppingCart.getOrderType() == "SALES_ORDER"> <li><a href="<@ofbizUrl>createCustRequestFromCart?destroyCart=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateCustRequestFromCart}</a></li> </#if> - <li><a href="/partymgr/control/findparty?${externalKeyParam?if_exists}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li> + <li><a href="/partymgr/control/findparty?${externalKeyParam!}" class="buttontext">${uiLabelMap.PartyFindParty}</a></li> <#if shoppingCart.getOrderType() == "SALES_ORDER"> <li><a href="<@ofbizUrl>setCustomer</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyCreateNewCustomer}</a></li> </#if> <li><a href="<@ofbizUrl>checkinits</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyChangeParty}</a></li> <#if security.hasEntityPermission("CATALOG", "_CREATE", session)> - <li><a href="/catalog/control/EditProduct?${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li> + <li><a href="/catalog/control/EditProduct?${externalKeyParam!}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></li> </#if> <li><a href="<@ofbizUrl>quickadd</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickAdd}</a></li> - <#if shoppingLists?exists> + <#if shoppingLists??> <li><a href="<@ofbizUrl>viewPartyShoppingLists?partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleShoppingList}</a></li> </#if> </ul> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderagreements.ftl Mon Aug 18 07:42:27 2014 @@ -30,7 +30,7 @@ under the License. <div class="screenlet-body"> <table> - <#if agreements?exists> + <#if agreements??> <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='Y'/></td></tr> <tr> @@ -46,7 +46,7 @@ under the License. <select name="agreementId"> <option value="">${uiLabelMap.CommonNone}</option> <#list agreements as agreement> - <option value='${agreement.agreementId}' >${agreement.agreementId} - ${agreement.description?if_exists}</option> + <option value='${agreement.agreementId}' >${agreement.agreementId} - ${agreement.description!}</option> </#list> </select> </div> @@ -55,7 +55,7 @@ under the License. <#else> <tr><td colspan="4"> <input type='hidden' name='hasAgreements' value='N'/></td></tr> </#if> - <#if agreementRoles?exists> + <#if agreementRoles??> <tr> <td> </td> <td align='right' valign='top' nowrap="nowrap"> @@ -69,7 +69,7 @@ under the License. <select name="agreementId"> <option value="">${uiLabelMap.CommonNone}</option> <#list agreementRoles as agreementRole> - <option value='${agreementRole.agreementId?if_exists}' >${agreementRole.agreementId?if_exists} - ${agreementRole.roleTypeId?if_exists}</option> + <option value='${agreementRole.agreementId!}' >${agreementRole.agreementId!} - ${agreementRole.roleTypeId!}</option> </#list> </select> </div> @@ -118,7 +118,7 @@ under the License. <td> </td> <td align='right' valign='middle' nowrap="nowrap"> <div class='tableheadtext'> - <#if agreements?exists>${uiLabelMap.OrderSelectCurrencyOr} + <#if agreements??>${uiLabelMap.OrderSelectCurrencyOr} <#else>${uiLabelMap.OrderSelectCurrency} </#if> </div> @@ -145,7 +145,7 @@ under the License. <td> <#if catalogCol?has_content> <select name='CURRENT_CATALOG_ID'> - <#list catalogCol?if_exists as catalogId> + <#list catalogCol! as catalogId> <#assign thisCatalogName = Static["org.ofbiz.product.catalog.CatalogWorker"].getCatalogName(request, catalogId)> <option value="${catalogId}" <#if currentCatalogId?default('') == catalogId>selected="selected"</#if> >${thisCatalogName}</option> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderparty.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderparty.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderparty.ftl Mon Aug 18 07:42:27 2014 @@ -36,12 +36,12 @@ under the License. <tr> <td align="center"> <#if person?has_content> - <div><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName?if_exists} ${person.lastName?if_exists}</a></div> + <div><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName!} ${person.lastName!}</a></div> <#elseif partyGroup?has_content> - <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName?if_exists}</a></div> + <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName!}</a></div> </#if> <form method="post" action="<@ofbizUrl>orderentry</@ofbizUrl>" name="setpartyform"> - <div><input type="text" name="partyId" size='10' value="${partyId?if_exists}" /></div> + <div><input type="text" name="partyId" size='10' value="${partyId!}" /></div> <div> <a href="javascript:document.setpartyform.submit();" class="buttontext">${uiLabelMap.CommonSet}</a> | <a href="/partymgr/control/findparty" class="buttontext">${uiLabelMap.CommonFind}</a><#if partyId?default("_NA_") != "_NA_" && partyId?default("_NA_") != ""> | <a href="${customerDetailLink}${partyId}" class="buttontext">${uiLabelMap.CommonView}</a></#if> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/orderterms.ftl Mon Aug 18 07:42:27 2014 @@ -39,9 +39,9 @@ under the License. <#list orderTerms as orderTerm> <tr <#if orderTerm_index % 2 != 0>class="alternate-row"</#if> > <td nowrap="nowrap">${orderTerm.getRelatedOne('TermType', false).get('description', locale)}</td> - <td align="center">${orderTerm.termValue?if_exists}</td> - <td align="center">${orderTerm.termDays?if_exists}</td> - <td nowrap="nowrap">${orderTerm.textValue?if_exists}</td> + <td align="center">${orderTerm.termValue!}</td> + <td align="center">${orderTerm.termDays!}</td> + <td nowrap="nowrap">${orderTerm.textValue!}</td> <td align="right"> <a href="<@ofbizUrl>setOrderTerm?termIndex=${orderTerm_index}&createNew=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a href="<@ofbizUrl>removeCartOrderTerm?termIndex=${orderTerm_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> @@ -56,7 +56,7 @@ under the License. </table> <#else> <form method="post" action="<@ofbizUrl>addOrderTerm</@ofbizUrl>" name="termform"> - <input type="hidden" name="termIndex" value="${termIndex?if_exists}" /> + <input type="hidden" name="termIndex" value="${termIndex!}" /> <table class="basic-table"> <tr> <td width="26%" align="right" valign="top"> @@ -66,7 +66,7 @@ under the License. <td width="74%"> <select name="termTypeId"> <option value=""></option> - <#list termTypes?if_exists as termType> + <#list termTypes! as termType> <option value="${termType.termTypeId}" <#if termTypeId?default('') == termType.termTypeId>selected="selected"</#if> >${termType.get('description', locale)}</option> @@ -80,7 +80,7 @@ under the License. </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="termValue" value="${termValue?if_exists}" /> + <input type="text" size="30" maxlength="60" name="termValue" value="${termValue!}" /> </td> </tr> <tr> @@ -89,7 +89,7 @@ under the License. </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="termDays" value="${termDays?if_exists}" /> + <input type="text" size="30" maxlength="60" name="termDays" value="${termDays!}" /> </td> </tr> <tr> @@ -98,7 +98,7 @@ under the License. </td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="255" name="textValue" value="${textValue?if_exists}" /> + <input type="text" size="30" maxlength="255" name="textValue" value="${textValue!}" /> </td> </tr> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/poheader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/poheader.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/poheader.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/poheader.ftl Mon Aug 18 07:42:27 2014 @@ -25,7 +25,7 @@ under the License. <#-- header box --> <div class="screenlet"> <div class="screenlet-title-bar"> - <div class="h3">PO For ${partyId?if_exists}</div> + <div class="h3">PO For ${partyId!}</div> </div> <div class="screenlet-body"> <table width="100%" border="0" cellpadding="1" cellspacing="0"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Mon Aug 18 07:42:27 2014 @@ -35,7 +35,7 @@ under the License. <table border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if> /> + <input type="radio" id="additionalPartyType_Person" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?? && additionalPartyType == "Person")> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_Person">${uiLabelMap.CommonPerson}</label> @@ -43,7 +43,7 @@ under the License. </tr> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?exists && additionalPartyType == "Group"> checked="checked"</#if> /> + <input type="radio" id="additionalPartyType_Group" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?? && additionalPartyType == "Group"> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_Group">${uiLabelMap.CommonGroup}</label> @@ -51,7 +51,7 @@ under the License. </tr> <tr> <td align="right"> - <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType?exists> checked="checked"</#if> /> + <input type="radio" id="additionalPartyType_None" name="additionalPartyType" value="None" onclick="<#if additionalPartyType??>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType??> checked="checked"</#if> /> </td> <td> <label for="additionalPartyType_None">${uiLabelMap.OrderPartyDontWish}</label> @@ -65,7 +65,7 @@ under the License. <td> </td> </tr> - <#if additionalPartyType?exists && additionalPartyType != "" && additionalPartyType != "None"> + <#if additionalPartyType?? && additionalPartyType != "" && additionalPartyType != "None"> <#if additionalPartyType == "Person"> <#assign lookupPartyView="LookupPerson"> <#else> @@ -83,7 +83,7 @@ under the License. <div>${uiLabelMap.CommonIdentifier} :</div> </td> <td> - <@htmlTemplate.lookupField value="${additionalPartyId?if_exists}" formName="quickAddPartyForm" name="additionalPartyId" id="additionalPartyId" fieldFormName="${lookupPartyView}"/> + <@htmlTemplate.lookupField value="${additionalPartyId!}" formName="quickAddPartyForm" name="additionalPartyId" id="additionalPartyId" fieldFormName="${lookupPartyView}"/> </td> <td> <a href="javascript:document.quickAddPartyForm.submit()" class="buttontext">${uiLabelMap.CommonApply}</a> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/shipsettings.ftl Mon Aug 18 07:42:27 2014 @@ -21,7 +21,7 @@ under the License. <#-- Purchase Orders --> -<#if facilityMaps?exists> +<#if facilityMaps??> <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> <input type="hidden" name="finalizeMode" value="ship"/> <#if (cart.getShipGroupSize() > 1)> @@ -49,7 +49,7 @@ under the License. <#assign facilityContactMechList = facilityMap.facilityContactMechList> <tr> <td colspan="4"> - <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div> + <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName!} [${facility.facilityId}]</div> </td> </tr> <tr><td colspan="4"><hr /></td></tr> @@ -58,7 +58,7 @@ under the License. <#if facilityContactMechList?has_content> <#list facilityContactMechList as shippingContactMech> - <#if shippingContactMech.postalAddress?exists> + <#if shippingContactMech.postalAddress??> <#assign shippingAddress = shippingContactMech.postalAddress> <tr> <td valign="top" nowrap="nowrap"> @@ -127,9 +127,9 @@ under the License. <#list 1..cart.getShipGroupSize() as currIndex> <#assign shipGroupIndex = currIndex - 1> -<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)?if_exists> -<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)?if_exists> -<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)?if_exists> +<#assign currShipContactMechId = cart.getShippingContactMechId(shipGroupIndex)!> +<#assign supplierPartyId = cart.getSupplierPartyId(shipGroupIndex)!> +<#assign facilityId = cart.getShipGroupFacilityId(shipGroupIndex)!> <hr /> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> @@ -144,7 +144,7 @@ under the License. <select name="${shipGroupIndex?default("0")}_supplierPartyId"> <option value=""></option> <#list suppliers as supplier> - <option value="${supplier.partyId}"<#if supplierPartyId?exists><#if supplier.partyId == supplierPartyId> selected="selected"</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option> + <option value="${supplier.partyId}"<#if supplierPartyId??><#if supplier.partyId == supplierPartyId> selected="selected"</#if></#if>>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(supplier, true)}</option> </#list> </select> ${uiLabelMap.ProductReserveInventoryFromFacility}: @@ -152,7 +152,7 @@ under the License. <option value=""></option> <#list productStoreFacilities as productStoreFacility> <#assign facility = productStoreFacility.getRelatedOne("Facility", false)> - <option value="${productStoreFacility.facilityId}"<#if facilityId?exists><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName?if_exists} </option> + <option value="${productStoreFacility.facilityId}"<#if facilityId??><#if productStoreFacility.facilityId == facilityId> selected="selected"</#if></#if>>${facility.facilityName!} </option> </#list> </select> </div> @@ -163,7 +163,7 @@ under the License. <#assign i = 0> <#list shippingContactMechList as shippingContactMech> <#assign shippingAddress = shippingContactMech.getRelatedOne("PostalAddress", false)> - <#if currShipContactMechId?exists && currShipContactMechId?has_content> + <#if currShipContactMechId?? && currShipContactMechId?has_content> <#if currShipContactMechId == shippingContactMech.contactMechId> <#assign checkedValue = "checked='checked'"> <#else> @@ -262,7 +262,7 @@ under the License. <td> </td> <td valign='middle'> <div class='tabletext'> - <@htmlTemplate.lookupField value='${thisPartyId?if_exists}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value='${thisPartyId!}' formName="partyshipform" name="shipToPartyId" id="shipToPartyId" fieldFormName="LookupPartyName"/> <input type="submit" class="smallSubmit" value="Continue" /> </div> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/survey.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/survey.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/survey.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/survey.ftl Mon Aug 18 07:42:27 2014 @@ -18,7 +18,7 @@ under the License. --> <#-- Render the survey --> -<#if requestAttributes.surveyWrapper?exists && requestAttributes.surveyAction?exists> +<#if requestAttributes.surveyWrapper?? && requestAttributes.surveyAction??> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>${requestAttributes.surveyAction}</@ofbizUrl>" style="margin: 0;"> ${requestAttributes.surveyWrapper.renderSurvey()} </form> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/GiftCertificates.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/GiftCertificates.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/GiftCertificates.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/GiftCertificates.ftl Mon Aug 18 07:42:27 2014 @@ -19,15 +19,15 @@ under the License. <form id="addGiftCertificate" action="<@ofbizUrl>addGiftCertificateSurvey</@ofbizUrl>" method="post"> <fieldset> - <#if surveyId?exists && surveyId?has_content> + <#if surveyId?? && surveyId?has_content> <input type="hidden" name="quantity" value="1" /> - <input type="hidden" name="surveyId" value="${surveyId?if_exists}" /> + <input type="hidden" name="surveyId" value="${surveyId!}" /> <#if giftCardProductList?has_content> <label>${uiLabelMap.OrderSelectGiftAmount}</label> <#list giftCardProductList?sort_by("price") as giftCardProduct> <div> - <input type="radio" name="add_product_id" id="productId_${giftCardProduct.price?if_exists}" value="${giftCardProduct.productId?if_exists}" checked="checked" /> - <label for="productId_${giftCardProduct.price?if_exists}"> ${giftCardProduct.productId?if_exists} : ${giftCardProduct.productName?if_exists} : <@ofbizCurrency amount=giftCardProduct.price?if_exists isoCode=currencyUomId/></label> + <input type="radio" name="add_product_id" id="productId_${giftCardProduct.price!}" value="${giftCardProduct.productId!}" checked="checked" /> + <label for="productId_${giftCardProduct.price!}"> ${giftCardProduct.productId!} : ${giftCardProduct.productName!} : <@ofbizCurrency amount=giftCardProduct.price! isoCode=currencyUomId/></label> </div> </#list> <div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderDeliveryScheduleInfo.ftl Mon Aug 18 07:42:27 2014 @@ -22,7 +22,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.OrderScheduleDelivery}</li> - <#if orderId?exists> + <#if orderId??> <li><a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${uiLabelMap.OrderViewOrder}</a></li> </#if> </ul> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderListByDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Mon Aug 18 07:42:27 2014 @@ -23,7 +23,7 @@ under the License. <li class="h3">${uiLabelMap.OrderOrderReceivedOn} ${Static["org.ofbiz.base.util.UtilDateTime"].toDateString(filterDate)}</li> <#assign listSize = state.getSize()> <#if (listSize > 10)> - <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}">${uiLabelMap.CommonMore}</a></li> + <li><a href="/ordermgr/control/orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}">${uiLabelMap.CommonMore}</a></li> </#if> <#if orderHeaderList?has_content> <li>1-${orderHeaderList.size()} ${uiLabelMap.CommonOf} ${state.getSize()}</li> @@ -46,23 +46,23 @@ under the License. <#list orderHeaderList as orderHeader> <#assign status = orderHeader.getRelatedOne("StatusItem", true)> <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)> - <#assign billToParty = orh.getBillToParty()?if_exists> + <#assign billToParty = orh.getBillToParty()!> <#if billToParty?has_content> <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> <#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/> </#if> - <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)?if_exists /> + <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)! /> <tr<#if alt_row> class="alternate-row"</#if>> <#assign alt_row = !alt_row> <td><a href="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" class="buttontext">${orderHeader.orderId}</a></td> - <td>${billTo?if_exists}</td> + <td>${billTo!}</td> <td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td> <td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td> <td> <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder", null, null, false)> <#list trackingCodes as trackingCode> <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey!}">${trackingCode.trackingCodeId}</a><br /> </#if> </#list> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |