svn commit: r1618554 [7/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [7/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoText.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoText.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoText.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl Mon Aug 18 07:42:27 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Mon Aug 18 07:42:27 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/category.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/category.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/category.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/category.ftl Mon Aug 18 07:42:27 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> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Mon Aug 18 07:42:27 2014 @@ -67,31 +67,31 @@ under the License. </#macro> -<#if productCategory?exists> - <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME")?if_exists/> - <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION")?if_exists/> +<#if productCategory??> + <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME")!/> + <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION")!/> <#if categoryName?has_content> <h1>${categoryName}</h1> </#if> <#if categoryDescription?has_content> <h1>${categoryDescription}</h1> </#if> - <#if hasQuantities?exists> - <form method="post" action="<@ofbizUrl>addCategoryDefaults<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="thecategoryform" style='margin: 0;'> + <#if hasQuantities??> + <form method="post" action="<@ofbizUrl>addCategoryDefaults<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="thecategoryform" style='margin: 0;'> <input type='hidden' name='add_category_id' value='${productCategory.productCategoryId}'/> - <#if requestParameters.product_id?exists><input type='hidden' name='product_id' value='${requestParameters.product_id}'/></#if> - <#if requestParameters.category_id?exists><input type='hidden' name='category_id' value='${requestParameters.category_id}'/></#if> - <#if requestParameters.VIEW_INDEX?exists><input type='hidden' name='VIEW_INDEX' value='${requestParameters.VIEW_INDEX}'/></#if> - <#if requestParameters.SEARCH_STRING?exists><input type='hidden' name='SEARCH_STRING' value='${requestParameters.SEARCH_STRING}'/></#if> - <#if requestParameters.SEARCH_CATEGORY_ID?exists><input type='hidden' name='SEARCH_CATEGORY_ID' value='${requestParameters.SEARCH_CATEGORY_ID}'/></#if> + <#if requestParameters.product_id??><input type='hidden' name='product_id' value='${requestParameters.product_id}'/></#if> + <#if requestParameters.category_id??><input type='hidden' name='category_id' value='${requestParameters.category_id}'/></#if> + <#if requestParameters.VIEW_INDEX??><input type='hidden' name='VIEW_INDEX' value='${requestParameters.VIEW_INDEX}'/></#if> + <#if requestParameters.SEARCH_STRING??><input type='hidden' name='SEARCH_STRING' value='${requestParameters.SEARCH_STRING}'/></#if> + <#if requestParameters.SEARCH_CATEGORY_ID??><input type='hidden' name='SEARCH_CATEGORY_ID' value='${requestParameters.SEARCH_CATEGORY_ID}'/></#if> <a href="javascript:document.thecategoryform.submit()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.ProductAddProductsUsingDefaultQuantities}</span></a> </form> </#if> <#if searchInCategory?default("Y") == "Y"> <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchInCategory}</a> </#if> - <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/> - <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/> + <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")!/> + <#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")!/> <#if categoryImageUrl?string?has_content || longDescription?has_content> <div> <#if categoryImageUrl?string?has_content> @@ -116,11 +116,11 @@ under the License. <#if productCategoryMembers?has_content> <#-- Pagination --> - <#if paginateEcommerceStyle?exists> + <#if paginateEcommerceStyle??> <@paginationControls/> <#else> <#include "component://common/webcommon/includes/htmlTemplate.ftl"/> - <#assign commonUrl = "category?category_id="+ parameters.category_id?if_exists + "&"/> + <#assign commonUrl = "category?category_id="+ parameters.category_id! + "&"/> <#--assign viewIndex = viewIndex - 1/--> <#assign viewIndexFirst = 0/> <#assign viewIndexPrevious = viewIndex - 1/> @@ -163,7 +163,7 @@ under the License. </table> </#if> </div> - <#if paginateEcommerceStyle?exists> + <#if paginateEcommerceStyle??> <@paginationControls/> </#if> <#else> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/compareproducts.ftl Mon Aug 18 07:42:27 2014 @@ -31,41 +31,41 @@ under the License. <#assign smallImageUrl = "/images/defaultImage.jpg"/> </#if> <td style="width:${tdWidth?c}%;"> - <img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> + <img src="<@ofbizContentUrl>${contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" alt="Small Image"/><br /> ${productContentWrapper.get("PRODUCT_NAME")}<br /> - <#if totalPrice?exists> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span class='basePrice'><@ofbizCurrency amount=totalPrice isoCode=totalPrice.currencyUsed/></span></div> <#else> - <#if price.isSale?exists && price.isSale> + <#if price.isSale?? && price.isSale> <#assign priceStyle = "salePrice"> <#else> <#assign priceStyle = "regularPrice"> </#if> <#if (price.price?default(0) > 0 && product.requireAmount?default("N") == "N")> - <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> + <#if "Y" = product.isVirtual!> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> </#if> </#if> <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="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a> - <#elseif product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"/> + <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"/> <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderRent}...</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="javascript:doGetViaParent('${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="javascript:doGetViaParent('${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="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a> <#else/> <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compareFormAdd${product_index}"> @@ -75,10 +75,10 @@ under the License. </form> <a href="javascript:doPostViaParent('compareFormAdd${product_index}');" class="buttontext">${uiLabelMap.OrderAddToCart}</a> - <#if prodCatMem?exists && prodCatMem.quantity?exists && 0.00 < prodCatMem.quantity?double> + <#if prodCatMem?? && prodCatMem.quantity?? && 0.00 < prodCatMem.quantity?double> <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compareFormAddDefault${product_index}" 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}"/> + <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"/> </form> <a href="javascript:doPostViaParent('compareFormAddDefault${product_index}');" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> @@ -119,7 +119,7 @@ under the License. <td>${productFeatureType.get("description", locale)}</td> <#list compareList as product> <#assign productData = productDataMap[product.productId]/> - <#assign applMap = productData[productFeatureTypeId]?if_exists/> + <#assign applMap = productData[productFeatureTypeId]!/> <td> <#if applMap.STANDARD_FEATURE?has_content> <#assign features = applMap.STANDARD_FEATURE/> @@ -152,24 +152,24 @@ under the License. <td> <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="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderMakeBooking}...</a> - <#elseif product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN"/> + <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN"/> <a href="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderRent}...</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="javascript:doGetViaParent('${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="javascript:doGetViaParent('${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="javascript:doGetViaParent('${productUrl}');" class="buttontext">${uiLabelMap.OrderChooseAmount}...</a> <#else/> <form method="post" action="<@ofbizUrl secure="${request.isSecure()?string}">additem</@ofbizUrl>" name="compare2FormAdd${product_index}"> @@ -178,7 +178,7 @@ under the License. <input type="hidden" name="clearSearch" value="N"/> </form> <a href="javascript:doPostViaParent('compare2FormAdd${product_index}');" class="buttontext">${uiLabelMap.OrderAddToCart}</a> - <#if prodCatMem?exists && prodCatMem.quantity?exists && 0.00 < prodCatMem.quantity?double> + <#if prodCatMem?? && prodCatMem.quantity?? && 0.00 < prodCatMem.quantity?double> <a href="javascript:doPostViaParent('compareFormAddDefault${product_index}');" class="buttontext">${uiLabelMap.CommonAddDefault}(${prodCatMem.quantity?string.number}) ${uiLabelMap.OrderToCart}</a> </#if> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Mon Aug 18 07:42:27 2014 @@ -17,12 +17,12 @@ specific language governing permissions under the License. --> <#-- variable setup --> -<#assign productContentWrapper = productContentWrapper?if_exists> -<#assign price = priceMap?if_exists> +<#assign productContentWrapper = productContentWrapper!> +<#assign price = priceMap!> <#-- end variable setup --> <#-- virtual product javascript --> -${virtualJavaScript?if_exists} +${virtualJavaScript!} <script language="JavaScript" type="text/javascript"> <!-- var detailImageUrl = null; @@ -37,7 +37,7 @@ ${virtualJavaScript?if_exists} } function isVirtual(product) { var isVirtual = false; - <#if virtualJavaScript?exists> + <#if virtualJavaScript??> for (i = 0; i < VIR.length; i++) { if (VIR[i] == product) { isVirtual = true; @@ -174,15 +174,15 @@ function getConfigDetails() { <table border="0" cellpadding="2" cellspacing="0" width="100%"> <#-- Category next/previous --> - <#if category?exists> + <#if category??> <tr> <td colspan="2" align="right"> - <#if previousProductId?exists> - <a href='<@ofbizUrl>product/~category_id=${categoryId?if_exists}/~product_id=${previousProductId?if_exists}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <#if previousProductId??> + <a href='<@ofbizUrl>product/~category_id=${categoryId!}/~product_id=${previousProductId!}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> - <a href="<@ofbizUrl>category/~category_id=${categoryId?if_exists}</@ofbizUrl>" class="buttontext">${(category.categoryName)?default(category.description)?if_exists}</a> - <#if nextProductId?exists> - | <a href='<@ofbizUrl>product/~category_id=${categoryId?if_exists}/~product_id=${nextProductId?if_exists}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonNext}</a> + <a href="<@ofbizUrl>category/~category_id=${categoryId!}</@ofbizUrl>" class="buttontext">${(category.categoryName)?default(category.description)!}</a> + <#if nextProductId??> + | <a href='<@ofbizUrl>product/~category_id=${categoryId!}/~product_id=${nextProductId!}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </td> </tr> @@ -193,19 +193,19 @@ function getConfigDetails() { <#-- Product image/name/price --> <tr> <td valign="top" width="0"> - <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")?if_exists> + <#assign productLargeImageUrl = productContentWrapper.get("LARGE_IMAGE_URL")!> <#-- remove the next two lines to always display the virtual image first (virtual images must exist) --> <#if firstLargeImage?has_content> <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' class='cssImgLarge' align='left' alt="" /></a> + <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix!}${productLargeImageUrl!}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' class='cssImgLarge' align='left' alt="" /></a> </#if> </td> <td align="right" valign="top"> - <h2>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</h2> - <div>${productContentWrapper.get("DESCRIPTION")?if_exists}</div> - <div><b>${product.productId?if_exists}</b></div> + <h2>${productContentWrapper.get("PRODUCT_NAME")!}</h2> + <div>${productContentWrapper.get("DESCRIPTION")!}</div> + <div><b>${product.productId!}</b></div> <#-- example of showing a certain type of feature with the product --> <#if sizeProductFeatureAndAppls?has_content> <div> @@ -228,30 +228,30 @@ function getConfigDetails() { - if price < defaultPrice and defaultPrice < listPrice, show default - if isSale show price with salePrice style and print "On Sale!" --> - <#if totalPrice?exists> + <#if totalPrice??> <div>${uiLabelMap.ProductAggregatedPrice}: <span id='totalPrice' 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> <div>${uiLabelMap.ProductCompareAtPrice}: <span class='basePrice'><@ofbizCurrency amount=price.competitivePrice isoCode=price.currencyUsed/></span></div> </#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> <div>${uiLabelMap.ProductListPrice}: <span class='basePrice'><@ofbizCurrency amount=price.listPrice isoCode=price.currencyUsed/></span></div> </#if> - <#if price.listPrice?exists && price.defaultPrice?exists && price.price?exists && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double> + <#if price.listPrice?? && price.defaultPrice?? && price.price?? && price.price?double < price.defaultPrice?double && price.defaultPrice?double < price.listPrice?double> <div>${uiLabelMap.ProductRegularPrice}: <span class='basePrice'><@ofbizCurrency amount=price.defaultPrice isoCode=price.currencyUsed/></span></div> </#if> <div> <b> - <#if price.isSale?exists && price.isSale> + <#if price.isSale?? && price.isSale> <span class='salePrice'>${uiLabelMap.OrderOnSale}!</span> <#assign priceStyle = "salePrice"> <#else> <#assign priceStyle = "regularPrice"> </#if> - ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> + ${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual!> from </#if><span class='${priceStyle}'><@ofbizCurrency amount=price.price isoCode=price.currencyUsed/></span> </b> </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> <#assign priceSaved = price.listPrice?double - price.price?double> <#assign percentSaved = (priceSaved?double / price.listPrice?double) * 100> <div>${uiLabelMap.OrderSave}: <span class="basePrice"><@ofbizCurrency amount=priceSaved isoCode=price.currencyUsed/> (${percentSaved?int}%)</span></div> @@ -259,22 +259,22 @@ function getConfigDetails() { </#if> <#-- Included quantities/pieces --> - <#if product.quantityIncluded?exists && product.quantityIncluded?double != 0> + <#if product.quantityIncluded?? && product.quantityIncluded?double != 0> <div>${uiLabelMap.OrderIncludes}: - ${product.quantityIncluded?if_exists} - ${product.quantityUomId?if_exists} + ${product.quantityIncluded!} + ${product.quantityUomId!} </div> </#if> - <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0> + <#if product.piecesIncluded?? && product.piecesIncluded?long != 0> <div>${uiLabelMap.OrderPieces}: ${product.piecesIncluded} </div> </#if> - <#if daysToShip?exists> + <#if daysToShip??> <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div> </#if> - <#if disFeatureList?exists && 0 < disFeatureList.size()> + <#if disFeatureList?? && 0 < disFeatureList.size()> <p> </p> <#list disFeatureList as currentFeature> <div> @@ -284,11 +284,11 @@ function getConfigDetails() { <div> </div> </#if> - <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform" style='margin: 0;'> + <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addform" style='margin: 0;'> <#assign inStock = true> <#-- Variant Selection --> - <#if product.isVirtual?exists && product.isVirtual?upper_case == "Y"> - <#if variantTree?exists && 0 < variantTree.size()> + <#if product.isVirtual?? && product.isVirtual?upper_case == "Y"> + <#if variantTree?? && 0 < variantTree.size()> <#list featureSet as currentType> <div> <select name="FT${currentType}" onchange="javascript:getList(this.name, (this.selectedIndex-1), 1);"> @@ -307,13 +307,13 @@ function getConfigDetails() { <#else> <input type='hidden' name="product_id" value='${product.productId}' /> <input type='hidden' name="add_product_id" value='${product.productId}' /> - <#if productNotAvailable?exists> + <#if productNotAvailable??> <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)> <#if isStoreInventoryRequired> <div class='tabletext'><b>${uiLabelMap.ProductItemOutOfStock}.</b></div> <#assign inStock = false> <#else> - <div class='tabletext'><b>${product.inventoryMessage?if_exists}</b></div> + <div class='tabletext'><b>${product.inventoryMessage!}</b></div> </#if> </#if> </#if> @@ -321,11 +321,11 @@ function getConfigDetails() { </td></tr><tr><td colspan="2" align="right"> <#-- check to see if introductionDate hasn't passed yet --> - <#if product.introductionDate?exists && nowTimestamp.before(product.introductionDate)> + <#if product.introductionDate?? && nowTimestamp.before(product.introductionDate)> <p> </p> <div class='tabletext' style='color: red;'>${uiLabelMap.ProductProductNotYetMadeAvailable}.</div> <#-- check to see if salesDiscontinuationDate has passed --> - <#elseif product.salesDiscontinuationDate?exists && nowTimestamp.after(product.salesDiscontinuationDate)> + <#elseif product.salesDiscontinuationDate?? && nowTimestamp.after(product.salesDiscontinuationDate)> <div class='tabletext' style='color: red;'>${uiLabelMap.ProductProductNoLongerAvailable}.</div> <#-- check to see if the product requires inventory check and has inventory --> <#else> @@ -347,7 +347,7 @@ function getConfigDetails() { <input type="text" size="5" name="quantity" value="1" /> </#if> </#if> - <#if requestParameters.category_id?exists> + <#if requestParameters.category_id??> <input type='hidden' name='category_id' value='${requestParameters.category_id}' /> </#if> </#if> @@ -355,10 +355,10 @@ function getConfigDetails() { <div> <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> <hr /> - <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> + <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type="hidden" name="productId" value="${product.productId}" /> <input type="hidden" name="product_id" value="${product.productId}" /> - <input type="hidden" name="configId" value="${configId?if_exists}" /> + <input type="hidden" name="configId" value="${configId!}" /> <select name="shoppingListId"> <#if shoppingLists?has_content> <#list shoppingLists as shoppingList> @@ -378,12 +378,12 @@ function getConfigDetails() { </#if> </div> <#-- Prefill first select box (virtual products only) --> - <#if variantTree?exists && 0 < variantTree.size()> + <#if variantTree?? && 0 < variantTree.size()> <script language="JavaScript" type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) --> - <#if variantSample?exists && 0 < variantSample.size()> + <#if variantSample?? && 0 < variantSample.size()> <#assign imageKeys = variantSample.keySet()> <#assign imageMap = variantSample> <p> </p> @@ -394,15 +394,15 @@ function getConfigDetails() { <#list imageKeys as key> <#assign swatchProduct = imageMap.get(key)> <#if swatchProduct?has_content && indexer < maxIndex> - <#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)?if_exists> + <#assign imageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(swatchProduct, "SMALL_IMAGE_URL", request)!> <#if !imageUrl?string?has_content> - <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")?if_exists> + <#assign imageUrl = productContentWrapper.get("SMALL_IMAGE_URL")!> </#if> <#if !imageUrl?string?has_content> <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class='cssImgStandard' alt="" /></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix!}${imageUrl}</@ofbizContentUrl>" class='cssImgStandard' alt="" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a> </td> @@ -423,7 +423,7 @@ function getConfigDetails() { <#-- Long description of product --> <tr> <td colspan="2"> - <div>${productContentWrapper.get("LONG_DESCRIPTION")?if_exists}</div> + <div>${productContentWrapper.get("LONG_DESCRIPTION")!}</div> </td> </tr> @@ -433,7 +433,7 @@ function getConfigDetails() { <#-- Product Configurator --> <tr> <td colspan="2"> - <form name="configform" id="configFormId" method="post" action="<@ofbizUrl>product<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> + <form name="configform" id="configFormId" method="post" action="<@ofbizUrl>product<#if requestAttributes._CURRENT_VIEW_??>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type='hidden' name='add_product_id' value='${product.productId}' /> <input type='hidden' name='add_category_id' value='' /> <input type='hidden' name='quantity' value='1' /> @@ -456,14 +456,14 @@ function getConfigDetails() { <div>${question.question}</div> <#if question.isFirst()> <a name='#${question.getConfigItem().getString("configItemId")}'></a> - <div>${question.description?if_exists}</div> - <#assign instructions = question.content.get("INSTRUCTIONS")?if_exists> + <div>${question.description!}</div> + <#assign instructions = question.content.get("INSTRUCTIONS")!> <#if instructions?has_content> <a href="javascript:showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${instructions}");" class="buttontext">Instructions</a> </#if> - <#assign image = question.content.get("IMAGE_URL")?if_exists> + <#assign image = question.content.get("IMAGE_URL")!> <#if image?has_content> - <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgSmall' align='left' alt="" /> + <img src='<@ofbizContentUrl>${contentPathPrefix!}${image!}</@ofbizContentUrl>' vspace='5' hspace='5' class='cssImgSmall' align='left' alt="" /> </#if> <#else> <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div> @@ -478,20 +478,20 @@ function getConfigDetails() { <#assign optionCounter = 0> <#list options as option> <div>${option.description} <#if !option.isAvailable()> (*)</#if></div> - <div>${uiLabelMap.CommonComments}: <input type='text' name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments?if_exists}' /></div> + <div>${uiLabelMap.CommonComments}: <input type='text' name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments!}' /></div> <#assign optionCounter = optionCounter + 1> </#list> <#else> <#if question.isSingleChoice()> <#-- Single choice question --> <#assign options = question.options> - <#assign selectedOption = question.getSelected()?if_exists> + <#assign selectedOption = question.getSelected()!> <#assign selectedPrice = 0.0> <#if selectedOption?has_content> <#assign selectedPrice = selectedOption.getPrice()> </#if> <#-- The single choice input can be implemented with radio buttons or a select field --> - <#if renderSingleChoiceWithRadioButtons?exists && "Y" == renderSingleChoiceWithRadioButtons> + <#if renderSingleChoiceWithRadioButtons?? && "Y" == renderSingleChoiceWithRadioButtons> <#-- This is the radio button implementation --> <#if !question.isMandatory()> <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked="checked"</#if>' /> No option</div> @@ -500,13 +500,13 @@ function getConfigDetails() { <#assign optionCounter = 0> <#list options as option> <#assign componentCounter = 0> - <#if showOffsetPrice?exists && "Y" == showOffsetPrice> + <#if showOffsetPrice?? && "Y" == showOffsetPrice> <#assign shownPrice = option.price - selectedPrice> <#else> <#assign shownPrice = option.price> </#if> <#if option.isSelected()> - <#assign optionComment = option.getComments()?if_exists> + <#assign optionComment = option.getComments()!> </#if> <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> @@ -535,7 +535,7 @@ function getConfigDetails() { </#if> <#assign optionCounter = optionCounter + 1> </#list> - <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_0' id='comments_${counter}_0' value='${optionComment?if_exists}' /></div> + <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_0' id='comments_${counter}_0' value='${optionComment!}' /></div> <#else> <#-- And this is the select box implementation --> <select name='${counter}'> @@ -546,7 +546,7 @@ function getConfigDetails() { <#assign optionCounter = 0> <#assign optionComment = ""> <#list options as option> - <#if showOffsetPrice?exists && "Y" == showOffsetPrice> + <#if showOffsetPrice?? && "Y" == showOffsetPrice> <#assign shownPrice = option.price - selectedPrice> <#else> <#assign shownPrice = option.price> @@ -564,7 +564,7 @@ function getConfigDetails() { <#assign optionCounter = optionCounter + 1> </#list> </select> - <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_0' id='comments_${counter}_0' value='${optionComment?if_exists}' /></div> + <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_0' id='comments_${counter}_0' value='${optionComment!}' /></div> </#if> <#else> <#-- Multi choice question --> @@ -594,7 +594,7 @@ function getConfigDetails() { ${option.description} +<@ofbizCurrency amount=option.price isoCode=price.currencyUsed/><#if !option.isAvailable()> (*)</#if> </div> </#if> - <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments?if_exists}' /></div> + <div>${uiLabelMap.CommonComments}: <input type="text" name='comments_${counter}_${optionCounter}' id='comments_${counter}_${optionCounter}' value='${option.comments!}' /></div> <#assign optionCounter = optionCounter + 1> </#list> </#if> @@ -620,15 +620,15 @@ function getConfigDetails() { </#if> <#if assocProducts?has_content> <tr><td> </td></tr> - <tr><td colspan="2"><h2>${beforeName?if_exists}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")?if_exists}</#if>${afterName?if_exists}</h2></td></tr> + <tr><td colspan="2"><h2>${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME")!}</#if>${afterName!}</h2></td></tr> <tr><td><hr /></td></tr> <#list assocProducts as productAssoc> <tr><td> <div> - <a href='<@ofbizUrl>${targetRequest}/<#if categoryId?exists>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo?if_exists}</@ofbizUrl>' class="buttontext"> - ${productAssoc.productIdTo?if_exists} + <a href='<@ofbizUrl>${targetRequest}/<#if categoryId??>~category_id=${categoryId}/</#if>~product_id=${productAssoc.productIdTo!}</@ofbizUrl>' class="buttontext"> + ${productAssoc.productIdTo!} </a> - - <b>${productAssoc.reason?if_exists}</b> + - <b>${productAssoc.reason!}</b> </div> </td></tr> ${setRequestAttribute("optProductId", productAssoc.productIdTo)} Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl Mon Aug 18 07:42:27 2014 @@ -19,6 +19,6 @@ under the License. <#if security.hasEntityPermission("CATALOG", "_CREATE", session)> <div> -<a href="/catalog/control/EditProduct?productId=${productId}${externalKeyParam?if_exists}" target="catalog" class="buttontext">${uiLabelMap.ProductEditProduct}</a> +<a href="/catalog/control/EditProduct?productId=${productId}${externalKeyParam!}" target="catalog" class="buttontext">${uiLabelMap.ProductEditProduct}</a> </div> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |