svn commit: r1618336 [5/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [5/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl (original) +++ ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl Sat Aug 16 11:34:57 2014 @@ -30,26 +30,26 @@ under the License. <table width="70%"> <tr> <td align="right"><b>Order #:</b></td> - <td>${orderId?if_exists}</td> + <td>${orderId!}</td> </tr> <tr> <td align="right"><b>Order Date:</b></td> - <td>${orderDate?if_exists}</td> + <td>${orderDate!}</td> </tr> <tr> <td colspan="2"> </td> </tr> <tr> <td align="right"><b>Estimated Start Date:</b></td> - <td>${estimatedStartDate?if_exists}</td> + <td>${estimatedStartDate!}</td> </tr> <tr> <td align="right"><b>Actual Start Date:</b></td> - <td>${actualStartDate?if_exists}</td> + <td>${actualStartDate!}</td> </tr> <tr> <td align="right"><b>Current State:<b></td> - <td>${omgStatusId?if_exists} <#--WfUtil.getOMGStatus(request.getParameter("currentStatusId"))--></td> + <td>${omgStatusId!} <#--WfUtil.getOMGStatus(request.getParameter("currentStatusId"))--></td> </tr> <tr> <td colspan="2"> </td> @@ -58,15 +58,15 @@ under the License. <#list assignments as assign> <tr> <td align="right"><b>Assigned Party ID:</b></td> - <td>${assign.partyId?if_exists}</td> + <td>${assign.partyId!}</td> </tr> <tr> <td align="right"><b>Assigned Role Type:</b></td> - <td>${assign.roleTypeId?if_exists}</td> + <td>${assign.roleTypeId!}</td> </tr> <tr> <td align="right"><b>Assignment Status:</b></td> - <td>${assign.statusId?if_exists}</td> + <td>${assign.statusId!}</td> </tr> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if stepTitleId?exists> +<#if stepTitleId??> <#assign stepTitle = uiLabelMap.get(stepTitleId)> </#if> <div class="screenlet"> @@ -29,7 +29,7 @@ under the License. <#else> ${uiLabelMap.OrderSalesOrder} </#if> - : ${stepTitle?if_exists} + : ${stepTitle!} </li> <#if isLastStep == "N"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Sat Aug 16 11:34:57 2014 @@ -30,7 +30,7 @@ under the License. <td> <#list 1..shoppingCart.getShipGroupSize() as currIndex> <#assign shipGroupIndex = currIndex - 1> - <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)), false)?if_exists /> + <#assign supplier = delegator.findOne("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shoppingCart.getSupplierPartyId(shipGroupIndex)), false)! /> <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> <tr> <td colspan="2"> @@ -65,7 +65,7 @@ under the License. <input type="hidden" name="fromGroupIndex_o_${rowCount}" value="${shipGroupIndex}"/> <tr> <td> - <div>[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()?if_exists}: ${shoppingCartItem.getDescription()?if_exists}</div> + <div>[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()!}: ${shoppingCartItem.getDescription()!}</div> </td> <td> <div>${shipGroupItemQuantity}</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SplitShip.ftl Sat Aug 16 11:34:57 2014 @@ -83,7 +83,7 @@ function submitForm(form, mode, value) { </#list> </select> </div> - <#if cart.getShipmentMethodTypeId(groupIdx)?exists> + <#if cart.getShipmentMethodTypeId(groupIdx)??> <#assign selectedShippingMethod = cart.getShipmentMethodTypeId(groupIdx) + "@" + cart.getCarrierPartyId(groupIdx)> <#else> <#assign selectedShippingMethod = ""> @@ -95,9 +95,9 @@ function submitForm(form, mode, value) { <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <option value="${shippingMethod}" <#if (shippingMethod == selectedShippingMethod)>selected="selected"</#if>> <#if carrierShipmentMethod.partyId != "_NA_"> - ${carrierShipmentMethod.partyId?if_exists} + ${carrierShipmentMethod.partyId!} </#if> - ${carrierShipmentMethod.description?if_exists} + ${carrierShipmentMethod.description!} <#if shippingEst?has_content> - <#if (shippingEst > -1)> @@ -111,7 +111,7 @@ function submitForm(form, mode, value) { </select> <h2>${uiLabelMap.OrderSpecialInstructions}</h2> - <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)?if_exists}</textarea> + <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)!}</textarea> </td> <td> <div> @@ -132,7 +132,7 @@ function submitForm(form, mode, value) { </div> <h2>${uiLabelMap.OrderGiftMessage}</h2> - <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)?if_exists}</textarea> + <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)!}</textarea> </td> <td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td> </tr> @@ -173,19 +173,19 @@ function submitForm(form, mode, value) { <input type="hidden" name="itemIndex" value="${cartLineIndex}"/> <td> <div class="tabletext"> - <#if cartLine.getProductId()?exists> + <#if cartLine.getProductId()??> <#-- product item --> <#-- start code to display a small image of the product --> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)!> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#if smallImageUrl?string?has_content> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /> </a> </#if> <#-- end code to display a small image of the product --> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="buttontext">${cartLine.getProductId()} - - ${cartLine.getName()?if_exists}</a> : ${cartLine.getDescription()?if_exists} + ${cartLine.getName()!}</a> : ${cartLine.getDescription()!} <#-- display the registered ship groups and quantity --> <#assign itemShipGroups = cart.getShipGroups(cartLine)> @@ -205,7 +205,7 @@ function submitForm(form, mode, value) { <#else> <#-- this is a non-product item --> - <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} + <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!} </#if> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl Sat Aug 16 11:34:57 2014 @@ -38,16 +38,16 @@ under the License. <td> <div> <#if partyData[party].type == "person"> - ${partyData[party].firstName?if_exists} + ${partyData[party].firstName!} <#else> - ${partyData[party].groupName?if_exists} + ${partyData[party].groupName!} </#if> </div> </td> <td> <div> <#if partyData[party].type == "person"> - ${partyData[party].lastName?if_exists} + ${partyData[party].lastName!} </#if> </div> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl Sat Aug 16 11:34:57 2014 @@ -39,13 +39,13 @@ under the License. <#-- postal addresses for chosen id --> - <#if partyContactMechPurposes?exists> + <#if partyContactMechPurposes??> <#list partyContactMechPurposes as partyContactMechPurpose> <#assign shippingAddress = partyContactMechPurpose.getRelatedOne("PostalAddress", false)/> <#-- skip non-postal addresses --> - <#if shippingAddress.toName?exists> + <#if shippingAddress.toName??> <tr> <td valign="top" nowrap="nowrap"> <input type="radio" name="shipping_contact_mech_id" value="${partyContactMechPurpose.contactMechId}" /> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Sat Aug 16 11:34:57 2014 @@ -21,9 +21,9 @@ under the License. //<![CDATA[ function shipBillAddr() { if (document.checkoutsetupform.useShipAddr.checked) { - window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType?if_exists}&useShipAddr=Y</@ofbizUrl>"; + window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType!}&useShipAddr=Y</@ofbizUrl>"; } else { - window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType?if_exists}</@ofbizUrl>"; + window.location = "<@ofbizUrl>setBilling?createNew=Y&finalizeMode=payment&paymentMethodType=${paymentMethodType!}</@ofbizUrl>"; } } @@ -36,7 +36,7 @@ function makeExpDate() { <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session) || security.hasEntityPermission("ORDERMGR", "_PURCHASE_CREATE", session)> <div class="screenlet"> <div class="screenlet-body"> - <#if request.getAttribute("paymentMethodId")?exists || ( (paymentMethodList?has_content || billingAccountList?has_content) && !requestParameters.createNew?exists)> + <#if request.getAttribute("paymentMethodId")?? || ( (paymentMethodList?has_content || billingAccountList?has_content) && !requestParameters.createNew??)> <#-- initial screen when we have a associated party --> <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> <input type="hidden" name="finalizeMode" value="payment"/> @@ -54,7 +54,7 @@ function makeExpDate() { <option value=""></option> <#list billingAccountList as billingAccount> <#assign availableAmount = billingAccount.accountBalance?double> - <#if (billingAccount.accountLimit)?exists> + <#if (billingAccount.accountLimit)??> <#assign accountLimit = billingAccount.accountLimit?double /> <#else> <#assign accountLimit = 0.00 /> @@ -81,7 +81,7 @@ function makeExpDate() { </#if> <tr> <td width="1%"> - <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/> + <input type="radio" id="checkOutPaymentId_EXT_OFFLINE" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/> </td> <td colspan="2" width="50%"> <label for="checkOutPaymentId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label> @@ -90,7 +90,7 @@ function makeExpDate() { <tr><td colspan="3"><hr /></td></tr> <tr> <td width="1%"> - <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/> + <input type="radio" id="checkOutPaymentId_EXT_COD" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/> </td> <td colspan="2" width="50%"> <label for="checkOutPaymentId_EXT_COD">${uiLabelMap.OrderCOD}</label> @@ -103,7 +103,7 @@ function makeExpDate() { <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)> <tr> <td width="1%"> - <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> + <input type="radio" id="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> </td> <td width="50%"> <label for="checkOutPaymentId_CREDIT_CARD_${paymentMethod.paymentMethodId}"> @@ -120,11 +120,11 @@ function makeExpDate() { <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)> <tr> <td width="1%"> - <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> + <input type="radio" id="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?? && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/> </td> <td width="50%"> <label for="checkOutPaymentId_EFT_ACCOUNT_${paymentMethod.paymentMethodId}"> - EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists} + EFT: ${eftAccount.bankName!}: ${eftAccount.accountNumber!} <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if> </label> </td> @@ -138,14 +138,14 @@ function makeExpDate() { </#if> </table> </form> - <#elseif paymentMethodType?exists || finalizeMode?default("") == "payment"> + <#elseif paymentMethodType?? || finalizeMode?default("") == "payment"> <#-- after initial screen; show detailed screens for selected type --> <#if paymentMethodType == "CC"> <#if postalAddress?has_content> <form method="post" action="<@ofbizUrl>updateCreditCardAndPostalAddress</@ofbizUrl>" name="checkoutsetupform"> - <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId?if_exists}"/> - <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/> - <#elseif requestParameters.useShipAddr?exists> + <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/> + <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/> + <#elseif requestParameters.useShipAddr??> <form method="post" action="<@ofbizUrl>createCreditCardOrderEntry</@ofbizUrl>" name="checkoutsetupform"> <#else> <form method="post" action="<@ofbizUrl>createCreditCardAndPostalAddress</@ofbizUrl>" name="checkoutsetupform"> @@ -154,9 +154,9 @@ function makeExpDate() { <#if paymentMethodType == "EFT"> <#if postalAddress?has_content> <form method="post" action="<@ofbizUrl>updateEftAndPostalAddress</@ofbizUrl>" name="checkoutsetupform"> - <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}"/> - <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/> - <#elseif requestParameters.useShipAddr?exists> + <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/> + <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/> + <#elseif requestParameters.useShipAddr??> <form method="post" action="<@ofbizUrl>createEftAccount</@ofbizUrl>" name="checkoutsetupform"> <#else> <form method="post" action="<@ofbizUrl>createEftAndPostalAddress</@ofbizUrl>" name="checkoutsetupform"> @@ -168,15 +168,15 @@ function makeExpDate() { <input type="hidden" name="paymentMethodType" value="${paymentMethodType}"/> <input type="hidden" name="finalizeMode" value="payment"/> <input type="hidden" name="createNew" value="Y"/> - <#if requestParameters.useShipAddr?exists> + <#if requestParameters.useShipAddr??> <input type="hidden" name="contactMechId" value="${postalFields.contactMechId}"/> </#if> <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#if cart.getShippingContactMechId()?exists> + <#if cart.getShippingContactMechId()??> <tr> <td width="26%" align="right"= valign="top"> - <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked="checked"</#if>/> + <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr??>checked="checked"</#if>/> </td> <td colspan="2" valign="center"> <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div> @@ -203,43 +203,43 @@ function makeExpDate() { <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonToName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/> </td> </tr> <tr> <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="${postalFields.attnName?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="60" name="attnName" value="${postalFields.attnName!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/> </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="${postalFields.address1?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="30" name="address1" value="${postalFields.address1!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/> *</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="${postalFields.address2?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="30" name="address2" value="${postalFields.address2!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/> </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="${postalFields.city?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="30" name="city" value="${postalFields.city!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td> <td width="5"> </td> <td width="74%"> - <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>> - <#if postalFields.stateProvinceGeoId?exists> + <select name="stateProvinceGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>> + <#if postalFields.stateProvinceGeoId??> <option>${postalFields.stateProvinceGeoId}</option> <option value="${postalFields.stateProvinceGeoId}">---</option> </#if> @@ -252,15 +252,15 @@ function makeExpDate() { <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="${postalFields.postalCode?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode!}" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td> <td width="5"> </td> <td width="74%"> - <select name="countryGeoId" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>> - <#if postalFields.countryGeoId?exists> + <select name="countryGeoId" <#if requestParameters.useShipAddr??>disabled="disabled"</#if>> + <#if postalFields.countryGeoId??> <option>${postalFields.countryGeoId}</option> <option value="${postalFields.countryGeoId}">---</option> </#if> @@ -274,7 +274,7 @@ function makeExpDate() { <#if !creditCard?has_content> <#assign creditCard = requestParameters> </#if> - <input type="hidden" name="expireDate" value="${creditCard.expireDate?if_exists}"/> + <input type="hidden" name="expireDate" value="${creditCard.expireDate!}"/> <tr> <td colspan="3"><hr /></td> </tr> @@ -283,7 +283,7 @@ function makeExpDate() { <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/> + <input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard!}"/> </td> </tr> <tr> @@ -303,21 +303,21 @@ function makeExpDate() { <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/> + <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/> + <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)!}"/> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/> + <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)!}"/> *</td> </tr> <tr> @@ -342,7 +342,7 @@ function makeExpDate() { <td width="5"> </td> <td width="74%"> <select name="cardType"> - <#if creditCard.cartType?exists> + <#if creditCard.cartType??> <option>${creditCard.cardType}</option> <option value="${creditCard.cardType}">---</option> </#if> @@ -360,7 +360,7 @@ function makeExpDate() { <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> + <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber!}"/> *</td> </tr> <#--<tr> @@ -376,24 +376,24 @@ function makeExpDate() { <td width="74%"> <#assign expMonth = ""> <#assign expYear = ""> - <#if creditCard?exists && creditCard.expDate?exists> + <#if creditCard?? && creditCard.expDate??> <#assign expDate = creditCard.expireDate> - <#if (expDate?exists && expDate.indexOf("/") > 0)> + <#if (expDate?? && expDate.indexOf("/") > 0)> <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))> <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> </#if> </#if> <select name="expMonth" onchange="javascript:makeExpDate();"> - <#if creditCard?has_content && expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign ccExprMonth = requestParameters.expMonth?if_exists></#if> + <#if creditCard?has_content && expMonth?has_content><#assign ccExprMonth = expMonth><#else><#assign ccExprMonth = requestParameters.expMonth!></#if> <#if ccExprMonth?has_content> - <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option> + <option value="${ccExprMonth!}">${ccExprMonth!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} </select> <select name="expYear" onchange="javascript:makeExpDate();"> - <#if creditCard?has_content && expYear?has_content><#assign ccExprYear = expYear><#else><#assign ccExprYear = requestParameters.expYear?if_exists></#if> + <#if creditCard?has_content && expYear?has_content><#assign ccExprYear = expYear><#else><#assign ccExprYear = requestParameters.expYear!></#if> <#if ccExprYear?has_content> - <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> + <option value="${ccExprYear!}">${ccExprYear!}</option> </#if> ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} </select> @@ -403,7 +403,7 @@ function makeExpDate() { <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/> + <input type="text" size="20" maxlength="30" name="description" value="${creditCard.description!}"/> </td> </tr> </#if> @@ -420,28 +420,28 @@ function makeExpDate() { <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/> + <input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/> + <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingBankName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/> + <input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/> + <input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber!}"/> *</td> </tr> <tr> @@ -449,7 +449,7 @@ function makeExpDate() { <td width="5"> </td> <td width="74%"> <select name="accountType"> - <option>${eftAccount.accountType?if_exists}</option> + <option>${eftAccount.accountType!}</option> <option></option> <option>Checking</option> <option>Savings</option> @@ -460,14 +460,14 @@ function makeExpDate() { <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/> + <input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber!}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/> + <input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description!}"/> </td> </tr> </#if> @@ -491,14 +491,14 @@ function makeExpDate() { <input type="hidden" name="finalizeMode" value="payment"/> <input type="hidden" name="createNew" value="Y"/> <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#if !requestParameters.createNew?exists> + <#if !requestParameters.createNew??> <tr> - <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> + <td width='1%' nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> <td width='50%' nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> <tr> - <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> + <td width="1%" nowrap="nowrap"><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?? && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onclick="setCheckoutPaymentId(this.value)"/></td> <td width="50%" nowrap="nowrap"><div>${uiLabelMap.OrderCOD}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl Sat Aug 16 11:34:57 2014 @@ -19,7 +19,7 @@ under the License. <!-- Screenlet to add cart to shopping list. The shopping lists are presented in a dropdown box. --> -<#if (shoppingLists?exists) && (shoppingCartSize > 0)> +<#if (shoppingLists??) && (shoppingCartSize > 0)> <div class="screenlet"> <div class="screenlet-title-bar"> <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div> @@ -31,7 +31,7 @@ under the License. <form method="post" name="addBulkToShoppingList" action="<@ofbizUrl>addBulkToShoppingList</@ofbizUrl>" style='margin: 0;'> <#assign index = 0/> <#list shoppingCart.items() as cartLine> - <#if (cartLine.getProductId()?exists) && !cartLine.getIsPromo()> + <#if (cartLine.getProductId()??) && !cartLine.getIsPromo()> <input type="hidden" name="selectedItem" value="${index}"/> </#if> <#assign index = index + 1/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/associatedProducts.ftl Sat Aug 16 11:34:57 2014 @@ -18,7 +18,7 @@ under the License. --> <#if (shoppingCart.getOrderType() == "SALES_ORDER")> - <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)?if_exists> + <#assign associatedProducts = Static["org.ofbiz.order.shoppingcart.product.ProductDisplayWorker"].getRandomCartProductAssoc(request, true)!> </#if> <#if associatedProducts?has_content> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl Sat Aug 16 11:34:57 2014 @@ -29,13 +29,13 @@ under the License. <select name="productPromoId_1"> <option value=""></option> <#list allProductPromos as productPromo> - <option value="${productPromo.productPromoId}">${productPromo.promoName?if_exists}</option> + <option value="${productPromo.productPromoId}">${productPromo.promoName!}</option> </#list> </select> <select name="productPromoId_2"> <option value=""></option> <#list allProductPromos as productPromo> - <option value="${productPromo.productPromoId}">${productPromo.promoName?if_exists}</option> + <option value="${productPromo.productPromoId}">${productPromo.promoName!}</option> </#list> </select> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderDoPromotions}" /> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#assign shoppingCart = sessionAttributes.shoppingCart!> <#if shoppingCart?has_content> <#assign shoppingCartSize = shoppingCart.size()> <#else> @@ -57,19 +57,19 @@ under the License. <tr> <td>${cartLine.getQuantity()?string.number}</td> <td> - <#if cartLine.getProductId()?exists> - <#if cartLine.getParentProductId()?exists> + <#if cartLine.getProductId()??> + <#if cartLine.getParentProductId()??> <a href="<@ofbizCatalogAltUrl productId=cartLine.getParentProductId()/>" class="linktext">${cartLine.getName()}</a> <#else> <a href="<@ofbizCatalogAltUrl productId=cartLine.getProductId()/>" class="linktext">${cartLine.getName()}</a> </#if> <#else> - <strong>${cartLine.getItemTypeDescription()?if_exists}</strong> + <strong>${cartLine.getItemTypeDescription()!}</strong> </#if> </td> <td><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></td> </tr> - <#if cartLine.getReservStart()?exists> + <#if cartLine.getReservStart()??> <tr><td> </td><td colspan="2">(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else>${uiLabelMap.CommonDays}</#if>)</td></tr> </#if> </#list> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl Sat Aug 16 11:34:57 2014 @@ -27,7 +27,7 @@ under the License. <form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addpromocodeform" style="margin: 0;"> <input type="text" size="15" name="productPromoCodeId" value="" /> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}" /> - <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists> + <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())!> <#if productPromoCodeIds?has_content> ${uiLabelMap.OrderEnteredPromoCodes}: <#list productPromoCodeIds as productPromoCodeId> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if showPromoText?exists && showPromoText> +<#if showPromoText?? && showPromoText> <div class="screenlet"> <div class="screenlet-title-bar"> <div class="h3">${uiLabelMap.OrderSpecialOffers}</div> @@ -27,7 +27,7 @@ under the License. <#list productPromos as productPromo> <tr> <td> - <div><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${StringUtil.wrapString(productPromo.promoText?if_exists)}</div> + <div><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${StringUtil.wrapString(productPromo.promoText!)}</div> </td> </tr> <#if productPromo_has_next> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Sat Aug 16 11:34:57 2014 @@ -24,11 +24,11 @@ under the License. <#list shoppingCart.getProductPromoUseInfoIter() as productPromoUseInfo> <li> <#-- TODO: when promo pretty print is done show promo short description here --> - ${uiLabelMap.OrderPromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoUseInfo.productPromoId?if_exists}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a> + ${uiLabelMap.OrderPromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoUseInfo.productPromoId!}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a> <#if productPromoUseInfo.productPromoCodeId?has_content> - ${uiLabelMap.OrderWithPromoCode} [${productPromoUseInfo.productPromoCodeId}]</#if> <#if (productPromoUseInfo.totalDiscountAmount != 0)> - ${uiLabelMap.CommonTotalValue} <@ofbizCurrency amount=(-1*productPromoUseInfo.totalDiscountAmount) isoCode=shoppingCart.getCurrency()/></#if> <#if productPromoUseInfo.productPromoCodeId?has_content> - <a href="<@ofbizUrl>removePromotion?promoCode=${productPromoUseInfo.productPromoCodeId?if_exists}</@ofbizUrl>" class="button">${uiLabelMap.OrderRemovePromotion}</a> + <a href="<@ofbizUrl>removePromotion?promoCode=${productPromoUseInfo.productPromoCodeId!}</@ofbizUrl>" class="button">${uiLabelMap.OrderRemovePromotion}</a> </#if> </li> <#if (productPromoUseInfo.quantityLeftInActions > 0)> @@ -41,9 +41,9 @@ under the License. <#list shoppingCart.items() as cartLine> <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)> <#if cartLine.getIsPromo()> - <li>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()?if_exists}] - ${uiLabelMap.OrderIsAPromotionalItem}</li> + <li>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()!}] - ${uiLabelMap.OrderIsAPromotionalItem}</li> <#else> - <li>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()?if_exists}] - ${cartLine.getPromoQuantityUsed()?string.number}/${cartLine.getQuantity()?string.number} ${uiLabelMap.CommonUsed} - ${cartLine.getPromoQuantityAvailable()?string.number} ${uiLabelMap.CommonAvailable} + <li>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()!}] - ${cartLine.getPromoQuantityUsed()?string.number}/${cartLine.getQuantity()?string.number} ${uiLabelMap.CommonUsed} - ${cartLine.getPromoQuantityAvailable()?string.number} ${uiLabelMap.CommonAvailable} <ul> <#list cartLine.getQuantityUsedPerPromoActualIter() as quantityUsedPerPromoActualEntry> <#assign productPromoActualPK = quantityUsedPerPromoActualEntry.getKey()> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Sat Aug 16 11:34:57 2014 @@ -28,7 +28,7 @@ under the License. <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)> <div> - <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a> - <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if> + <#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if> </div> </#list> </#if> @@ -38,7 +38,7 @@ under the License. <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)> <div> - <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a> - <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if> + <#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if> </div> </#list> </#if> @@ -48,7 +48,7 @@ under the License. <#assign productCategory = productPromoCategory.getRelatedOne("ProductCategory", true)> <div> - <a href="<@ofbizUrl>category/~category_id=${productPromoCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a> - <#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if> + <#if productPromoCategory.includeSubCategories! = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if> </div> </#list> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <div class="h3">${uiLabelMap.OrderPromotionDetails}:</div> </div> <div class="screenlet-body"> - <div>${StringUtil.wrapString(productPromo.promoText?if_exists)}</div> - <div>${uiLabelMap.EcommerceGeneratedDescription} ${promoAutoDescription?if_exists}</div> + <div>${StringUtil.wrapString(productPromo.promoText!)}</div> + <div>${uiLabelMap.EcommerceGeneratedDescription} ${promoAutoDescription!}</div> </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl Sat Aug 16 11:34:57 2014 @@ -30,11 +30,11 @@ under the License. <span> <b> <#if (viewIndex > 0)> - <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} <#if (listSize > highIndex)> - | <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId?if_exists}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoId!}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </b> </span> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl Sat Aug 16 11:34:57 2014 @@ -22,7 +22,7 @@ under the License. <ul> <#-- show promotions text --> <#list productPromosAllShowable as productPromo> - <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a>${StringUtil.wrapString(productPromo.promoText?if_exists)}</li> + <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="button">${uiLabelMap.CommonDetails}</a>${StringUtil.wrapString(productPromo.promoText!)}</li> </#list> </ul> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Sat Aug 16 11:34:57 2014 @@ -35,7 +35,7 @@ under the License. <div class="screenlet-body"> <#if shoppingCart.getOrderType() == "SALES_ORDER"> <div> - <#if quantityOnHandTotal?exists && availableToPromiseTotal?exists && (productId)?exists> + <#if quantityOnHandTotal?? && availableToPromiseTotal?? && (productId)??> <ul> <li> <label>${uiLabelMap.ProductQuantityOnHand}</label>: ${quantityOnHandTotal} @@ -69,9 +69,9 @@ under the License. <td> <form name="qohAtpForm" method="post" action="<@ofbizUrl>${target}</@ofbizUrl>"> <fieldset> - <input type="hidden" name="facilityId" value="${facilityId?if_exists}"/> + <input type="hidden" name="facilityId" value="${facilityId!}"/> <input type="hidden" name="productId"/> - <input type="hidden" id="ownerPartyId" name="ownerPartyId" value="${shoppingCart.getBillToCustomerPartyId()?if_exists}" /> + <input type="hidden" id="ownerPartyId" name="ownerPartyId" value="${shoppingCart.getBillToCustomerPartyId()!}" /> </fieldset> </form> <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="quickaddform" style="margin: 0;"> @@ -106,11 +106,11 @@ under the License. <td align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td> <td> <div> - <#if useAsDefaultDesiredDeliveryDate?exists> + <#if useAsDefaultDesiredDeliveryDate??> <#assign value = defaultDesiredDeliveryDate> </#if> <@htmlTemplate.renderDateTimeField name="itemDesiredDeliveryDate" value="${value!''}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="item1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/> + <input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate??> checked="checked"</#if>/> ${uiLabelMap.OrderUseDefaultDesiredDeliveryDate} </div> </td> @@ -150,8 +150,8 @@ under the License. <td align="right"><div>${uiLabelMap.CommonComment} :</div></td> <td> <div> - <input type="text" size="25" name="itemComment" value="${defaultComment?if_exists}" /> - <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked="checked"</#if> /> + <input type="text" size="25" name="itemComment" value="${defaultComment!}" /> + <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment??>checked="checked"</#if> /> ${uiLabelMap.OrderUseDefaultComment} </div> </td> @@ -172,12 +172,12 @@ under the License. <div> ${uiLabelMap.OrderOrderItemType}: <select name="add_item_type"><option value="BULK_ORDER_ITEM">${uiLabelMap.ProductBulkItem}</option><option value="WORK_ORDER_ITEM">${uiLabelMap.ProductWorkItem}</option></select> <br/>${uiLabelMap.ProductProductCategory}: - <@htmlTemplate.lookupField formName="bulkworkaddform" value="${requestParameters.add_category_id?if_exists}" name="add_category_id" id="add_category_id" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField formName="bulkworkaddform" value="${requestParameters.add_category_id!}" name="add_category_id" id="add_category_id" fieldFormName="LookupProductCategory"/> </div> <div> ${uiLabelMap.CommonDescription}: <input type="text" size="25" name="add_item_description" value=""/> ${uiLabelMap.OrderQuantity}: <input type="text" size="3" name="quantity" value="${requestParameters.quantity?default("1")}"/> - ${uiLabelMap.OrderPrice}: <input type="text" size="6" name="price" value="${requestParameters.price?if_exists}"/> + ${uiLabelMap.OrderPrice}: <input type="text" size="6" name="price" value="${requestParameters.price!}"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToOrder}"/> </div> </form> @@ -192,4 +192,4 @@ under the License. document.quickaddform.add_product_id.focus(); </script> -<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()?if_exists} locale=${shoppingCart.getLocale()?if_exists} currencyUom=${shoppingCart.getCurrency()?if_exists} userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))?if_exists} autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))?if_exists} --> +<!-- Internal cart info: productStoreId=${shoppingCart.getProductStoreId()!} locale=${shoppingCart.getLocale()!} currencyUom=${shoppingCart.getCurrency()!} userLoginId=${(shoppingCart.getUserLogin().getString("userLoginId"))!} autoUserLogin=${(shoppingCart.getAutoUserLogin().getString("userLoginId"))!} --> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Sat Aug 16 11:34:57 2014 @@ -23,7 +23,7 @@ under the License. <#assign assocProduct = (delegator.findOne("Product", {"productId" : productAssoc.productIdTo}, false))/> <#if assocProduct?has_content> <td><a href="<@ofbizUrl>/product?product_id=${productAssoc.productIdTo}</@ofbizUrl>"class="buttontext">${productAssoc.productIdTo}</a></td> - <td>- ${(assocProduct.productName)?if_exists}<i>(${(productAssocType.description)?default("Unknown")})</i></td> + <td>- ${(assocProduct.productName)!}<i>(${(productAssocType.description)?default("Unknown")})</i></td> </#if> </#macro> <div class="screenlet"> @@ -77,11 +77,11 @@ under the License. <table border="0"> <tr><td colspan="2"> <div> - <#if cartLine.getProductId()?exists> + <#if cartLine.getProductId()??> <#-- product item --> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="buttontext">${cartLine.getProductId()}</a> - <input size="60" type="text" name="description_${cartLineIndex}" value="${cartLine.getName()?default("")}"/><br /> - <i>${cartLine.getDescription()?if_exists}</i> + <i>${cartLine.getDescription()!}</i> <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> <#-- only applies to sales orders, not purchase orders --> <#-- if inventory is not required check to see if it is out of stock and needs to have a message shown about that... --> @@ -93,7 +93,7 @@ under the License. </#if> <#else> <#-- this is a non-product item --> - <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} + <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!} </#if> <#-- display the item's features --> <#assign features = ""> @@ -117,7 +117,7 @@ under the License. <#if cartLine.getRequirementId()?has_content> <tr> <td colspan="2"> - <div><b>${uiLabelMap.OrderRequirementId}</b>: ${cartLine.getRequirementId()?if_exists}</div> + <div><b>${uiLabelMap.OrderRequirementId}</b>: ${cartLine.getRequirementId()!}</div> </td> </tr> </#if> @@ -125,23 +125,23 @@ under the License. <#if cartLine.getQuoteItemSeqId()?has_content> <tr> <td colspan="2"> - <div><b>${uiLabelMap.OrderOrderQuoteId}</b>: ${cartLine.getQuoteId()?if_exists} - ${cartLine.getQuoteItemSeqId()?if_exists}</div> + <div><b>${uiLabelMap.OrderOrderQuoteId}</b>: ${cartLine.getQuoteId()!} - ${cartLine.getQuoteItemSeqId()!}</div> </td> </tr> </#if> </#if> <#if cartLine.getItemComment()?has_content> <tr><td><div>${uiLabelMap.CommonComment} : </div></td> - <td><div>${cartLine.getItemComment()?if_exists}</div> + <td><div>${cartLine.getItemComment()!}</div> </td></tr> </#if> <#if cartLine.getDesiredDeliveryDate()?has_content> <tr><td><div>${uiLabelMap.OrderDesiredDeliveryDate}: </div></td> - <td><div>${cartLine.getDesiredDeliveryDate()?if_exists}</div> + <td><div>${cartLine.getDesiredDeliveryDate()!}</div> </td></tr> </#if> <#-- inventory summary --> - <#if cartLine.getProductId()?exists> + <#if cartLine.getProductId()??> <#assign productId = cartLine.getProductId()> <#assign product = cartLine.getProduct()> <tr> @@ -153,7 +153,7 @@ under the License. ${uiLabelMap.ProductMarketingPackageATP} = ${mktgPkgATPMap.get(productId)}, ${uiLabelMap.ProductMarketingPackageQOH} = ${mktgPkgQOHMap.get(productId)} <#if ( mktgPkgATPMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER')> <#assign backOrdered = cartLine.getQuantity() - mktgPkgATPMap.get(cartLine.getProductId())/> - <span style="color: red; font-size: 15px;">[${backOrdered?if_exists} ${uiLabelMap.OrderBackOrdered}]</span> + <span style="color: red; font-size: 15px;">[${backOrdered!} ${uiLabelMap.OrderBackOrdered}]</span> </#if> </#if> <#if (availableToPromiseMap.get(cartLine.getProductId()) <= 0) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId! != "DIGITAL_GOOD" && product.productTypeId! != "MARKETING_PKG_AUTO" && product.productTypeId! != "MARKETING_PKG_PICK"> @@ -161,7 +161,7 @@ under the License. <#else> <#if (availableToPromiseMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER') && product.productTypeId != "DIGITAL_GOOD" && product.productTypeId != "MARKETING_PKG_AUTO" && product.productTypeId != "MARKETING_PKG_PICK"> <#assign backOrdered = cartLine.getQuantity() - availableToPromiseMap.get(cartLine.getProductId())/> - <span style="color: red;">[${backOrdered?if_exists} ${uiLabelMap.OrderBackOrdered}]</span> + <span style="color: red;">[${backOrdered!} ${uiLabelMap.OrderBackOrdered}]</span> </#if> </#if> </div> @@ -169,7 +169,7 @@ under the License. </tr> </#if> <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> - <#assign currentOrderItemType = cartLine.getItemTypeGenericValue()?if_exists/> + <#assign currentOrderItemType = cartLine.getItemTypeGenericValue()!/> <tr> <td> <div> @@ -211,17 +211,17 @@ under the License. </tr> <#-- Show Associated Products (not for Variants) --> - <#if cartLine.getProductId()?exists> - <#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc", null, Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"), false)?if_exists/> + <#if cartLine.getProductId()??> + <#assign itemProductAssocList = cartLine.getProduct().getRelated("MainProductAssoc", null, Static["org.ofbiz.base.util.UtilMisc"].toList("productAssocTypeId", "sequenceNum"), false)!/> </#if> - <#if itemProductAssocList?exists && itemProductAssocList?has_content> + <#if itemProductAssocList?? && itemProductAssocList?has_content> <tr><td colspan="8"><hr /></td></tr> <tr> <td>${uiLabelMap.OrderAssociatedProducts}</td> - <td><a href="<@ofbizUrl>LookupAssociatedProducts?productId=${cartLine.getProductId()?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickLookup}</a></td> + <td><a href="<@ofbizUrl>LookupAssociatedProducts?productId=${cartLine.getProductId()!}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickLookup}</a></td> </tr> <#assign relatedProdCount = 0/> - <#list itemProductAssocList?if_exists as itemProductAssoc> + <#list itemProductAssocList! as itemProductAssoc> <tr> <#if "PRODUCT_VARIANT" != itemProductAssoc.productAssocTypeId> <#assign relatedProdCount = relatedProdCount + 1/> @@ -238,7 +238,7 @@ under the License. <div>${uiLabelMap.OrderChooseFollowingForGift}:</div> <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId> <#assign alternativeOptionProduct = delegator.findOne("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId), true)> - <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher)?if_exists> + <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher)!> <div><a href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div> </#list> </#if> @@ -247,13 +247,13 @@ under the License. <#-- gift wrap option --> <#assign showNoGiftWrapOptions = false> <td nowrap="nowrap" align="right"> - <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP?if_exists> - <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")?if_exists> + <#assign giftWrapOption = lineOptionalFeatures.GIFT_WRAP!> + <#assign selectedOption = cartLine.getAdditionalProductFeatureAndAppl("GIFT_WRAP")!> <#if giftWrapOption?has_content> <select name="option^GIFT_WRAP_${cartLineIndex}" onchange="javascript:document.cartform.submit()"> <option value="NO^">${uiLabelMap.OrderNoGiftWrap}</option> <#list giftWrapOption as option> - <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?exists && selectedOption.productFeatureId == option.productFeatureId)>selected="selected"</#if>>${option.description} : <@ofbizCurrency amount=option.amount?default(0) isoCode=currencyUomId/></option> + <option value="${option.productFeatureId}" <#if ((selectedOption.productFeatureId)?? && selectedOption.productFeatureId == option.productFeatureId)>selected="selected"</#if>>${option.description} : <@ofbizCurrency amount=option.amount?default(0) isoCode=currencyUomId/></option> </#list> </select> <#elseif showNoGiftWrapOptions> @@ -267,7 +267,7 @@ under the License. <#-- end gift wrap option --> <td nowrap="nowrap" align="center"> <div> - <#if cartLine.getIsPromo() || cartLine.getShoppingListId()?exists> + <#if cartLine.getIsPromo() || cartLine.getShoppingListId()??> ${cartLine.getQuantity()?string.number} <#else> <input size="6" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}"/> @@ -309,7 +309,7 @@ under the License. <tr> <td colspan="4" nowrap="nowrap" align="right"> <div> - <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)?if_exists} + <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)!} <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>: </div> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if product?exists && mainProducts?exists> +<#if product?? && mainProducts??> <select name="parentProductId" onchange="javascript:displayProductVirtualVariantId(this.value);"> <option value="">Select Unit Of Measure</option> <#list mainProducts as mainProduct> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Sat Aug 16 11:34:57 2014 @@ -25,14 +25,14 @@ under the License. <table border="0" wdith="100%"> <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" /> <#if searchCategory?has_content> - <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}" /> + <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" /> <tr> <td align="right" valign="middle"> <div>${uiLabelMap.ProductCategory}:</div> </td> <td valign="middle"> <div> - <b>"${(searchCategory.description)?if_exists}"</b>${uiLabelMap.ProductIncludeSubCategories} + <b>"${(searchCategory.description)!}"</b>${uiLabelMap.ProductIncludeSubCategories} ${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /> ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" /> </div> @@ -45,7 +45,7 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}" /> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" /> ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /> ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /> </div> @@ -57,7 +57,7 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> <td align="right" valign="middle"> - <div>${(productFeatureType.get("description",locale))?if_exists}:</div> + <div>${(productFeatureType.get("description",locale))!}:</div> </td> <td valign="middle"> <div> @@ -80,7 +80,7 @@ under the License. <select name="SEARCH_SUPPLIER_ID"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail> - <option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?exists & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected="selected"</#if>>${supplerPartyRoleAndPartyDetail.groupName?if_exists} ${supplerPartyRoleAndPartyDetail.firstName?if_exists} ${supplerPartyRoleAndPartyDetail.lastName?if_exists} [${supplerPartyRoleAndPartyDetail.partyId}]</option> + <option value="${supplerPartyRoleAndPartyDetail.partyId}"<#if (sessionAttributes.orderPartyId?? & sessionAttributes.orderPartyId = supplerPartyRoleAndPartyDetail.partyId)> selected="selected"</#if>>${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option> </#list> </select> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Sat Aug 16 11:34:57 2014 @@ -29,13 +29,13 @@ under the License. <#-- Show the category branch --> <#assign crumbs = Static["org.ofbiz.product.category.CategoryWorker"].getTrail(request)/> <#list crumbs as crumb> - <#if catContentWrappers?exists && catContentWrappers[crumb]?exists> + <#if catContentWrappers?? && catContentWrappers[crumb]??> <#if !isDefaultTheme> <li> <a href="<@ofbizCatalogUrl currentCategoryId=crumb previousCategoryId=previousCategoryId!""/>" class="<#if crumb_has_next>linktext<#else>buttontextdisabled</#if>"> - <#if catContentWrappers[crumb].get("CATEGORY_NAME")?exists> + <#if catContentWrappers[crumb].get("CATEGORY_NAME")??> ${catContentWrappers[crumb].get("CATEGORY_NAME")} - <#elseif catContentWrappers[crumb].get("DESCRIPTION")?exists> + <#elseif catContentWrappers[crumb].get("DESCRIPTION")??> ${catContentWrappers[crumb].get("DESCRIPTION")} <#else> ${crumb} @@ -44,9 +44,9 @@ under the License. </li> <#else> <a href="<@ofbizCatalogUrl currentCategoryId=crumb previousCategoryId=previousCategoryId!""/>" class="<#if crumb_has_next>linktext<#else>buttontextdisabled</#if>"> - <#if catContentWrappers[crumb].get("CATEGORY_NAME")?exists> + <#if catContentWrappers[crumb].get("CATEGORY_NAME")??> ${catContentWrappers[crumb].get("CATEGORY_NAME")} - <#elseif catContentWrappers[crumb].get("DESCRIPTION")?exists> + <#elseif catContentWrappers[crumb].get("DESCRIPTION")??> ${catContentWrappers[crumb].get("DESCRIPTION")} <#else> ${crumb} @@ -58,11 +58,11 @@ under the License. </#if> </#list> <#-- Show the product, if there is one --> - <#if productContentWrapper?exists> + <#if productContentWrapper??> <#if isDefaultTheme> - > ${productContentWrapper.get("PRODUCT_NAME")?if_exists} + > ${productContentWrapper.get("PRODUCT_NAME")!} <#else> - <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li> + <li>${productContentWrapper.get("PRODUCT_NAME")!}</li> </ul> </#if> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/category.ftl Sat Aug 16 11:34:57 2014 @@ -21,7 +21,7 @@ ${pages.get("/entry/OrderEntryTabBar.ftl <#if productCategory?has_content> ${pages.get(detailTemplate)} <#else> - <center><h2>${uiLabelMap.ProductCategoryNotFoundForCategoryID} ${requestParameters.category_id?if_exists}!</h2></center> + <center><h2>${uiLabelMap.ProductCategoryNotFoundForCategoryID} ${requestParameters.category_id!}!</h2></center> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |