svn commit: r1618336 [7/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [7/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.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. --> -${virtualJavaScript?if_exists} +${virtualJavaScript!} <script type="text/javascript"> <!-- function displayProductVirtualId(variantId, virtualProductId, pForm) { @@ -51,7 +51,7 @@ ${virtualJavaScript?if_exists} } //--> </script> -<#if product?exists> +<#if product??> <#-- variable setup --> <#if backendPath?default("N") == "Y"> <#assign productUrl><@ofbizCatalogUrl productId=product.productId productCategoryId=categoryId/></#assign> @@ -59,10 +59,10 @@ ${virtualJavaScript?if_exists} <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId productCategoryId=categoryId/></#assign> </#if> - <#if requestAttributes.productCategoryMember?exists> + <#if requestAttributes.productCategoryMember??> <#assign prodCatMem = requestAttributes.productCategoryMember> </#if> - <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists> + <#assign smallImageUrl = productContentWrapper.get("SMALL_IMAGE_URL")!> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#-- end variable setup --> <#assign productInfoLinkId = "productInfoLink"> @@ -72,17 +72,17 @@ ${virtualJavaScript?if_exists} <div class="productsummary"> <div class="smallimage"> <a href="${productUrl}"> - <span id="${productInfoLinkId}" class="popup_link"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/></span> + <span id="${productInfoLinkId}" class="popup_link"><img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/></span> </a> </div> <div id="${productDetailId}" class="popup" style="display:none;"> <table> <tr valign="top"> <td> - <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> - ${uiLabelMap.ProductProductId} : ${product.productId?if_exists}<br /> - ${uiLabelMap.ProductProductName} : ${product.productName?if_exists}<br /> - ${uiLabelMap.CommonDescription} : ${product.description?if_exists} + <img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> + ${uiLabelMap.ProductProductId} : ${product.productId!}<br /> + ${uiLabelMap.ProductProductName} : ${product.productName!}<br /> + ${uiLabelMap.CommonDescription} : ${product.description!} </td> </tr> </table> @@ -96,32 +96,32 @@ ${virtualJavaScript?if_exists} </script> <div class="productbuy"> <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)> <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> <#-- check to see if it is a rental item; will enter parameters on the detail screen--> - <#elseif product.productTypeId?if_exists == "ASSET_USAGE"> + <#elseif product.productTypeId! == "ASSET_USAGE"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a> <#-- check to see if it is an aggregated or configurable product; will enter parameters on the detail screen--> - <#elseif product.productTypeId?if_exists == "AGGREGATED" || product.productTypeId?if_exists == "AGGREGATED_SERVICE"> + <#elseif product.productTypeId! == "AGGREGATED" || product.productTypeId! == "AGGREGATED_SERVICE"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderConfigure}...</a> <#-- check to see if the product is a virtual product --> - <#elseif product.isVirtual?exists && product.isVirtual == "Y"> + <#elseif product.isVirtual?? && product.isVirtual == "Y"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> <#-- check to see if the product requires an amount --> - <#elseif product.requireAmount?exists && product.requireAmount == "Y"> + <#elseif product.requireAmount?? && product.requireAmount == "Y"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a> - <#elseif product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"> + <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"> <a href="${productUrl}" class="buttontext">${uiLabelMap.OrderRent}...</a> <#else> - <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}form" style="margin: 0;"> + <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}form" style="margin: 0;"> <input type="hidden" name="add_product_id" value="${product.productId}"/> <input type="text" size="5" name="quantity" value="1"/> <input type="hidden" name="clearSearch" value="N"/> <input type="hidden" name="mainSubmitted" value="Y"/> - <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}form.submit()" class="buttontext">${uiLabelMap.OrderAddToCart}</a> + <a href="javascript:document.the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}form.submit()" class="buttontext">${uiLabelMap.OrderAddToCart}</a> <#if mainProducts?has_content> <input type="hidden" name="product_id" value=""/> <select name="productVariantId" onchange="javascript:displayProductVirtualId(this.value, '${product.productId}', this.form);"> @@ -137,22 +137,22 @@ ${virtualJavaScript?if_exists} </#if> </form> - <#if prodCatMem?exists && prodCatMem.quantity?exists && 0.00 < prodCatMem.quantity?double> - <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;"> - <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/> - <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/> + <#if prodCatMem?? && prodCatMem.quantity?? && 0.00 < prodCatMem.quantity?double> + <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform" style="margin: 0;"> + <input type="hidden" name="add_product_id" value="${prodCatMem.productId!}"/> + <input type="hidden" name="quantity" value="${prodCatMem.quantity!}"/> <input type="hidden" name="clearSearch" value="N"/> <input type="hidden" name="mainSubmitted" value="Y"/> - <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> + <a href="javascript:document.the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> </form> <#assign productCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", prodCatMem.productCategoryId), false)/> <#if productCategory.productCategoryTypeId != "BEST_SELL_CATEGORY"> - <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform" style="margin: 0;"> - <input type="hidden" name="add_product_id" value="${prodCatMem.productId?if_exists}"/> - <input type="hidden" name="quantity" value="${prodCatMem.quantity?if_exists}"/> + <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform" style="margin: 0;"> + <input type="hidden" name="add_product_id" value="${prodCatMem.productId!}"/> + <input type="hidden" name="quantity" value="${prodCatMem.quantity!}"/> <input type="hidden" name="clearSearch" value="N"/> <input type="hidden" name="mainSubmitted" value="Y"/> - <a href="javascript:document.the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> + <a href="javascript:document.the${requestAttributes.formNamePrefix!}${requestAttributes.listIndex!}defaultform.submit()" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> </form> </#if> </#if> @@ -160,12 +160,12 @@ ${virtualJavaScript?if_exists} </div> <div class="productinfo"> <div> - <a href="${productUrl}" class="linktext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a> + <a href="${productUrl}" class="linktext">${productContentWrapper.get("PRODUCT_NAME")!}</a> </div> - <div>${productContentWrapper.get("DESCRIPTION")?if_exists}<#if daysToShip?exists> - ${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div> + <div>${productContentWrapper.get("DESCRIPTION")!}<#if daysToShip??> - ${uiLabelMap.ProductUsuallyShipsIn} <b>${daysToShip}</b> ${uiLabelMap.CommonDays}!</#if></div> <#-- Display category-specific product comments --> - <#if prodCatMem?exists && prodCatMem.comments?has_content> + <#if prodCatMem?? && prodCatMem.comments?has_content> <div>${prodCatMem.comments}</div> </#if> @@ -183,18 +183,18 @@ ${virtualJavaScript?if_exists} </div> </#if> <div> - <b>${product.productId?if_exists}</b> - <#if totalPrice?exists> + <b>${product.productId!}</b> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <#if price.competitivePrice?exists && price.price?exists && price.price?double < price.competitivePrice?double> + <#if price.competitivePrice?? && price.price?? && price.price?double < price.competitivePrice?double> ${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span> </#if> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> ${uiLabelMap.ProductListPrice}: <span class="basePrice"><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span> </#if> <b> - <#if price.isSale?exists && price.isSale> + <#if price.isSale?? && price.isSale> <span class="salePrice">${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> @@ -202,32 +202,32 @@ ${virtualJavaScript?if_exists} </#if> <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")> - ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> + ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> </#if> </b> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> <#assign priceSaved = price.listPrice?double - price.price?double> <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100> ${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span> </#if> </#if> <#-- show price details ("showPriceDetails" field can be set in the screen definition) --> - <#if (showPriceDetails?exists && showPriceDetails?default("N") == "Y")> - <#if price.orderItemPriceInfos?exists> + <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")> + <#if price.orderItemPriceInfos??> <#list price.orderItemPriceInfos as orderItemPriceInfo> - <div>${orderItemPriceInfo.description?if_exists}</div> + <div>${orderItemPriceInfo.description!}</div> </#list> </#if> </#if> </div> - <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?long > 2)> + <#if averageRating?? && (averageRating?double > 0) && numRatings?? && (numRatings?long > 2)> <div>${uiLabelMap.OrderAverageRating}: ${averageRating} (${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</div> </#if> - <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">addToCompare</@ofbizUrl>" name="addToCompare${requestAttributes.listIndex?if_exists}form"> + <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">addToCompare</@ofbizUrl>" name="addToCompare${requestAttributes.listIndex!}form"> <input type="hidden" name="productId" value="${product.productId}"/> <input type="hidden" name="mainSubmitted" value="Y"/> </form> - <a href="javascript:document.addToCompare${requestAttributes.listIndex?if_exists}form.submit()" class="buttontext">${uiLabelMap.ProductAddToCompare}</a> + <a href="javascript:document.addToCompare${requestAttributes.listIndex!}form.submit()" class="buttontext">${uiLabelMap.ProductAddToCompare}</a> </div> </div> <#else> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Sat Aug 16 11:34:57 2014 @@ -21,17 +21,17 @@ under the License. <table border='0' cellpadding='3' cellspacing='0'> <tr> <td> - <h2>${productCategory.categoryName?if_exists}</h2> + <h2>${productCategory.categoryName!}</h2> </td> <td align="right"> <form name="choosequickaddform" method="post" action="<@ofbizUrl>quickadd</@ofbizUrl>" style='margin: 0;'> <select name='category_id'> - <option value='${productCategory.productCategoryId}'>${productCategory.categoryName?if_exists}</option> + <option value='${productCategory.productCategoryId}'>${productCategory.categoryName!}</option> <option value='${productCategory.productCategoryId}'>--</option> <#list quickAddCats as quickAddCatalogId> <#assign loopCategory = delegator.findOne("ProductCategory", Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", quickAddCatalogId), true)> <#if loopCategory?has_content> - <option value='${quickAddCatalogId}'>${loopCategory.categoryName?if_exists}</option> + <option value='${quickAddCatalogId}'>${loopCategory.categoryName!}</option> </#if> </#list> </select> @@ -39,15 +39,15 @@ under the License. </form> </td> </tr> - <#if productCategory.categoryImageUrl?exists || productCategory.longDescription?exists> + <#if productCategory.categoryImageUrl?? || productCategory.longDescription??> <tr><td colspan='2'><hr class='sepbar'/></td></tr> <tr> <td valign="top" width="0" colspan='2'> <div> - <#if productCategory.categoryImageUrl?exists> + <#if productCategory.categoryImageUrl??> <img src="<@ofbizContentUrl>${productCategory.categoryImageUrl}</@ofbizContentUrl>" vspace="5" hspace="5" class="cssImgLarge" alt="" /> </#if> - ${productCategory.longDescription?if_exists} + ${productCategory.longDescription!} </div> </td> </tr> @@ -55,7 +55,7 @@ under the License. </table> </#if> -<#if productCategoryMembers?exists && 0 < productCategoryMembers?size> +<#if productCategoryMembers?? && 0 < productCategoryMembers?size> <br /> <center> <form method="post" action="<@ofbizUrl>addtocartbulk</@ofbizUrl>" name="bulkaddform" style='margin: 0;'> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Sat Aug 16 11:34:57 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if product?exists> +<#if product??> <span class="pid"> <div> <b>${product.productId}</b> @@ -25,12 +25,12 @@ under the License. </span> <span class="name"> <div> - <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</a> + <a href="<@ofbizUrl>product?product_id=${product.productId}</@ofbizUrl>" class="buttontext">${productContentWrapper.get("PRODUCT_NAME")!}</a> </div> </span> <span class="listPrice"> <div> - <#if price.listPrice?exists && price.price?exists && price.price?double < price.listPrice?double> + <#if price.listPrice?? && price.price?? && price.price?double < price.listPrice?double> ${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/> <#else> @@ -38,25 +38,25 @@ under the License. </div> </span> <span class="totalPrice"> - <#if totalPrice?exists> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <div class="<#if price.isSale?exists && price.isSale>salePrice<#else>normalPrice</#if>"> + <div class="<#if price.isSale?? && price.isSale>salePrice<#else>normalPrice</#if>"> <b><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></b> </div> </#if> </span> <span class="qty"> <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <div style="color: red;">${uiLabelMap.ProductNotYetAvailable}</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.before(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.before(product.salesDiscontinuationDate)> <div style="color: red;">${uiLabelMap.ProductNoLongerAvailable}</div> <#-- check to see if the product is a virtual product --> <#elseif product.isVirtual?default("N") == "Y"> <div> - <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> + <a href="<@ofbizUrl>product?<#if categoryId??>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> </div> <#else> <div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl Sat Aug 16 11:34:57 2014 @@ -17,8 +17,8 @@ specific language governing permissions under the License. --> <#-- variable setup and worker calls --> -<#if (requestAttributes.topLevelList)?exists><#assign topLevelList = requestAttributes.topLevelList></#if> -<#if (requestAttributes.curCategoryId)?exists><#assign curCategoryId = requestAttributes.curCategoryId></#if> +<#if (requestAttributes.topLevelList)??><#assign topLevelList = requestAttributes.topLevelList></#if> +<#if (requestAttributes.curCategoryId)??><#assign curCategoryId = requestAttributes.curCategoryId></#if> <#-- looping macro --> <#macro categoryList parentCategory category> @@ -26,55 +26,55 @@ under the License. <#--if parentCategory.productCategoryId != category.productCategoryId> <#local pStr = "/~pcategory=" + parentCategory.productCategoryId> </#if--> - <#if curCategoryId?exists && curCategoryId == category.productCategoryId> + <#if curCategoryId?? && curCategoryId == category.productCategoryId> <div class="browsecategorytext"> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> </#if> - <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> </#if> <#else> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?if_exists}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName!}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> </#if> </#if> </div> <#else> <div class="browsecategorytext"> <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a> </#if> <#elseif catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a> </#if> <#else> - <#if sessionAttributes.shoppingCart?exists && sessionAttributes.shoppingCart.isPurchaseOrder()> - <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId?if_exists}/~category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?if_exists}</a> + <#if sessionAttributes.shoppingCart?? && sessionAttributes.shoppingCart.isPurchaseOrder()> + <a href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName!}</a> <#else> - <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr?if_exists}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> + <a href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?default(category.productCategoryId)}</a> </#if> </#if> </div> </#if> - <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> + <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> - <#if subCatList?exists> + <#if subCatList??> <#list subCatList as subCat> <div class="browsecategorylist"> <@categoryList parentCategory=category category=subCat/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Sat Aug 16 11:34:57 2014 @@ -20,7 +20,7 @@ under the License. <#assign shoppingCartOrderType = ""> <#assign shoppingCartProductStore = "NA"> <#assign shoppingCartChannelType = ""> -<#if shoppingCart?exists> +<#if shoppingCart??> <#assign shoppingCartOrderType = shoppingCart.getOrderType()> <#assign shoppingCartProductStore = shoppingCart.getProductStoreId()?default("NA")> <#assign shoppingCartChannelType = shoppingCart.getChannelType()?default("")> @@ -36,7 +36,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> + <li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li> <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> </ul> @@ -44,7 +44,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" name="salesentryform" action="<@ofbizUrl>initorderentry</@ofbizUrl>"> - <input type="hidden" name="originOrderId" value="${parameters.originOrderId?if_exists}"/> + <input type="hidden" name="originOrderId" value="${parameters.originOrderId!}"/> <input type="hidden" name="finalizeMode" value="type"/> <input type="hidden" name="orderMode" value="SALES_ORDER"/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> @@ -54,17 +54,17 @@ under the License. <td > </td> <td valign='middle'> <div class='tabletext'> - <select name="productStoreId"<#if sessionAttributes.orderMode?exists> disabled</#if>> + <select name="productStoreId"<#if sessionAttributes.orderMode??> disabled</#if>> <#assign currentStore = shoppingCartProductStore> <#if defaultProductStore?has_content> - <option value="${defaultProductStore.productStoreId}">${defaultProductStore.storeName?if_exists}</option> + <option value="${defaultProductStore.productStoreId}">${defaultProductStore.storeName!}</option> <option value="${defaultProductStore.productStoreId}">----</option> </#if> <#list productStores as productStore> - <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected="selected"</#if>>${productStore.storeName?if_exists}</option> + <option value="${productStore.productStoreId}"<#if productStore.productStoreId == currentStore> selected="selected"</#if>>${productStore.storeName!}</option> </#list> </select> - <#if sessionAttributes.orderMode?exists>${uiLabelMap.OrderCannotBeChanged}</#if> + <#if sessionAttributes.orderMode??>${uiLabelMap.OrderCannotBeChanged}</#if> </div> </td> </tr> @@ -78,7 +78,7 @@ under the License. <select name="salesChannelEnumId"> <#assign currentChannel = shoppingCartChannelType> <#if defaultSalesChannel?has_content> - <option value="${defaultSalesChannel.enumId}">${defaultSalesChannel.description?if_exists}</option> + <option value="${defaultSalesChannel.enumId}">${defaultSalesChannel.description!}</option> <option value="${defaultSalesChannel.enumId}"> ---- </option> </#if> <option value="">${uiLabelMap.OrderNoChannel}</option> @@ -90,10 +90,10 @@ under the License. </td> </tr> <tr><td colspan="4"> </td></tr> - <#if partyId?exists> + <#if partyId??> <#assign thisPartyId = partyId> <#else> - <#assign thisPartyId = requestParameters.partyId?if_exists> + <#assign thisPartyId = requestParameters.partyId!> </#if> <tr> <td> </td> @@ -111,7 +111,7 @@ under the License. <td> </td> <td valign='middle'> <div class='tabletext'> - <@htmlTemplate.lookupField value='${thisPartyId?if_exists}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/> + <@htmlTemplate.lookupField value='${thisPartyId!}' formName="salesentryform" name="partyId" id="partyId" fieldFormName="LookupCustomerName"/> </div> </td> </tr> @@ -128,7 +128,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li> + <li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart??> ${uiLabelMap.OrderInProgress}</#if></li> <li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li> <li><a href="/partymgr/control/findparty?${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyFindParty}</a></li> </ul> @@ -139,10 +139,10 @@ under the License. <input type='hidden' name='finalizeMode' value='type'/> <input type='hidden' name='orderMode' value='PURCHASE_ORDER'/> <table width="100%" border='0' cellspacing='0' cellpadding='0'> - <#if partyId?exists> + <#if partyId??> <#assign thisPartyId = partyId> <#else> - <#assign thisPartyId = requestParameters.partyId?if_exists> + <#assign thisPartyId = requestParameters.partyId!> </#if> <tr> <td> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Sat Aug 16 11:34:57 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/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Sat Aug 16 11:34:57 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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |