svn commit: r1618336 [16/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [16/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Sat Aug 16 11:34:57 2014 @@ -16,12 +16,12 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey?if_exists> +<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey!> <#if product?has_content> <!-- First some general forms and scripts --> <form name="removeAssocForm" action="<@ofbizUrl>quickAdminUpdateProductAssoc</@ofbizUrl>"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="PRODUCT_ID" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="PRODUCT_ID" value="${product.productId!}"/> <input type="hidden" name="PRODUCT_ID_TO" value=""/> <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="PRODUCT_VARIANT"/> <input type="hidden" name="FROM_DATE" value=""/> @@ -29,7 +29,7 @@ under the License. <input type="hidden" name="useValues" value="true"/> </form> <form name="removeSelectable" action="<@ofbizUrl>updateProductQuickAdminDelFeatureTypes</@ofbizUrl>"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="productFeatureTypeId" value=""/> </form> <script language="JavaScript" type="text/javascript"> @@ -51,7 +51,7 @@ function removeSelectable(typeString, pr } function doPublish() { - window.open('/ecommerce/control/product?product_id=${productId?if_exists}'); + window.open('/ecommerce/control/product?product_id=${productId!}'); document.publish.submit(); } @@ -63,21 +63,21 @@ function doPublish() { <div class="screenlet-body"> <!-- Name update section --> <form action="<@ofbizUrl>updateProductQuickAdminName</@ofbizUrl>" method="post" style="margin: 0;" name="editProduct"> - <input type="hidden" name="productId" value="${productId?if_exists}"/> - <#if (product.isVirtual)?if_exists == "Y"> + <input type="hidden" name="productId" value="${productId!}"/> + <#if (product.isVirtual)! == "Y"> <input type="hidden" name="isVirtual" value="Y"/> </#if> <table cellspacing="0" class="basic-table"> <tr> - <td><h2>${productId?if_exists}</h2></td> - <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName?if_exists}"/></td> + <td><h2>${productId!}</h2></td> + <td><input type="text" name="productName" size="40" maxlength="40" value="${product.productName!}"/></td> <td><input type="submit" value="${uiLabelMap.ProductUpdateName}"/></td> </tr> </table> </form> </div> </div> -<#if (product.isVirtual)?if_exists == "Y"> +<#if (product.isVirtual)! == "Y"> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductSelectableFeatures}</h3> @@ -85,19 +85,19 @@ function doPublish() { <div class="screenlet-body"> <!-- ***************************************************** Selectable features section --> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeatureTypeSelector"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td colspan="2"><span class="label">${uiLabelMap.CommonType}</span> <select name="productFeatureTypeId" onchange="javascript:document.selectableFeatureTypeSelector.submit();"> <option value="~~any~~">${uiLabelMap.ProductAnyFeatureType}</option> <#list featureTypes as featureType> - <#if (featureType.productFeatureTypeId)?if_exists == (productFeatureTypeId)?if_exists> + <#if (featureType.productFeatureTypeId)! == (productFeatureTypeId)!> <#assign selected="selected"/> <#else> <#assign selected=""/> </#if> - <option ${selected} value="${featureType.productFeatureTypeId?if_exists}">${featureType.get("description",locale)?if_exists}</option> + <option ${selected} value="${featureType.productFeatureTypeId!}">${featureType.get("description",locale)!}</option> </#list> </select> </td> @@ -106,8 +106,8 @@ function doPublish() { </form> <br /> <form action="<@ofbizUrl>updateProductQuickAdminSelFeat</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeature"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)!}"/> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductProductId}</b></td> @@ -123,15 +123,15 @@ function doPublish() { <#assign assocProduct = productAssoc.getRelatedOne("AssocProduct", false)/> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td nowrap="nowrap"> - <input type="hidden" name="productId${idx}" value="${assocProduct.productId?if_exists}"/> - <a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.productId?if_exists}</a></td> - <td width="100%"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.internalName?if_exists}</a></td> + <input type="hidden" name="productId${idx}" value="${assocProduct.productId!}"/> + <a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.productId!}</a></td> + <td width="100%"><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${assocProduct.internalName!}</a></td> <td colspan="2"> - <input type="text" name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]?if_exists}"/> + <input type="text" name="description${idx}" size="70" maxlength="100" value="${selFeatureDesc[assocProduct.productId]!}"/> </td> <#assign checked=""/> - <#if ((assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists) && - (assocProduct.smallImageUrl?if_exists != "") && (assocProduct.smallImageUrl?if_exists == product.smallImageUrl?if_exists)) > + <#if ((assocProduct.smallImageUrl! != "") && (assocProduct.smallImageUrl! == product.smallImageUrl!) && + (assocProduct.smallImageUrl! != "") && (assocProduct.smallImageUrl! == product.smallImageUrl!)) > <#assign checked = "checked='checked'"/> </#if> <td><input type="radio" ${checked} name="useImages" value="${assocProduct.productId}"/></td> @@ -151,8 +151,8 @@ function doPublish() { <td> <table cellspacing="0" class="basic-table"> <#list selectableFeatureTypes as selectableFeatureType> - <tr><td><a class="buttontext" href="javascript:removeSelectable('${(selectableFeatureType.get("description",locale))?if_exists}','${selectableFeatureType.productFeatureTypeId}','${product.productId}')">x</a> - <a class="buttontext" href="<@ofbizUrl>EditProductQuickAdmin?productFeatureTypeId=${(selectableFeatureType.productFeatureTypeId)?if_exists}&productId=${product.productId?if_exists}</@ofbizUrl>">${(selectableFeatureType.get("description",locale))?if_exists}</a></td></tr> + <tr><td><a class="buttontext" href="javascript:removeSelectable('${(selectableFeatureType.get("description",locale))!}','${selectableFeatureType.productFeatureTypeId}','${product.productId}')">x</a> + <a class="buttontext" href="<@ofbizUrl>EditProductQuickAdmin?productFeatureTypeId=${(selectableFeatureType.productFeatureTypeId)!}&productId=${product.productId!}</@ofbizUrl>">${(selectableFeatureType.get("description",locale))!}</a></td></tr> </#list> </table> </td> @@ -167,14 +167,14 @@ function doPublish() { </div> </div> </#if> -<#if (product.isVariant)?if_exists == "Y"> +<#if (product.isVariant)! == "Y"> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductDistinguishingFeatures}</h3> </div> <div class="screenlet-body"> <form action="<@ofbizUrl>updateProductQuickAdminDistFeat</@ofbizUrl>" method="post" style="margin: 0;" name="distFeature"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.ProductProductId}</b></td> @@ -208,7 +208,7 @@ function doPublish() { <div class="screenlet-body"> <!-- ***************************************************** Shipping dimensions section --> <form action="<@ofbizUrl>updateProductQuickAdminShipping</@ofbizUrl>" method="post" name="updateShipping"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="heightUomId" value="LEN_in"/> <input type="hidden" name="widthUomId" value="LEN_in"/> <input type="hidden" name="depthUomId" value="LEN_in"/> @@ -227,22 +227,22 @@ function doPublish() { <td><b>${uiLabelMap.ProductST}</b></td> <td><b>${uiLabelMap.ProductTD}</b></td> </tr> - <#if (product.isVirtual)?if_exists == "Y"> + <#if (product.isVirtual)! == "Y"> <#assign idx=0/> <#assign rowClass = "2"> <#list assocProducts as assocProduct> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><input type="text" name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight?if_exists}"/></td> - <td><input type="text" name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth?if_exists}"/></td> - <td><input type="text" name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth?if_exists}"/></td> - <td><input type="text" name="weight${idx}" size="6" maxlength="20" value="${assocProduct.weight?if_exists}"/></td> - <td><input type="text" name="~floz${idx}" size="6" maxlength="20" value="${featureFloz.get(assocProduct.productId)?if_exists}"/></td> - <td><input type="text" name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)?if_exists}"/></td> - <td><input type="text" name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)?if_exists}"/></td> - <td><input type="text" name="~grams${idx}" size="6" maxlength="20" value="${featureGrams.get(assocProduct.productId)?if_exists}"/></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureHazmat.get(assocProduct.productId)?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureSalesThru.get(assocProduct.productId)?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureThruDate.get(assocProduct.productId)?if_exists)}</a></td> + <td><input type="text" name="productHeight${idx}" size="6" maxlength="20" value="${assocProduct.productHeight!}"/></td> + <td><input type="text" name="productWidth${idx}" size="6" maxlength="20" value="${assocProduct.productWidth!}"/></td> + <td><input type="text" name="productDepth${idx}" size="6" maxlength="20" value="${assocProduct.productDepth!}"/></td> + <td><input type="text" name="weight${idx}" size="6" maxlength="20" value="${assocProduct.weight!}"/></td> + <td><input type="text" name="~floz${idx}" size="6" maxlength="20" value="${featureFloz.get(assocProduct.productId)!}"/></td> + <td><input type="text" name="~ml${idx}" size="6" maxlength="20" value="${featureMl.get(assocProduct.productId)!}"/></td> + <td><input type="text" name="~ntwt${idx}" size="6" maxlength="20" value="${featureNtwt.get(assocProduct.productId)!}"/></td> + <td><input type="text" name="~grams${idx}" size="6" maxlength="20" value="${featureGrams.get(assocProduct.productId)!}"/></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureHazmat.get(assocProduct.productId)!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureSalesThru.get(assocProduct.productId)!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${assocProduct.productId}</@ofbizUrl>">${StringUtil.wrapString(featureThruDate.get(assocProduct.productId)!)}</a></td> </tr> <#assign idx = idx + 1/> <#-- toggle the row color --> @@ -258,17 +258,17 @@ function doPublish() { </tr> <#else> <tr> - <td><input type="text" name="productHeight" size="6" maxlength="20" value="${product.productHeight?if_exists}" /></td> - <td><input type="text" name="productWidth" size="6" maxlength="20" value="${product.productWidth?if_exists}" /></td> - <td><input type="text" name="productDepth" size="6" maxlength="20" value="${product.productDepth?if_exists}" /></td> - <td><input type="text" name="weight" size="6" maxlength="20" value="${product.weight?if_exists}" /></td> - <td><input type="text" name="~floz" size="6" maxlength="20" value="${floz?if_exists}" /></td> - <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml?if_exists}" /></td> - <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt?if_exists}" /></td> - <td><input type="text" name="~grams" size="6" maxlength="20" value="${grams?if_exists}" /></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(hazmat?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(salesthru?if_exists)}</a></td> - <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(thrudate?if_exists)}</a></td> + <td><input type="text" name="productHeight" size="6" maxlength="20" value="${product.productHeight!}" /></td> + <td><input type="text" name="productWidth" size="6" maxlength="20" value="${product.productWidth!}" /></td> + <td><input type="text" name="productDepth" size="6" maxlength="20" value="${product.productDepth!}" /></td> + <td><input type="text" name="weight" size="6" maxlength="20" value="${product.weight!}" /></td> + <td><input type="text" name="~floz" size="6" maxlength="20" value="${floz!}" /></td> + <td><input type="text" name="~ml" size="6" maxlength="20" value="${ml!}" /></td> + <td><input type="text" name="~ntwt" size="6" maxlength="20" value="${ntwt!}" /></td> + <td><input type="text" name="~grams" size="6" maxlength="20" value="${grams!}" /></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductFeatures?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(hazmat!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(salesthru!)}</a></td> + <td><a class="buttontext" href="<@ofbizUrl>EditProductAssoc?productId=${product.productId}</@ofbizUrl>">${StringUtil.wrapString(thrudate!)}</a></td> </tr> <tr> <td colspan="10" align="right"><input type="submit" value="${uiLabelMap.ProductUpdateShipping}" /></td> @@ -292,7 +292,7 @@ function doPublish() { <td> <#if addedFeatureTypeIds?has_content> <form method="post" action="<@ofbizUrl>quickAdminApplyFeatureToProduct</@ofbizUrl>" name="addFeatureById"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <input type="hidden" name="productFeatureApplTypeId" value="STANDARD_FEATURE"/> <input type="hidden" name="fromDate" value="${nowTimestampString}"/> <table cellspacing="0" class="basic-table"> @@ -329,7 +329,7 @@ function doPublish() { <#list standardFeatureAppls as standardFeatureAppl> <#assign featureId = standardFeatureAppl.productFeatureId/> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td colspan="2"><a href='<@ofbizUrl>quickAdminRemoveFeatureFromProduct?productId=${standardFeatureAppl.productId?if_exists}&productFeatureId=${featureId?if_exists}&fromDate=${(standardFeatureAppl.fromDate)?if_exists}</@ofbizUrl>' class="buttontext">x</a> + <td colspan="2"><a href='<@ofbizUrl>quickAdminRemoveFeatureFromProduct?productId=${standardFeatureAppl.productId!}&productFeatureId=${featureId!}&fromDate=${(standardFeatureAppl.fromDate)!}</@ofbizUrl>' class="buttontext">x</a> ${productFeatureTypeLookup.get(featureId).description}: ${standardFeatureLookup.get(featureId).description} </td> </tr> @@ -348,15 +348,15 @@ function doPublish() { <br /> </#if> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>"> - <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)!}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td align="right">${uiLabelMap.ProductFeatureTypes}</td> <td> <select multiple="multiple" name="addFeatureTypeId"> <#list featureTypes as featureType> - <option value="${featureType.productFeatureTypeId?if_exists}">${featureType.get("description",locale)?if_exists}</option> + <option value="${featureType.productFeatureTypeId!}">${featureType.get("description",locale)!}</option> </#list> </select> </td> @@ -375,7 +375,7 @@ function doPublish() { <!-- **************************************************** Categories section --> <form action="<@ofbizUrl>quickAdminAddCategories</@ofbizUrl>"> <input type="hidden" name="fromDate" value="${nowTimestampString}"/> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td> @@ -384,7 +384,7 @@ function doPublish() { <td> <select multiple="multiple" name="categoryId"> <#list allCategories as category> - <option value="${category.productCategoryId?if_exists}">${category.description?if_exists} ${category.productCategoryId}</option> + <option value="${category.productCategoryId!}">${category.description!} ${category.productCategoryId}</option> </#list> </select> </td> @@ -407,11 +407,11 @@ function doPublish() { <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> <td colspan="2"> <form name="quickAdminRemoveProductFromCategory_${prodCatMemb_index}" action="<@ofbizUrl>quickAdminRemoveProductFromCategory</@ofbizUrl>" method="post"> - <input type="hidden" name="productId" value="${prodCatMemb.productId?if_exists}" /> + <input type="hidden" name="productId" value="${prodCatMemb.productId!}" /> <input type="hidden" name="productCategoryId" value="${prodCatMemb.productCategoryId}" /> - <input type="hidden" name="fromDate" value="${(prodCatMemb.fromDate)?if_exists}" /> + <input type="hidden" name="fromDate" value="${(prodCatMemb.fromDate)!}" /> <a href="javascript:document.quickAdminRemoveProductFromCategory_${prodCatMemb_index}.submit();" class="buttontext">x</a> - ${prodCat.description?if_exists} ${prodCat.productCategoryId} + ${prodCat.description!} ${prodCat.productCategoryId} </form> </td> </tr> @@ -437,8 +437,8 @@ function doPublish() { <!-- **************************************************** publish section --> <#if (showPublish == "true")> <form action="<@ofbizUrl>quickAdminAddCategories</@ofbizUrl>" name="publish"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="categoryId" value="${allCategoryId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="categoryId" value="${allCategoryId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td> @@ -450,8 +450,8 @@ function doPublish() { </form> <#else> <form action="<@ofbizUrl>quickAdminUnPublish</@ofbizUrl>" name="unpublish"> - <input type="hidden" name="productId" value="${product.productId?if_exists}"/> - <input type="hidden" name="productCategoryId" value="${allCategoryId?if_exists}"/> + <input type="hidden" name="productId" value="${product.productId!}"/> + <input type="hidden" name="productCategoryId" value="${allCategoryId!}"/> <table cellspacing="0" class="basic-table"> <tr> <td> @@ -466,5 +466,5 @@ function doPublish() { </div> </div> <#else> - <h3>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}</h3> + <h3>${uiLabelMap.ProductProductNotFound} ${productId!}</h3> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl Sat Aug 16 11:34:57 2014 @@ -16,13 +16,13 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if parameters.showAllFacilities?exists> +<#if parameters.showAllFacilities??> <a href="EditProductInventoryItems?productId=${productId}" class="buttontext">${uiLabelMap.ProductShowProductFacilities}</a> <#else> <a href="EditProductInventoryItems?productId=${productId}&showAllFacilities=Y" class="buttontext">${uiLabelMap.ProductShowAllFacilities}</a> </#if> <div class="screenlet"> - <#if product?exists> + <#if product??> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductInventorySummary}</h3> </div> @@ -42,33 +42,33 @@ under the License. </tr> <#assign rowClass = "2"> <#list quantitySummaryByFacility.values() as quantitySummary> - <#if quantitySummary.facilityId?exists> + <#if quantitySummary.facilityId??> <#assign facilityId = quantitySummary.facilityId> <#assign facility = delegator.findOne("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", facilityId), false)> - <#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)?if_exists> - <#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)?if_exists> - <#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand?if_exists> - <#assign totalAvailableToPromise = quantitySummary.totalAvailableToPromise?if_exists> - <#assign mktgPkgATP = quantitySummary.mktgPkgATP?if_exists> - <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH?if_exists> - <#assign incomingShipmentAndItemList = quantitySummary.incomingShipmentAndItemList?if_exists> - <#assign incomingProductionRunList = manufacturingInQuantitySummary.incomingProductionRunList?if_exists> - <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal?if_exists> - <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList?if_exists> - <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists> + <#assign manufacturingInQuantitySummary = manufacturingInQuantitySummaryByFacility.get(facilityId)!> + <#assign manufacturingOutQuantitySummary = manufacturingOutQuantitySummaryByFacility.get(facilityId)!> + <#assign totalQuantityOnHand = quantitySummary.totalQuantityOnHand!> + <#assign totalAvailableToPromise = quantitySummary.totalAvailableToPromise!> + <#assign mktgPkgATP = quantitySummary.mktgPkgATP!> + <#assign mktgPkgQOH = quantitySummary.mktgPkgQOH!> + <#assign incomingShipmentAndItemList = quantitySummary.incomingShipmentAndItemList!> + <#assign incomingProductionRunList = manufacturingInQuantitySummary.incomingProductionRunList!> + <#assign incomingQuantityTotal = manufacturingInQuantitySummary.estimatedQuantityTotal!> + <#assign outgoingProductionRunList = manufacturingOutQuantitySummary.outgoingProductionRunList!> + <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal!> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td>${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] + <td>${(facility.facilityName)!} [${facilityId?default("[No Facility]")}] <a href="/facility/control/ReceiveInventory?facilityId=${facilityId}&productId=${productId}&externLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductInventoryReceive}</a></td> - <td><#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> </#if></td> - <td><#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> </#if></td> + <td><#if totalAvailableToPromise??>${totalAvailableToPromise}<#else> </#if></td> + <td><#if totalQuantityOnHand??>${totalQuantityOnHand}<#else> </#if></td> <#if isMarketingPackage == "true"> - <td><#if mktgPkgATP?exists>${mktgPkgATP}<#else> </#if></td> - <td><#if mktgPkgQOH?exists>${mktgPkgQOH}<#else> </#if></td> + <td><#if mktgPkgATP??>${mktgPkgATP}<#else> </#if></td> + <td><#if mktgPkgQOH??>${mktgPkgQOH}<#else> </#if></td> </#if> <td> <#if incomingShipmentAndItemList?has_content> <#list incomingShipmentAndItemList as incomingShipmentAndItem> - <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + <div>${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())!}-<#if incomingShipmentAndItem.quantity??>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> </#list> <#else> <div> </div> @@ -77,9 +77,9 @@ under the License. <td> <#if incomingProductionRunList?has_content> <#list incomingProductionRunList as incomingProductionRun> - <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + <div>${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())!}-<#if incomingProductionRun.estimatedQuantity??>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> </#list> - <div><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}</b></div> + <div><b>${uiLabelMap.CommonTotal}: ${incomingQuantityTotal!}</b></div> <#else> <div> </div> </#if> @@ -87,9 +87,9 @@ under the License. <td> <#if outgoingProductionRunList?has_content> <#list outgoingProductionRunList as outgoingProductionRun> - <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> + <div>${outgoingProductionRun.workEffortParentId?default("")}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())!}-<#if outgoingProductionRun.estimatedQuantity??>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]</#if></div> </#list> - <div><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}</b></div> + <div><b>${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal!}</b></div> <#else> <div> </div> </#if> @@ -107,6 +107,6 @@ under the License. </table> </div> <#else> - <h2>${uiLabelMap.ProductProductNotFound} ${productId?if_exists}!</h2> + <h2>${uiLabelMap.ProductProductNotFound} ${productId!}!</h2> </#if> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl Sat Aug 16 11:34:57 2014 @@ -45,7 +45,7 @@ function clickAll(e) { } } </script> -<#if (product.isVirtual)?if_exists != "Y"> +<#if (product.isVirtual)! != "Y"> <h2>${uiLabelMap.ProductWarningProductNotVirtual}</h2> </#if> <#if featureTypes?has_content && (featureTypes.size() > 0)> @@ -75,7 +75,7 @@ function clickAll(e) { <#assign productFeatureIds = ""> <#list curProductFeatureAndAppls as productFeatureAndAppl> <td> - ${productFeatureAndAppl.description?if_exists} + ${productFeatureAndAppl.description!} <#assign productFeatureIds = productFeatureIds + "|" + productFeatureAndAppl.productFeatureId> </td> </#list> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ViewProductOrders.ftl Sat Aug 16 11:34:57 2014 @@ -50,7 +50,7 @@ under the License. <form name="paginationForm" method="post" action="<@ofbizUrl>viewProductOrder</@ofbizUrl>"> <input type="hidden" name="viewSize"/> <input type="hidden" name="viewIndex"/> - <#if paramIdList?exists && paramIdList?has_content> + <#if paramIdList?? && paramIdList?has_content> <#list paramIdList as paramIds> <#assign paramId = paramIds.split("=")/> <#if "productId" == paramId[0]> @@ -70,7 +70,7 @@ under the License. <td>${uiLabelMap.OrderQuantity}</td> <td>${uiLabelMap.OrderOrderType}</td> </tr> - <#if orderList?has_content && productId?exists> + <#if orderList?has_content && productId??> <#list orderList as order> <#assign orderItems = delegator.findByAnd("OrderItem", {"orderId" : order.orderId, "productId" : productId}, null, false)/> <#list orderItems as orderItem> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoCode?exists> +<#if productPromoCode??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductPromoCodeEmails}</h3> @@ -34,16 +34,16 @@ under the License. </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCodeEmail</@ofbizUrl>" style="margin: 0;"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> <input type="hidden" name="productPromoId" value="${productPromoId}"/> <span class="label">${uiLabelMap.ProductAddEmail}:</span><input type="text" size="40" name="emailAddress" /> <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> - <#if productPromoCode.requireEmailOrParty?if_exists == "N"> + <#if productPromoCode.requireEmailOrParty! == "N"> <div class="tooltip">${uiLabelMap.ProductNoteRequireEmailParty}</div> </#if> - <form method="post" action="<@ofbizUrl>createBulkProductPromoCodeEmail?productPromoCodeId=${productPromoCodeId?if_exists}</@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <form method="post" action="<@ofbizUrl>createBulkProductPromoCodeEmail?productPromoCodeId=${productPromoCodeId!}</@ofbizUrl>" enctype="multipart/form-data" style="margin: 0;"> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> <input type="hidden" name="productPromoId" value="${productPromoId}"/> <input type="file" size="40" name="uploadedFile" /> <input type="submit" value="${uiLabelMap.CommonUpload}" /> @@ -61,7 +61,7 @@ under the License. </#list> <div> <form method="post" action="<@ofbizUrl>createProductPromoCodeParty</@ofbizUrl>"> - <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId?if_exists}"/> + <input type="hidden" name="productPromoCodeId" value="${productPromoCodeId!}"/> <input type="hidden" name="productPromoId" value="${productPromoId}"/> <span class="label">${uiLabelMap.ProductAddPartyId}:</span><input type="text" size="10" name="partyId" /> <input type="submit" value="${uiLabelMap.CommonAdd}" /> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists && productPromo?exists> +<#if productPromoId?? && productPromo??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PageTitleEditProductPromoRules}</h3> @@ -37,20 +37,20 @@ under the License. <tr><td colspan="3"><hr /></td></tr> </#if> <tr valign="middle" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)?if_exists}</b></td> + <td class="label"><b> ${uiLabelMap.ProductRule} ${(productPromoRule.productPromoRuleId)!}</b></td> <td> <form method="post" action="<@ofbizUrl>updateProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> - <input type="text" size="30" name="ruleName" value="${(productPromoRule.ruleName)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> + <input type="text" size="30" name="ruleName" value="${(productPromoRule.ruleName)!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> <td align="center"> <#if (productPromoConds.size() == 0 && productPromoActions.size() == 0)> <form name="deleteProductPromoRule_${productPromoRule_index}" method="post" action="<@ofbizUrl>deleteProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> <a href="javascript:document.deleteProductPromoRule_${productPromoRule_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </#if> @@ -58,7 +58,7 @@ under the License. </tr> <tr><td><hr /></td><td colspan="2"></td></tr> <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td> + <td align="right" class="label">${uiLabelMap.ProductConditionsForRule} ${(productPromoRule.productPromoRuleId)!} :</td> <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign maxCondSeqId = 1> @@ -66,7 +66,7 @@ under the License. <#list productPromoConds as productPromoCond> <tr class="row-level-two<#if condClass == "1"> alternate-row</#if>"> <!-- if cur seq id is a number and is greater than max, set new max for input box prefill below --> - <#if (productPromoCond.productPromoCondSeqId)?exists> + <#if (productPromoCond.productPromoCondSeqId)??> <#assign curCondSeqId = Static["java.lang.Integer"].valueOf(productPromoCond.getString("productPromoCondSeqId"))> <#if (curCondSeqId >= maxCondSeqId)> <#assign maxCondSeqId = curCondSeqId + 1> @@ -74,41 +74,41 @@ under the License. </#if> <td></td> <td> - <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}</b> + <b>${uiLabelMap.ProductCondition} ${(productPromoCond.productPromoCondSeqId)!}</b> <form method="post" action="<@ofbizUrl>updateProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}"/> - <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}"/> - <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}"/> + <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)!}"/> + <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)!}"/> + <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)!}"/> <select name="inputParamEnumId" size="1"> - <#if (productPromoCond.inputParamEnumId)?exists> + <#if (productPromoCond.inputParamEnumId)??> <#assign inputParamEnum = productPromoCond.getRelatedOne("InputParamEnumeration", true)> - <option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum?exists>${(inputParamEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.inputParamEnumId)?if_exists}]</#if></option> - <option value="${(productPromoCond.inputParamEnumId)?if_exists}"> </option> + <option value="${productPromoCond.inputParamEnumId}"><#if inputParamEnum??>${(inputParamEnum.get("description",locale))!}<#else>[${(productPromoCond.inputParamEnumId)!}]</#if></option> + <option value="${(productPromoCond.inputParamEnumId)!}"> </option> <#else> <option value=""> </option> </#if> <#list inputParamEnums as inputParamEnum> - <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option> + <option value="${(inputParamEnum.enumId)!}">${(inputParamEnum.get("description",locale))!}</option> </#list> </select> <select name="operatorEnumId" size="1"> - <#if (productPromoCond.operatorEnumId)?exists> + <#if (productPromoCond.operatorEnumId)??> <#assign operatorEnum = productPromoCond.getRelatedOne("OperatorEnumeration", true)> - <option value="${(productPromoCond.operatorEnumId)?if_exists}"><#if operatorEnum?exists>${(operatorEnum.get("description",locale))?if_exists}<#else>[${(productPromoCond.operatorEnumId)?if_exists}]</#if></option> - <option value="${(productPromoCond.operatorEnumId)?if_exists}"> </option> + <option value="${(productPromoCond.operatorEnumId)!}"><#if operatorEnum??>${(operatorEnum.get("description",locale))!}<#else>[${(productPromoCond.operatorEnumId)!}]</#if></option> + <option value="${(productPromoCond.operatorEnumId)!}"> </option> <#else> <option value=""> </option> </#if> <#list condOperEnums as condOperEnum> - <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option> + <option value="${(condOperEnum.enumId)!}">${(condOperEnum.get("description",locale))!}</option> </#list> </select> <label>${uiLabelMap.ProductConditionValue}:</label> - <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)?if_exists}" /> - <#assign otherValue = productPromoCond.otherValue?if_exists> - <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)?if_exists}"</#if> /> + <input type="text" size="25" name="condValue" value="${(productPromoCond.condValue)!}" /> + <#assign otherValue = productPromoCond.otherValue!> + <label>${uiLabelMap.CommonOther}:</label><input type="text" size="10" name="otherValue" <#if otherValue?has_content && !otherValue.contains("@")> value="${(productPromoCond.otherValue)!}"</#if> /> <#if otherValue?has_content && otherValue.contains("@")> - <#assign carrierShippingMethod = productPromoCond.otherValue?if_exists> + <#assign carrierShippingMethod = productPromoCond.otherValue!> </#if> <#if carrierShippingMethod?has_content> <#assign carrierParty = carrierShippingMethod.substring(0, carrierShippingMethod.indexOf("@"))> @@ -119,40 +119,40 @@ under the License. </#if> <label>${uiLabelMap.OrderSelectShippingMethod}:</label> <select name = "carrierShipmentMethod"> - <option value = "${carrierShippingMethod?if_exists}">${carrierParty?if_exists} ${description}</option> + <option value = "${carrierShippingMethod!}">${carrierParty!} ${description}</option> <option value = ""> </option> <#list carrierShipmentMethods as carrierShipmentMethod> <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)> - <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> + <option value = "${carrierShipmentMethod.partyId!}@${carrierShipmentMethod.shipmentMethodTypeId!}">${carrierShipmentMethod.partyId!} ${shipmentMethodType.get("description")!}</option> </#list> </select> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> <form name="deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)!}" /> <a href="javascript:document.deleteProductPromoCondition_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> <#-- ======================= Categories ======================== --> - <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductConditionsCategoriesForCondition} ${(productPromoCond.productPromoCondSeqId)!}:</div> <#assign condProductPromoCategories = productPromoCond.getRelated("ProductPromoCategory", null, null, false)> <#if condProductPromoCategories?has_content> <#list condProductPromoCategories as condProductPromoCategory> <#assign condProductCategory = condProductPromoCategory.getRelatedOne("ProductCategory", true)> <#assign condApplEnumeration = condProductPromoCategory.getRelatedOne("ApplEnumeration", true)> <div> - ${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}] + ${(condProductCategory.get("description",locale))!} [${condProductPromoCategory.productCategoryId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}" method="post" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)?if_exists}" /> - <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)!}" /> + <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)!}" /> + <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)!}" /> <a href="javascript:document.deleteProductPromoCategoryCondition_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -181,21 +181,21 @@ under the License. </form> </div> <#-- ======================= Products ======================== --> - <div class="label">${uiLabelMap.ProductConditionsProductsForCondition} ${(productPromoCond.productPromoCondSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductConditionsProductsForCondition} ${(productPromoCond.productPromoCondSeqId)!}:</div> <#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct", null, null, false)> <#if condProductPromoProducts?has_content> <#list condProductPromoProducts as condProductPromoProduct> - <#assign condProduct = condProductPromoProduct.getRelatedOne("Product", true)?if_exists> + <#assign condProduct = condProductPromoProduct.getRelatedOne("Product", true)!> <#assign condApplEnumeration = condProductPromoProduct.getRelatedOne("ApplEnumeration", true)> <div> - ${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}] + ${(condProduct.internalName)!} [${condProductPromoProduct.productId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductCondition_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}" method="post" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)!}" /> + <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)!}" /> <a href="javascript:document.deleteProductPromoProductCondition_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -231,17 +231,17 @@ under the License. <tr> <td colspan="3"> <form method="post" action="<@ofbizUrl>createProductPromoCond</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> <span class="label"><b>${uiLabelMap.CommonNew}</b> </span> <select name="inputParamEnumId" size="1"> <#list inputParamEnums as inputParamEnum> - <option value="${(inputParamEnum.enumId)?if_exists}">${(inputParamEnum.get("description",locale))?if_exists}</option> + <option value="${(inputParamEnum.enumId)!}">${(inputParamEnum.get("description",locale))!}</option> </#list> </select> <select name="operatorEnumId" size="1"> <#list condOperEnums as condOperEnum> - <option value="${(condOperEnum.enumId)?if_exists}">${(condOperEnum.get("description",locale))?if_exists}</option> + <option value="${(condOperEnum.enumId)!}">${(condOperEnum.get("description",locale))!}</option> </#list> </select> <label>${uiLabelMap.ProductConditionValue}:</label> @@ -252,7 +252,7 @@ under the License. <option value = "">--${uiLabelMap.OrderSelectShippingMethod}--</option> <#list carrierShipmentMethods as carrierShipmentMethod> <#assign shipmentMethodType = carrierShipmentMethod.getRelatedOne("ShipmentMethodType", true)> - <option value = "${carrierShipmentMethod.partyId?if_exists}@${carrierShipmentMethod.shipmentMethodTypeId?if_exists}">${carrierShipmentMethod.partyId?if_exists} ${shipmentMethodType.get("description")?if_exists}</option> + <option value = "${carrierShipmentMethod.partyId!}@${carrierShipmentMethod.shipmentMethodTypeId!}">${carrierShipmentMethod.partyId!} ${shipmentMethodType.get("description")!}</option> </#list> </select> <input type="submit" value="${uiLabelMap.ProductCreateCondition}" /> @@ -264,7 +264,7 @@ under the License. </tr> <tr><td><hr /></td><td colspan="2"></td></tr> <tr valign="top" class="row-level-one<#if ruleClass == "1"> alternate-row</#if>"> - <td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)?if_exists} :</td> + <td align="right" class="label">${uiLabelMap.ProductActionForRule} ${(productPromoRule.productPromoRuleId)!} :</td> <td colspan="2"> <table cellspacing="0" class="basic-table"> <#assign actionClass = "2"> @@ -273,35 +273,35 @@ under the License. <td></td> <td> <div> - <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}</b> + <b> ${uiLabelMap.ProductAction} ${(productPromoAction.productPromoActionSeqId)!}</b> <form method="post" action="<@ofbizUrl>updateProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)!}" /> <select name="productPromoActionEnumId" size="1"> - <#if (productPromoAction.productPromoActionEnumId)?exists> + <#if (productPromoAction.productPromoActionEnumId)??> <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)> - <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"><#if productPromoActionCurEnum?exists>${(productPromoActionCurEnum.get("description",locale))?if_exists}<#else>[${(productPromoAction.productPromoActionEnumId)?if_exists}]</#if></option> - <option value="${(productPromoAction.productPromoActionEnumId)?if_exists}"> </option> + <option value="${(productPromoAction.productPromoActionEnumId)!}"><#if productPromoActionCurEnum??>${(productPromoActionCurEnum.get("description",locale))!}<#else>[${(productPromoAction.productPromoActionEnumId)!}]</#if></option> + <option value="${(productPromoAction.productPromoActionEnumId)!}"> </option> <#else> <option value=""> </option> </#if> <#list productPromoActionEnums as productPromoActionEnum> - <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option> + <option value="${(productPromoActionEnum.enumId)!}">${(productPromoActionEnum.get("description",locale))!}</option> </#list> </select> - <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)?if_exists}" /> - ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)?if_exists}" /> - ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)?if_exists}" /> - ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)?if_exists}" /> - ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)?if_exists}" /><br /> - ${uiLabelMap.ProductServiceName}: <input type="text" size="20" name="serviceName" value="${(productPromoAction.serviceName)?if_exists}" /> + <input type="hidden" name="orderAdjustmentTypeId" value="${(productPromoAction.orderAdjustmentTypeId)!}" /> + ${uiLabelMap.ProductQuantity}: <input type="text" size="5" name="quantity" value="${(productPromoAction.quantity)!}" /> + ${uiLabelMap.ProductAmount}: <input type="text" size="5" name="amount" value="${(productPromoAction.amount)!}" /> + ${uiLabelMap.ProductItemId}: <input type="text" size="15" name="productId" value="${(productPromoAction.productId)!}" /> + ${uiLabelMap.PartyParty}: <input type="text" size="10" name="partyId" value="${(productPromoAction.partyId)!}" /><br /> + ${uiLabelMap.ProductServiceName}: <input type="text" size="20" name="serviceName" value="${(productPromoAction.serviceName)!}" /> ${uiLabelMap.UseCartQuantity}: <select name="useCartQuantity"> - <#if (productPromoAction.useCartQuantity)?exists> + <#if (productPromoAction.useCartQuantity)??> <#assign productPromoActionCurEnum = productPromoAction.getRelatedOne("ActionEnumeration", true)> - <option value="${(productPromoAction.useCartQuantity)?if_exists}"><#if (productPromoAction.useCartQuantity.equals("Y"))>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option> - <option value="${(productPromoAction.useCartQuantity)?if_exists}"> </option> + <option value="${(productPromoAction.useCartQuantity)!}"><#if (productPromoAction.useCartQuantity.equals("Y"))>${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option> + <option value="${(productPromoAction.useCartQuantity)!}"> </option> <#else> <option value=""> </option> </#if> @@ -311,31 +311,31 @@ under the License. <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@ofbizUrl>deleteProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)!}" /> <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> <#-- ======================= Categories ======================== --> - <div class="label">${uiLabelMap.ProductActionsCategoriesForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductActionsCategoriesForAction} ${(productPromoAction.productPromoActionSeqId)!}:</div> <#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory", null, null, false)> <#if actionProductPromoCategories?has_content> <#list actionProductPromoCategories as actionProductPromoCategory> <#assign actionProductCategory = actionProductPromoCategory.getRelatedOne("ProductCategory", true)> <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOne("ApplEnumeration", true)> <div> - ${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}] + ${(actionProductCategory.description)!} [${actionProductPromoCategory.productCategoryId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>" method="post"> - <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)?if_exists}" /> - <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)!}" /> + <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)!}" /> + <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)!}" /> <a href="javascript:document.deleteProductPromoCategoryAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -365,21 +365,21 @@ under the License. </form> </div> <#-- ======================= Products ======================== --> - <div class="label">${uiLabelMap.ProductActionsProductsForAction} ${(productPromoAction.productPromoActionSeqId)?if_exists}:</div> + <div class="label">${uiLabelMap.ProductActionsProductsForAction} ${(productPromoAction.productPromoActionSeqId)!}:</div> <#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct", null, null, false)> <#if actionProductPromoProducts?has_content> <#list actionProductPromoProducts as actionProductPromoProduct> - <#assign actionProduct = actionProductPromoProduct.getRelatedOne("Product", true)?if_exists> + <#assign actionProduct = actionProductPromoProduct.getRelatedOne("Product", true)!> <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOne("ApplEnumeration", true)> <div> - ${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}] + ${(actionProduct.internalName)!} [${actionProductPromoProduct.productId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}" method="post" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)!}" /> + <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)!}" /> <a href="javascript:document.deleteProductPromoProductAction_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -416,12 +416,12 @@ under the License. <td colspan="3"> <div> <form method="post" action="<@ofbizUrl>createProductPromoAction</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)!}" /> <span class="label"><b>${uiLabelMap.CommonNew}:</b> </span> <select name="productPromoActionEnumId" size="1"> <#list productPromoActionEnums as productPromoActionEnum> - <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option> + <option value="${(productPromoActionEnum.enumId)!}">${(productPromoActionEnum.get("description",locale))!}</option> </#list> </select> <input type="hidden" name="orderAdjustmentTypeId" value="PROMOTION_ADJUSTMENT" /> @@ -463,7 +463,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>createProductPromoRule</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${productPromoId?if_exists}" /> + <input type="hidden" name="productPromoId" value="${productPromoId!}" /> <span class="label">${uiLabelMap.ProductName}</span><input type="text" size="30" name="ruleName" /> <input type="submit" value="${uiLabelMap.CommonAdd}" /> </form> @@ -479,17 +479,17 @@ under the License. <#assign promoProductCategory = promoProductPromoCategory.getRelatedOne("ProductCategory", true)> <#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOne("ApplEnumeration", true)> <div> - ${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}] + ${(promoProductCategory.description)!} [${promoProductPromoCategory.productCategoryId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")} - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId} <form name="deleteProductPromoCategoryAction_${promoProductPromoCategory_index}" method="post" action="<@ofbizUrl>deleteProductPromoCategory</@ofbizUrl>"> - <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)?if_exists}" /> - <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)!}" /> + <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)!}" /> + <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)!}" /> <a href="javascript:document.deleteProductPromoCategoryAction_${promoProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> @@ -523,17 +523,17 @@ under the License. <#-- ======================= Products ======================== --> <div class="screenlet-body"> <#list promoProductPromoProducts as promoProductPromoProduct> - <#assign promoProduct = promoProductPromoProduct.getRelatedOne("Product", true)?if_exists> + <#assign promoProduct = promoProductPromoProduct.getRelatedOne("Product", true)!> <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOne("ApplEnumeration", true)> <div> - ${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}] + ${(promoProduct.internalName)!} [${promoProductPromoProduct.productId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)} <form name="deleteProductPromoProductAction_${promoProductPromoProduct_index}" action="<@ofbizUrl>deleteProductPromoProduct</@ofbizUrl>" method="post"> - <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)?if_exists}" /> - <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)?if_exists}" /> - <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)?if_exists}" /> - <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)?if_exists}" /> - <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)?if_exists}" /> + <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)!}" /> + <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)!}" /> + <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)!}" /> + <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)!}" /> + <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)!}" /> <a href="javascript:document.deleteProductPromoProductAction_${promoProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </div> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists && productPromo?exists> +<#if productPromoId?? && productPromo??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PageTitleEditProductPromoStores}</h3> @@ -35,20 +35,20 @@ under the License. <#assign line = line + 1> <#assign productStore = productStorePromoAppl.getRelatedOne("ProductStore", false)> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditProductStore?productStoreId=${productStorePromoAppl.productStoreId}</@ofbizUrl>" class="buttontext"><#if productStore?exists>${(productStore.storeName)?if_exists}</#if>[${productStorePromoAppl.productStoreId}]</a></td> + <td><a href="<@ofbizUrl>EditProductStore?productStoreId=${productStorePromoAppl.productStoreId}</@ofbizUrl>" class="buttontext"><#if productStore??>${(productStore.storeName)!}</#if>[${productStorePromoAppl.productStoreId}]</a></td> <#assign hasntStarted = false> - <#if (productStorePromoAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> - <td <#if hasntStarted>style="color: red;"</#if>>${productStorePromoAppl.fromDate?if_exists}</td> + <#if (productStorePromoAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productStorePromoAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> + <td <#if hasntStarted>style="color: red;"</#if>>${productStorePromoAppl.fromDate!}</td> <td align="center"> <#assign hasExpired = false> - <#if (productStorePromoAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> + <#if (productStorePromoAppl.getTimestamp("thruDate"))?? && nowTimestamp.after(productStorePromoAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> <form method="post" action="<@ofbizUrl>promo_updateProductStorePromoAppl</@ofbizUrl>" name="lineForm${line}"> <input type="hidden" name="productStoreId" value="${productStorePromoAppl.productStoreId}" /> <input type="hidden" name="productPromoId" value="${productStorePromoAppl.productPromoId}" /> <input type="hidden" name="fromDate" value="${productStorePromoAppl.fromDate}" /> <#if hasExpired><#assign class="alert"></#if> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productStorePromoAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)?if_exists}" /> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(productStorePromoAppl.thruDate)!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <input type="text" size="5" name="sequenceNum" value="${(productStorePromoAppl.sequenceNum)!}" /> <input type="submit" value="${uiLabelMap.CommonUpdate}" /> </form> </td> @@ -81,7 +81,7 @@ under the License. <input type="hidden" name="tryEntity" value="true"/> <select name="productStoreId"> <#list productStores as productStore> - <option value="${(productStore.productStoreId)?if_exists}">${(productStore.storeName)?if_exists} [${(productStore.productStoreId)?if_exists}]</option> + <option value="${(productStore.productStoreId)!}">${(productStore.storeName)!} [${(productStore.productStoreId)!}]</option> </#list> </select> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Sat Aug 16 11:34:57 2014 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productPromoId?exists> +<#if productPromoId??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductPromotionUploadSetOfPromotionCodes}</h3> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |