svn commit: r1801284 [1/2] - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template: ./ blog/ cart/ catalog/ content/ customer/ customer/profile/ data/ email/ forum/ includes/ order/ quote/ shoppinglist/ survey/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1801284 [1/2] - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template: ./ blog/ cart/ catalog/ content/ customer/ customer/profile/ data/ email/ forum/ includes/ order/ quote/ shoppinglist/ survey/

Arun Patidar-4
Author: arunpatidar
Date: Sat Jul  8 12:54:32 2017
New Revision: 1801284

URL: http://svn.apache.org/viewvc?rev=1801284&view=rev
Log:
Improved: Inconsistent String Comparisons in Ftl of ecommerce plugin. (OFBIZ-9254).

Thanks Devanshu Vyas for your contribution

Modified:
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/TextImage.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategoryLink.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/SideDeepCategory.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/BlogLib.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/TplMbContent.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ViewContent.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditContactMech.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditPerson.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/FinAccountDetail.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewMsg.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/data/Topic.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/email/EmailPayRetry.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/BlogLib.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/MessageDisplay.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/BillSettings.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingOptions.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustSettings.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/GenericAddress.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderHeader.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderItems.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentInformation.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOrderHeader.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonPaymentInformation.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/SplitShip.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/CreateOrderQuote.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/GenericResult.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniResult.ftl
    ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniSurvey.ftl

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/Login.ftl Sat Jul  8 12:54:32 2017
@@ -18,7 +18,7 @@ under the License.
 -->
 <#assign janrainEnabled = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("ecommerce", "janrain.enabled", delegator)>
 <#assign appName = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("ecommerce", "janrain.appName", delegator)>
-<#if janrainEnabled == "Y">
+<#if "Y" == janrainEnabled>
 <script type="text/javascript">
 (function() {
     if (typeof window.janrain !== 'object') window.janrain = {};

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/TextImage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/TextImage.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/TextImage.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/blog/TextImage.ftl Sat Jul  8 12:54:32 2017
@@ -26,12 +26,12 @@
 <#-- This code sets the checkboxes based on existing data -->
 <#assign text_check=""/>
 <#assign img_check=""/>
-<#if (imageContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED")
+<#if (imageContent?has_content && ("SCREEN_COMBINED" == drDataTemplateTypeId?default(""))
     || drMimeTypeId?default("")?starts_with("image"))>
   <#assign img_check="checked='checked'"/>
 </#if>
 <#if (textContent?has_content && drMimeTypeId?default("")?starts_with("text"))
-    || (textContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED"))
+    || (textContent?has_content && ("SCREEN_COMBINED" == drDataTemplateTypeId?default("")))
     || !img_check?has_content>
   <#assign text_check="checked='checked'"/>
 </#if>
@@ -39,7 +39,7 @@
 <#-- Sets one of the two templates -->
 <#assign topleft_check=""/>
 <#assign topcenter_check=""/>
-<#if view.drDataResourceId?has_content && view.drDataResourceId == "BLOG_TPL_TOPLEFT">
+<#if view.drDataResourceId?has_content && "BLOG_TPL_TOPLEFT" == view.drDataResourceId>
   <#assign topleft_check="checked='checked'"/>
 <#else>
   <#assign topcenter_check="checked='checked'"/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/MicroCart.ftl Sat Jul  8 12:54:32 2017
@@ -48,7 +48,7 @@ under the License.
     </li>
     <#if (shoppingCartSize > 0)>
       <#if !initialLocaleComplete?? || initialLocaleComplete?length == 2 >
-        <#if initialLocaleComplete?? && initialLocaleComplete?length == 2  && initialLocaleComplete == "fr">
+        <#if initialLocaleComplete?? && initialLocaleComplete?length == 2  && "fr" == initialLocaleComplete>
           <#assign initialLocaleComplete = "fr_FR"><#-- same idea can be used with other default locale -->
         <#else>
           <#assign initialLocaleComplete = "en_US">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/cart/ShowCart.ftl Sat Jul  8 12:54:32 2017
@@ -32,7 +32,7 @@ under the License.
             var cform = document.cartform;
             var len = cform.elements.length;
             var selectedValue = e.value;
-            if (selectedValue == "") {
+            if ("" == selectedValue) {
                 return;
             }
 
@@ -42,7 +42,7 @@ under the License.
                 var element = cform.elements[i];
                 var ename = element.name;
                 var sname = ename.substring(0,16);
-                if (sname == "option^GIFT_WRAP") {
+                if ("option^GIFT_WRAP" == sname) {
                     var options = element.options;
                     var olen = options.length;
                     var matching = -1;
@@ -102,8 +102,8 @@ under the License.
           ${uiLabelMap.EcommerceProductNumber}
           <input type="text" class="inputBox" name="add_product_id" value="${requestParameters.add_product_id!}" />
           <#-- check if rental data present  insert extra fields in Quick Add-->
-          <#if (product?? && product.getString("productTypeId") == "ASSET_USAGE"
-              ) || (product?? && product.getString("productTypeId") == "ASSET_USAGE_OUT_IN")>
+          <#if (product?? && "ASSET_USAGE" == product.getString("productTypeId")
+              ) || (product?? && "ASSET_USAGE_OUT_IN" == product.getString("productTypeId"))>
             ${uiLabelMap.EcommerceStartDate}:
             <input type="text" class="inputBox" size="10" name="reservStart"
                 value="${requestParameters.reservStart?default("")}" />

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/AdvancedSearch.ftl Sat Jul  8 12:54:32 2017
@@ -45,10 +45,10 @@ under the License.
           value="${requestParameters.SEARCH_STRING?if_exists}"/>
       <label for="SEARCH_OPERATOR_ANY">${uiLabelMap.CommonAny}</label>
       <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ANY"
-          value="OR" <#if searchOperator == "OR">checked="checked"</#if>/>
+          value="OR" <#if "OR" == searchOperator>checked="checked"</#if>/>
       <label for="SEARCH_OPERATOR_ALL">${uiLabelMap.CommonAll}</label>
       <input type="radio" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_ALL"
-          value="AND" <#if searchOperator == "AND">checked="checked"</#if>/>
+          value="AND" <#if "AND" == searchOperator>checked="checked"</#if>/>
     </div>
   <#list productFeatureTypeIdsOrdered as productFeatureTypeId>
     <#assign findPftMap =

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ConfigProductDetail.ftl Sat Jul  8 12:54:32 2017
@@ -58,15 +58,15 @@ ${virtualJavaScript!}
 
   function popupDetail() {
     var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}";
-    if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
+    if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) {
       defaultDetailImage = "_NONE_";
     }
 
-    if (detailImageUrl == null || detailImageUrl == "null") {
+    if (detailImageUrl == null || "null" == detailImageUrl) {
       detailImageUrl = defaultDetailImage;
     }
 
-    if (detailImageUrl == "_NONE_") {
+    if ("_NONE_" == detailImageUrl) {
       hack = document.createElement('span');
       hack.innerHTML = "${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
       showErrorAlert("${uiLabelMap.CommonErrorMessage2}", "${uiLabelMap.CommonNoDetailImageAvailableToDisplay}");
@@ -316,7 +316,7 @@ ${virtualJavaScript!}
           name="addform" style='margin: 0;'>
       <#assign inStock = true>
       <#-- Variant Selection -->
-      <#if product.isVirtual?? && product.isVirtual?upper_case == "Y">
+      <#if product.isVirtual?? && "Y" == product.isVirtual?upper_case>
         <#if variantTree?? && 0 < variantTree.size()>
           <#list featureSet as currentType>
             <div>
@@ -362,7 +362,7 @@ ${virtualJavaScript!}
     <#-- check to see if the product requires inventory check and has inventory -->
     <#else>
       <#if inStock>
-        <#if product.requireAmount?default("N") == "Y">
+        <#if "Y" == product.requireAmount?default("N")>
           <#assign hiddenStyle = "visible">
         <#else>
           <#assign hiddenStyle = "hidden">
@@ -688,7 +688,7 @@ ${virtualJavaScript!}
           <tr>
             <td>
               <div>${uiLabelMap.CommonBy}:
-                <#if productReview.postedAnonymous?default("N") == "Y">
+                <#if "Y" == productReview.postedAnonymous?default("N")>
                 ${uiLabelMap.OrderAnonymous}
                 <#else>
                 ${postedPerson.firstName} ${postedPerson.lastName}
@@ -749,7 +749,7 @@ ${virtualJavaScript!}
     </tr>
     <tr>
       <td colspan="2">
-        <h2>${beforeName!}<#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}</h2>
+        <h2>${beforeName!}<#if "Y" == showName>${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}</h2>
       </td>
     </tr>
 

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/MiniProductSummary.ftl Sat Jul  8 12:54:32 2017
@@ -23,7 +23,7 @@ under the License.
   <ul>
     <li>
       ${miniProduct.productId}
-      <#if (priceResult.price?default(0) > 0 && miniProduct.requireAmount?default("N") == "N")>
+      <#if (priceResult.price?default(0) > 0 && "N" == miniProduct.requireAmount?default("N"))>
         <#if "Y" = miniProduct.isVirtual!>
           ${uiLabelMap.CommonFrom}
         </#if>
@@ -46,14 +46,14 @@ under the License.
     <#elseif (miniProduct.salesDiscontinuationDate??) && (nowTimeLong > miniProduct.salesDiscontinuationDate.getTime())>
       <#-- check to see if salesDiscontinuationDate has passed -->
       <li>${uiLabelMap.ProductNoLongerAvailable}</li>
-    <#elseif miniProduct.isVirtual?default("N") == "Y">
+    <#elseif "Y" == miniProduct.isVirtual?default("N")>
       <li>
         <a href="<@ofbizCatalogAltUrl productCategoryId=requestParameters.category_id?? productId=miniProduct.productId/>"
             class="buttons">
           <span style="white-space: nowrap;">${uiLabelMap.OrderChooseVariations}...</span>
         </a>
       </li>
-    <#elseif miniProduct.requireAmount?default("N") == "Y">
+    <#elseif "Y" == miniProduct.requireAmount?default("N")>
       <li>
         <a href="<@ofbizCatalogAltUrl productCategoryId=requestParameters.category_id?? productId=miniProduct.productId/>"
             class="buttons">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategoryLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategoryLink.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategoryLink.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductCategoryLink.ftl Sat Jul  8 12:54:32 2017
@@ -26,12 +26,12 @@ under the License.
     <#assign imageUrl = productCategoryLink.imageUrl!/>
     <#assign detailText = productCategoryLink.detailText!/>
 
-    <#if productCategoryLink.linkTypeEnumId == "PCLT_SEARCH_PARAM">
+    <#if "PCLT_SEARCH_PARAM" == productCategoryLink.linkTypeEnumId>
       <#assign linkUrl = requestAttributes._REQUEST_HANDLER_.makeLink(
           request, response, "keywordsearch?" + productCategoryLink.linkInfo)/>
-    <#elseif productCategoryLink.linkTypeEnumId == "PCLT_ABS_URL">
+    <#elseif "PCLT_ABS_URL" == productCategoryLink.linkTypeEnumId>
       <#assign linkUrl = productCategoryLink.linkInfo!/>
-    <#elseif productCategoryLink.linkTypeEnumId == "PCLT_CAT_ID">
+    <#elseif "PCLT_CAT_ID" == productCategoryLink.linkTypeEnumId>
       <#assign linkUrl = requestAttributes._REQUEST_HANDLER_.makeLink(
           request, response, "category/~category_id=" + productCategoryLink.linkInfo) +
           "/~pcategory=" + productCategoryId/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/ProductDetail.ftl Sat Jul  8 12:54:32 2017
@@ -102,16 +102,16 @@ ${virtualVariantJavaScript!}
         }
         else {
             var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}";
-            if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") {
+            if (defaultDetailImage == null || "null" == defaultDetailImage || "" == defaultDetailImage) {
                defaultDetailImage = "_NONE_";
             }
 
-            if (detailImageUrl == null || detailImageUrl == "null") {
+            if (detailImageUrl == null || "null" == detailImageUrl) {
                 detailImageUrl = defaultDetailImage;
             }
         }
 
-        if (detailImageUrl == "_NONE_") {
+        if ("_NONE_" == detailImageUrl) {
             hack = document.createElement('span');
             hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
             showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}");
@@ -219,7 +219,7 @@ ${virtualVariantJavaScript!}
     }
 
     function additemSubmit(){
-        <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+        <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
         newdatevalue = validate(document.addform.reservStart.value);
         if (newdatevalue == false) {
             document.addform.reservStart.focus();
@@ -233,8 +233,8 @@ ${virtualVariantJavaScript!}
     }
 
     function addShoplistSubmit(){
-        <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
-        if (document.addToShoppingList.reservStartStr.value == "") {
+        <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
+        if ("" == document.addToShoppingList.reservStartStr.value) {
             document.addToShoppingList.submit();
         } else {
             newdatevalue = validate(document.addToShoppingList.reservStartStr.value);
@@ -252,7 +252,7 @@ ${virtualVariantJavaScript!}
         </#if>
     }
 
-    <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content>
+    <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
         function checkRadioButton() {
             var block1 = document.getElementById("addCart1");
             var block2 = document.getElementById("addCart2");
@@ -525,7 +525,7 @@ $(function(){
           <span class="${priceStyle}">
             <@ofbizCurrency amount=price.price isoCode=price.currencyUsed />
           </span>
-          <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+          <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
             <#if product.reserv2ndPPPerc?? && product.reserv2ndPPPerc != 0><br/>
               <span class="${priceStyle}">
                 ${uiLabelMap.ProductReserv2ndPPPerc}
@@ -566,7 +566,7 @@ $(function(){
         </div>
       </#if>
       <#-- show price details ("showPriceDetails" field can be set in the screen definition) -->
-      <#if (showPriceDetails?? && showPriceDetails?default("N") == "Y")>
+      <#if (showPriceDetails?? && "Y" == showPriceDetails?default("N"))>
         <#if price.orderItemPriceInfos??>
           <#list price.orderItemPriceInfos as orderItemPriceInfo>
             <div>${orderItemPriceInfo.description!}</div>
@@ -661,8 +661,8 @@ $(function(){
           ${uiLabelMap.CommonComment}&nbsp;<input type="text" name="${orderItemAttr}comment"/>
         </#if>
         <#-- Variant Selection -->
-        <#if product.isVirtual!?upper_case == "Y">
-          <#if product.virtualVariantMethodEnum! == "VV_FEATURETREE" && featureLists?has_content>
+        <#if "Y" == product.isVirtual!?upper_case>
+          <#if "VV_FEATURETREE" == product.virtualVariantMethodEnum! && featureLists?has_content>
             <#list featureLists as featureList>
               <#list featureList as feature>
                 <#if feature_index == 0>
@@ -701,7 +701,7 @@ $(function(){
               &nbsp;
             </div>
           </#if>
-          <#if !product.virtualVariantMethodEnum?? || product.virtualVariantMethodEnum == "VV_VARIANTTREE">
+          <#if !product.virtualVariantMethodEnum?? || "VV_VARIANTTREE" == product.virtualVariantMethodEnum>
             <#if variantTree?? && (variantTree.size() &gt; 0)>
               <#list featureSet as currentType>
                 <div>
@@ -741,7 +741,7 @@ $(function(){
               </strong>
             </div>
           </#if>
-          <#if (availableInventory??) && (availableInventory <= 0) && product.requireAmount?default("N") == "N">
+          <#if (availableInventory??) && (availableInventory <= 0) && "N" == product.requireAmount?default("N")>
             <#assign inStock = false />
           </#if>
         </#if>
@@ -755,7 +755,7 @@ $(function(){
         <#-- check to see if the product requires inventory check and has inventory -->
         <#elseif product.virtualVariantMethodEnum! != "VV_FEATURETREE">
           <#if inStock>
-            <#if product.requireAmount?default("N") == "Y">
+            <#if "Y" == product.requireAmount?default("N")>
               <#assign hiddenStyle = "visible" />
             <#else>
               <#assign hiddenStyle = "hidden"/>
@@ -764,7 +764,7 @@ $(function(){
               <span style="white-space: nowrap;"><strong>${uiLabelMap.CommonAmount}:</strong></span>&nbsp;
               <input type="text" size="5" name="add_amount" value=""/>
             </div>
-            <#if product.productTypeId! == "ASSET_USAGE" || product.productTypeId! == "ASSET_USAGE_OUT_IN">
+            <#if "ASSET_USAGE" == product.productTypeId! || "ASSET_USAGE_OUT_IN" == product.productTypeId!>
               <div>
                 <label>
                   Start Date(yyyy-mm-dd)
@@ -788,16 +788,16 @@ $(function(){
                   style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
             <#else>
               <span><input name="quantity" id="quantity" value="1" size="4" maxLength="4" type="text"
-                           <#if product.isVirtual!?upper_case == "Y">disabled="disabled"</#if>/></span><a
+                           <#if "Y" == product.isVirtual!?upper_case>disabled="disabled"</#if>/></span><a
                 href="javascript:addItem()" id="addToCart" name="addToCart"
                 class="buttontext">${uiLabelMap.OrderAddToCart}</a>
               <@showUnavailableVarients/>
             </#if>
           <#else>
             <#if productStore??>
-              <#if productStore.requireInventory?? && productStore.requireInventory == "N">
+              <#if productStore.requireInventory?? && "N" == productStore.requireInventory>
                 <span><input name="quantity" id="quantity" value="1" size="4" maxLength="4" type="text"
-                             <#if product.isVirtual!?upper_case == "Y">disabled="disabled"</#if>/></span><a
+                             <#if "Y" == product.isVirtual!?upper_case>disabled="disabled"</#if>/></span><a
                   href="javascript:addItem()" id="addToCart" name="addToCart"
                   class="buttontext">${uiLabelMap.OrderAddToCart}</a>
                 <@showUnavailableVarients/>
@@ -847,7 +847,7 @@ $(function(){
             </select>
             &nbsp;&nbsp;
           <#--assign nowDate = Static["org.apache.ofbiz.base.util.UtilDateTime"].nowDateString("yyyy-MM-dd")-->
-            <#if product.productTypeId! == "ASSET_USAGE">&nbsp;
+            <#if "ASSET_USAGE" == product.productTypeId!>&nbsp;
               ${uiLabelMap.CommonStartDate}(yyyy-mm-dd)
               <@htmlTemplate.renderDateTimeField name="reservStartStr" event="" action="" value="${startDate}"
                   className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30"
@@ -858,7 +858,7 @@ $(function(){
               <input type="text" size="4" name="reservLength"/>&nbsp;<br/>Number of&nbsp;persons&nbsp;&nbsp;
               <input type="text" size="4" name="reservPersons" value="1"/>&nbsp;&nbsp;Qty&nbsp;&nbsp;
               <input type="text" size="5" name="quantity" value="1"/>
-            <#elseif product.productTypeId! == "ASSET_USAGE_OUT_IN">&nbsp;
+            <#elseif "ASSET_USAGE_OUT_IN" == product.productTypeId!>&nbsp;
               ${uiLabelMap.CommonStartDate}(yyyy-mm-dd)&nbsp;&nbsp;&nbsp;
               <@htmlTemplate.renderDateTimeField name="reservStartStr" event="" action="" value="${startDate}"
                   className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30"
@@ -949,7 +949,7 @@ $(function(){
         <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)! />
         <div>
           <strong>${uiLabelMap.CommonBy} : </strong>
-          <#if productReview.postedAnonymous?default("N") == "Y">
+          <#if "Y" == productReview.postedAnonymous?default("N")>
             ${uiLabelMap.OrderAnonymous}
           <#else>
             ${postedPerson.firstName} ${postedPerson.lastName}&nbsp;
@@ -983,7 +983,7 @@ $(function(){
       <#if assocProducts?has_content>
         <h2>
           ${beforeName!}
-          <#if showName == "Y">${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}
+          <#if "Y" == showName>${productContentWrapper.get("PRODUCT_NAME", "html")!}</#if>${afterName!}
         </h2>
 
         <div class="productsummary-container">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/SideDeepCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/SideDeepCategory.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/SideDeepCategory.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/SideDeepCategory.ftl Sat Jul  8 12:54:32 2017
@@ -39,7 +39,7 @@ under the License.
   <#else>
     <#assign browseCategoryButtonClass = "browsecategorybutton">
   </#if>
-  <#if wrapInBox == "Y">
+  <#if "Y" == wrapInBox>
     <div  id="sidedeepcategory" class="screenlet">
       <div class="screenlet-title-bar">
         <ul>
@@ -85,7 +85,7 @@ under the License.
       </#if>
     </#if>
   </li>
-  <#if wrapInBox == "Y">
+  <#if "Y" == wrapInBox>
         </div>
       </div>
     </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/BlogLib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/BlogLib.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/BlogLib.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/BlogLib.ftl Sat Jul  8 12:54:32 2017
@@ -33,7 +33,7 @@ under the License.
         <tr>
           <td>
             ${indent}
-            <#if content.contentTypeId == "WEB_SITE_PUB_PT" >
+            <#if "WEB_SITE_PUB_PT" == content.contentTypeId>
               <a class="tabButton"
                   href="<@ofbizUrl>showcontenttree?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>">
                 ${uiLabelMap.CommonBackTo}
@@ -48,7 +48,7 @@ under the License.
             </#if>
             <#local indent = indent + "&nbsp;&nbsp;&nbsp;&nbsp;">
             [${content.contentId!}]
-            <#if searchOn?has_content && searchOn?lower_case == "true">
+            <#if searchOn?has_content && "true" == searchOn?lower_case>
               &nbsp;
               <a class="tabButton"
                   href="<@ofbizUrl>searchContent?siteId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/TplMbContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/TplMbContent.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/TplMbContent.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/TplMbContent.ftl Sat Jul  8 12:54:32 2017
@@ -35,7 +35,7 @@ under the License.
 
 <#macro "ask:section">
   <#list .node?children as kid>
-    <#if kid?node_name == "sectionTitle">
+    <#if "sectionTitle" == kid?node_name>
       <h3><#recurse kid></h3>
     <#else>
       ${kid.@@markup}

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ViewContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ViewContent.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ViewContent.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/content/ViewContent.ftl Sat Jul  8 12:54:32 2017
@@ -119,7 +119,7 @@ under the License.
         <tr>
           <td>
             ${indent}
-            <#if content.contentTypeId == "WEB_SITE_PUB_PT" >
+            <#if "WEB_SITE_PUB_PT" == content.contentTypeId>
               <a class="tabButton"
                   href="<@ofbizUrl>showcontenttree?contentId=${content.contentId!}&nodeTrailCsv=${csv}</@ofbizUrl>">
                 ${uiLabelMap.CommonBackTo}
@@ -134,7 +134,7 @@ under the License.
             </#if>
             <#local indent = indent + "&nbsp;&nbsp;&nbsp;&nbsp;">
             [${content.contentId!}]
-            <#if searchOn?has_content && searchOn?lower_case == "true">
+            <#if searchOn?has_content && "true" == searchOn?lower_case>
               &nbsp;
               <a class="tabButton"
                  href="<@ofbizUrl>searchContent?siteId=${siteId!}&nodeTrailCsv=${csv}</@ofbizUrl>">

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditContactMech.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditContactMech.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditContactMech.ftl Sat Jul  8 12:54:32 2017
@@ -263,9 +263,9 @@ under the License.
       <td>&nbsp;</td>
       <td>
         <select name="allowSolicitation" class='selectBox'>
-          <#if (((partyContactMechData.allowSolicitation)!"") == "Y")>
+          <#if ("Y" == ((partyContactMechData.allowSolicitation)!""))>
             <option value="Y">${uiLabelMap.CommonY}</option></#if>
-          <#if (((partyContactMechData.allowSolicitation)!"") == "N")>
+          <#if ("N" == ((partyContactMechData.allowSolicitation)!""))>
             <option value="N">${uiLabelMap.CommonN}</option></#if>
           <option></option>
           <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditPerson.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditPerson.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditPerson.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/EditPerson.ftl Sat Jul  8 12:54:32 2017
@@ -86,8 +86,8 @@ under the License.
             <select name="gender" class='selectBox'>
             <#if personData.gender?has_content >
               <option value="${personData.gender}">
-                <#if personData.gender == "M" >${uiLabelMap.CommonMale}</#if>
-                  <#if personData.gender == "F" >${uiLabelMap.CommonFemale}</#if>
+                <#if "M" == personData.gender >${uiLabelMap.CommonMale}</#if>
+                  <#if "F" == personData.gender >${uiLabelMap.CommonFemale}</#if>
               </option>
               <option value="${personData.gender}"> --</option>
             <#else>
@@ -132,9 +132,9 @@ under the License.
             <select name="maritalStatus" class='selectBox'>
             <#if personData.maritalStatus?has_content>
               <option value="${personData.maritalStatus}">
-                <#if personData.maritalStatus == "S">${uiLabelMap.PartySingle}</#if>
-                 <#if personData.maritalStatus == "M">${uiLabelMap.PartyMarried}</#if>
-                 <#if personData.maritalStatus == "D">${uiLabelMap.PartyDivorced}</#if>
+                <#if "S" == personData.maritalStatus>${uiLabelMap.PartySingle}</#if>
+                 <#if "M" == personData.maritalStatus>${uiLabelMap.PartyMarried}</#if>
+                 <#if "D" == personData.maritalStatus>${uiLabelMap.PartyDivorced}</#if>
               </option>
               <option value="${personData.maritalStatus}"> --</option>
             <#else>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/FinAccountDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/FinAccountDetail.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/FinAccountDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/FinAccountDetail.ftl Sat Jul  8 12:54:32 2017
@@ -74,7 +74,7 @@ under the License.
     <#list ownedFinAccountTransList as ownedFinAccountTrans>
       <#assign finAccountTransType = ownedFinAccountTrans.getRelatedOne("FinAccountTransType", false)/>
       <#assign displayAmount = ownedFinAccountTrans.amount/>
-      <#if ownedFinAccountTrans.finAccountTransTypeId == "WITHDRAWAL">
+      <#if "WITHDRAWAL" == ownedFinAccountTrans.finAccountTransTypeId>
         <#assign displayAmount = -displayAmount/>
       </#if>
       <tr>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/MessageList.ftl Sat Jul  8 12:54:32 2017
@@ -61,7 +61,7 @@ under the License.
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <div class="boxlink">
-      <#if parameters.showSent! == "true">
+      <#if "true" == parameters.showSent!>
         <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">
           ${uiLabelMap.EcommerceViewReceivedOnly}
         </a>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewCustomer.ftl Sat Jul  8 12:54:32 2017
@@ -27,9 +27,9 @@ under the License.
   }
   function clickUsername() {
     if (document.getElementById('UNUSEEMAIL').checked) {
-      if (lastFocusedName == "UNUSEEMAIL") {
+      if ("UNUSEEMAIL" == lastFocusedName) {
         jQuery('#PASSWORD').focus();
-      } else if (lastFocusedName == "PASSWORD") {
+      } else if ("PASSWORD" == lastFocusedName) {
         jQuery('#UNUSEEMAIL').focus();
       } else {
         jQuery('#PASSWORD').focus();
@@ -53,7 +53,7 @@ under the License.
   function hideShowUsaStates() {
     var customerStateElement = document.getElementById('newuserform_stateProvinceGeoId');
     var customerCountryElement = document.getElementById('newuserform_countryGeoId');
-    if (customerCountryElement.value == "USA" || customerCountryElement.value == "UMI") {
+    if ("USA" == customerCountryElement.value || "UMI" == customerCountryElement.value) {
       customerStateElement.style.display = "block";
     } else {
       customerStateElement.style.display = "none";
@@ -235,10 +235,10 @@ side by side in two columns, give each f
       <label for="CUSTOMER_ADDRESS_ALLOW_SOL">${uiLabelMap.PartyAllowAddressSolicitation}</label>
       <@fieldErrors fieldName="CUSTOMER_ADDRESS_ALLOW_SOL"/>
       <select name="CUSTOMER_ADDRESS_ALLOW_SOL" id="CUSTOMER_ADDRESS_ALLOW_SOL">
-        <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "Y")>
+        <#if ("Y" == ((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!""))>
           <option value="Y">${uiLabelMap.CommonY}</option>
         </#if>
-        <#if (((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!"") == "N")>
+        <#if ("N" == ((requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL)!""))>
           <option value="N">${uiLabelMap.CommonN}</option>
         </#if>
         <option></option>
@@ -279,9 +279,9 @@ side by side in two columns, give each f
           </td>
           <td>
             <select name="CUSTOMER_HOME_ALLOW_SOL">
-              <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "Y")>
+              <#if ("Y" == ((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!""))>
                 <option value="Y">${uiLabelMap.CommonY}</option></#if>
-              <#if (((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!"") == "N")>
+              <#if ("N" == ((requestParameters.CUSTOMER_HOME_ALLOW_SOL)!""))>
                 <option value="N">${uiLabelMap.CommonN}</option>
               </#if>
               <option></option>
@@ -306,9 +306,9 @@ side by side in two columns, give each f
           </td>
           <td>
             <select name="CUSTOMER_WORK_ALLOW_SOL">
-              <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "Y")>
+              <#if ("Y" == ((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!""))>
                 <option value="Y">${uiLabelMap.CommonY}</option></#if>
-              <#if (((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!"") == "N")>
+              <#if ("N" == ((requestParameters.CUSTOMER_WORK_ALLOW_SOL)!""))>
               <option value="N">${uiLabelMap.CommonN}</option></#if>
               <option></option>
               <option value="Y">${uiLabelMap.CommonY}</option>
@@ -330,9 +330,9 @@ side by side in two columns, give each f
           <td></td>
           <td>
             <select name="CUSTOMER_FAX_ALLOW_SOL">
-              <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"") == "Y")>
+              <#if ("Y" == ((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!""))>
                 <option value="Y">${uiLabelMap.CommonY}</option></#if>
-              <#if (((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!"") == "N")>
+              <#if ("N" == ((requestParameters.CUSTOMER_FAX_ALLOW_SOL)!""))>
               <option value="N">${uiLabelMap.CommonN}</option></#if>
               <option></option>
               <option value="Y">${uiLabelMap.CommonY}</option>
@@ -355,9 +355,9 @@ side by side in two columns, give each f
           <td></td>
           <td>
             <select name="CUSTOMER_MOBILE_ALLOW_SOL">
-              <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"") == "Y")>
+              <#if ("Y" == ((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!""))>
                 <option value="Y">${uiLabelMap.CommonY}</option></#if>
-              <#if (((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!"") == "N")>
+              <#if ("N" == ((requestParameters.CUSTOMER_MOBILE_ALLOW_SOL)!""))>
               <option value="N">${uiLabelMap.CommonN}</option></#if>
               <option></option>
               <option value="Y">${uiLabelMap.CommonY}</option>
@@ -380,9 +380,9 @@ side by side in two columns, give each f
     <div>
       <label for="CUSTOMER_EMAIL_ALLOW_SOL">${uiLabelMap.PartyAllowSolicitation}</label>
       <select name="CUSTOMER_EMAIL_ALLOW_SOL" id="CUSTOMER_EMAIL_ALLOW_SOL">
-        <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "Y")>
+        <#if ("Y" == ((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!""))>
           <option value="Y">${uiLabelMap.CommonY}</option></#if>
-        <#if (((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!"") == "N")>
+        <#if ("N" == ((requestParameters.CUSTOMER_EMAIL_ALLOW_SOL)!""))>
         <option value="N">${uiLabelMap.CommonN}</option></#if>
         <option></option>
         <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewMsg.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewMsg.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewMsg.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/NewMsg.ftl Sat Jul  8 12:54:32 2017
@@ -20,7 +20,7 @@ under the License.
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <div class="boxlink">
-      <#if showMessageLinks?default("false")?upper_case == "TRUE">
+      <#if "TRUE" == showMessageLinks?default("false")?upper_case>
         <a href="<@ofbizUrl>messagelist</@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
       </#if>
     </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/ViewProfile.ftl Sat Jul  8 12:54:32 2017
@@ -40,7 +40,7 @@ under the License.
       <#else>
         <a href="<@ofbizUrl>viewprofile?SHOW_OLD=true</@ofbizUrl>" class="button">${uiLabelMap.PartyShowOld}</a>
       </#if>
-      <#if (productStore.enableDigProdUpload)! == "Y">
+      <#if "Y" == (productStore.enableDigProdUpload)!>
         <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="button">${uiLabelMap.EcommerceDigitalProductUpload}</a>
       </#if>
     </td>
@@ -130,9 +130,9 @@ under the License.
                 <div>
                   <#if contactMechPurposeType??>
                     ${contactMechPurposeType.get("description",locale)}
-                    <#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION" && (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId>
+                    <#if "SHIPPING_LOCATION" == contactMechPurposeType.contactMechPurposeTypeId && (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId>
                       <span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span>
-                    <#elseif contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION">
+                    <#elseif "SHIPPING_LOCATION" == contactMechPurposeType.contactMechPurposeTypeId>
                       <form name="defaultShippingAddressForm" method="post" action="<@ofbizUrl>setprofiledefault/viewprofile</@ofbizUrl>">
                         <input type="hidden" name="productStoreId" value="${productStoreId}" />
                         <input type="hidden" name="defaultShipAddr" value="${contactMech.contactMechId}" />
@@ -240,7 +240,7 @@ under the License.
               <#assign giftCard = paymentMethodValueMap.giftCard! />
               <#assign eftAccount = paymentMethodValueMap.eftAccount! />
               <tr>
-                <#if paymentMethod.paymentMethodTypeId! == "CREDIT_CARD">
+                <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId!>
                 <td valign="top">
                   <div>
                     ${uiLabelMap.AccountingCreditCard}:
@@ -261,7 +261,7 @@ under the License.
                   <a href="<@ofbizUrl>editcreditcard?paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>" class="button">
                             ${uiLabelMap.CommonUpdate}</a>
                 </td>
-                <#elseif paymentMethod.paymentMethodTypeId! == "GIFT_CARD">
+                <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId!>
                   <#if giftCard?has_content && giftCard.cardNumber?has_content>
                     <#assign giftCardNumber = "" />
                     <#assign pcardNumber = giftCard.cardNumber />
@@ -291,7 +291,7 @@ under the License.
                     <a href="<@ofbizUrl>editgiftcard?paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>" class="button">
                             ${uiLabelMap.CommonUpdate}</a>
                   </td>
-                  <#elseif paymentMethod.paymentMethodTypeId! == "EFT_ACCOUNT">
+                  <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId!>
                   <td valign="top">
                     <div>
                       ${uiLabelMap.AccountingEFTAccount}: ${eftAccount.nameOnAccount!} - <#if eftAccount.bankName?has_content>${uiLabelMap.AccountingBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.AccountingAccount} #: ${eftAccount.accountNumber}</#if>
@@ -475,7 +475,7 @@ under the License.
         <td>${emailAddress.infoString!}</td>
         <td>&nbsp;</td>
         <td>
-          <#if (contactListParty.statusId! == "CLPT_ACCEPTED")>            
+          <#if ("CLPT_ACCEPTED" == contactListParty.statusId!)>
             <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistRejectForm${contactListParty_index}">
             <div>
               <#assign productStoreId = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
@@ -488,7 +488,7 @@ under the License.
               <input type="submit" value="${uiLabelMap.EcommerceUnsubscribe}" class="smallSubmit"/>
               </div>
             </form>
-          <#elseif (contactListParty.statusId! == "CLPT_PENDING")>
+          <#elseif ("CLPT_PENDING" == contactListParty.statusId!)>
             <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistAcceptForm${contactListParty_index}">
             <div>
               <input type="hidden" name="partyId" value="${party.partyId}"/>
@@ -500,7 +500,7 @@ under the License.
               <input type="submit" value="${uiLabelMap.EcommerceVerifySubscription}" class="smallSubmit"/>
               </div>
             </form>
-          <#elseif (contactListParty.statusId! == "CLPT_REJECTED")>
+          <#elseif ("CLPT_REJECTED" == contactListParty.statusId!)>
             <form method="post" action="<@ofbizUrl>updateContactListParty</@ofbizUrl>" name="clistPendForm${contactListParty_index}">
             <div>
               <input type="hidden" name="partyId" value="${party.partyId}"/>
@@ -559,9 +559,9 @@ under the License.
             <#assign responses = Static["org.apache.ofbiz.product.store.ProductStoreWorker"].checkSurveyResponse(request, survey.surveyId)?default(0)>
             <#if (responses < 1)>${uiLabelMap.EcommerceNotCompleted}<#else>${uiLabelMap.EcommerceCompleted}</#if>
           </td>
-          <#if (responses == 0 || survey.allowMultiple?default("N") == "Y")>
+          <#if (responses == 0 || "Y"  == survey.allowMultiple?default("N"))>
             <#assign surveyLabel = uiLabelMap.EcommerceTakeSurvey />
-            <#if (responses > 0 && survey.allowUpdate?default("N") == "Y")>
+            <#if (responses > 0 && "Y"  == survey.allowUpdate?default("N"))>
               <#assign surveyLabel = uiLabelMap.EcommerceUpdateSurvey />
             </#if>
             <td align="right"><a href="<@ofbizUrl>takesurvey?productStoreSurveyId=${surveyAppl.productStoreSurveyId}</@ofbizUrl>" class="button">${surveyLabel}</a></td>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/customer/profile/ManageAddress.ftl Sat Jul  8 12:54:32 2017
@@ -332,7 +332,7 @@ under the License.
           </#if>
         </#if>
       </#list>
-      <#if postalAddressFlag == "N">
+      <#if "N" == postalAddressFlag>
         <div>
           <label>${uiLabelMap.PartyPostalInformationNotFound}.</label>
         </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/data/Topic.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/data/Topic.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/data/Topic.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/data/Topic.ftl Sat Jul  8 12:54:32 2017
@@ -34,7 +34,7 @@ under the License.
   <#assign internalNameParts=internalName?split(".")/>
   <#assign firstPart=internalNameParts[0] />
   <#assign nowStamp=Static["org.apache.ofbiz.base.util.UtilDateTime"].nowTimestamp()/>
-  <#if firstPart == "WIDGETS">
+  <#if "WIDGETS" == firstPart>
     <ContentAssoc contentId="CNTWIDGETS" contentIdTo="${contentId}" contentAssocTypeId="SUB_CONTENT"
         fromDate="${nowStamp?string("yyyy-MM-dd HH:mm:ss")}"/>
   </#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/email/EmailPayRetry.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/email/EmailPayRetry.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/email/EmailPayRetry.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/email/EmailPayRetry.ftl Sat Jul  8 12:54:32 2017
@@ -18,10 +18,10 @@ under the License.
 -->
 
 <br/>
-<#if orderHeader.statusId == "ORDER_REJECTED">
+<#if "ORDER_REJECTED" == orderHeader.statusId>
   ${uiLabelMap.OrderEmailProblemWithYourPaymentMethod} ${orderHeader.orderId}.<br/>
   ${uiLabelMap.OrderEmailProblemCancelledNotProcessed}<br/>
-<#elseif orderHeader.statusId == "ORDER_APPROVED">
+<#elseif "ORDER_APPROVED" == orderHeader.statusId>
   ${uiLabelMap.OrderEmailPaymentOK} ${orderHeader.orderId} ${uiLabelMap.OrderEmailAccepted}
 <#else>
   ${uiLabelMap.OrderEmailSorry} ${orderHeader.orderId}.<br/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/BlogLib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/BlogLib.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/BlogLib.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/BlogLib.ftl Sat Jul  8 12:54:32 2017
@@ -146,7 +146,7 @@ under the License.
         <tr>
           <td>
           ${indent}
-            <#if content.contentTypeId == "WEB_SITE_PUB_PT" >
+            <#if "WEB_SITE_PUB_PT" == content.contentTypeId>
               <a class="tabButton"
                   href="<@ofbizUrl>showforum?forumId=${content.contentId!}&amp;nodeTrailCsv=${csv}</@ofbizUrl>">${uiLabelMap.CommonBackTo}</a>
               &nbsp;${content.contentName!}

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/MessageDisplay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/MessageDisplay.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/MessageDisplay.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/forum/MessageDisplay.ftl Sat Jul  8 12:54:32 2017
@@ -18,7 +18,7 @@ under the License.
 -->
 <#-- Thread content id equals contentId if contentAssocTypeId equals PUBLISH_LINK, else threadContentId = ownerContentId -->
 <#assign threadContentId = forumMessage.contentId/>
-<#if forumMessage.caContentAssocTypeId == "RESPONSE">
+<#if "RESPONSE" == forumMessage.caContentAssocTypeId>
   <#assign threadContentId = forumMessage.ownerContentId!/>
 </#if>
 <#if rsp??>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl Sat Jul  8 12:54:32 2017
@@ -49,14 +49,14 @@ under the License.
           type="text/css"/>
     </#list>
   </#if>
-  <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
+  <#if layoutSettings.rtlStyleSheets?has_content && "rtl" == langDir>
   <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
     <#list layoutSettings.rtlStyleSheets as styleSheet>
       <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>"
           type="text/css"/>
     </#list>
   </#if>
-  <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl">
+  <#if layoutSettings.VT_RTL_STYLESHEET?has_content && "rtl" == langDir>
     <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet>
       <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>"
           type="text/css"/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/BillSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/BillSettings.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/BillSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/BillSettings.ftl Sat Jul  8 12:54:32 2017
@@ -19,7 +19,7 @@ under the License.
 
 <script language="JavaScript" type="text/javascript">
   function shipBillAddr() {
-    <#if requestParameters.singleUsePayment?default("N") == "Y">
+    <#if "Y" == requestParameters.singleUsePayment?default("N")>
       <#assign singleUse = "&amp;singleUsePayment=Y">
     <#else>
       <#assign singleUse = "">
@@ -44,9 +44,9 @@ under the License.
     <div class='h3'>${uiLabelMap.AccountingPaymentInformation}</div>
   </div>
   <div class="screenlet-body">
-    <#if (paymentMethodType?? && !requestParameters.resetType?has_content) || finalizeMode?default("") == "payment">
+    <#if (paymentMethodType?? && !requestParameters.resetType?has_content) || "payment" == finalizeMode?default("")>
       <#-- after initial screen; show detailed screens for selected type -->
-      <#if paymentMethodType == "CC">
+      <#if "CC" == paymentMethodType>
         <#if creditCard?has_content && postalAddress?has_content>
           <form method="post" action="<@ofbizUrl>changeCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform">
             <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/>
@@ -57,7 +57,7 @@ under the License.
           <form method="post" action="<@ofbizUrl>enterCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform">
         </#if>
       </#if>
-      <#if paymentMethodType == "EFT">
+      <#if "EFT" == paymentMethodType>
         <#if eftAccount?has_content && postalAddress?has_content>
           <form method="post" action="<@ofbizUrl>changeEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform">
             <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/>
@@ -68,11 +68,11 @@ under the License.
           <form method="post" action="<@ofbizUrl>enterEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform">
         </#if>
       </#if>
-      <#if paymentMethodType == "GC">
+      <#if "GC" == paymentMethodType>
         <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform">
       </#if>
 
-      <#if requestParameters.singleUsePayment?default("N") == "Y">
+      <#if "Y" == requestParameters.singleUsePayment?default("N")>
         <input type="hidden" name="singleUsePayment" value="Y"/>
         <input type="hidden" name="appendPayment" value="Y"/>
       </#if>
@@ -104,7 +104,7 @@ under the License.
           </tr>
         </#if>
 
-        <#if (paymentMethodType == "CC" || paymentMethodType == "EFT")>
+        <#if ("CC" == paymentMethodType || "EFT" == paymentMethodType)>
           <tr>
             <td width="26%" align="right" valign="top">
               <div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div>
@@ -116,7 +116,7 @@ under the License.
         </#if>
 
         <#-- credit card fields -->
-        <#if paymentMethodType == "CC">
+        <#if "CC" == paymentMethodType>
           <#if !creditCard?has_content>
             <#assign creditCard = requestParameters>
           </#if>
@@ -230,7 +230,7 @@ under the License.
         </#if>
 
         <#-- gift card fields -->
-        <#if requestParameters.useGc?default("") == "GC" || paymentMethodType == "GC">
+        <#if "GC" == requestParameters.useGc?default("") || "GC" == paymentMethodType>
           <#assign giftCard = requestParameters>
           <input type="hidden" name="addGiftCard" value="Y"/>
           <#if paymentMethodType != "GC">
@@ -307,7 +307,7 @@ under the License.
             <tr>
               <td width='5%' nowrap="nowrap">
                 <input type="checkbox" name="useGc" value="GC"
-                    <#if paymentMethodType?? && paymentMethodType == "GC">checked="checked"</#if>/>
+                    <#if paymentMethodType?? && "GC" == paymentMethodType>checked="checked"</#if>/>
               </td>
               <td width='95%' nowrap="nowrap">
                 <div>${uiLabelMap.AccountingCheckGiftCard}</div>
@@ -323,7 +323,7 @@ under the License.
             <tr>
               <td width='5%' nowrap="nowrap">
                 <input type="radio" name="paymentMethodType" value="offline"
-                    <#if paymentMethodType?? && paymentMethodType == "offline">checked="checked"</#if>/>
+                    <#if paymentMethodType?? && "offline" == paymentMethodType>checked="checked"</#if>/>
               </td>
               <td width='95%' nowrap="nowrap">
                 <div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div>
@@ -339,7 +339,7 @@ under the License.
             <tr>
               <td width='5%' nowrap="nowrap">
                 <input type="radio" name="paymentMethodType" value="CC"
-                    <#if paymentMethodType?? && paymentMethodType == "CC">checked="checked"</#if>/>
+                    <#if paymentMethodType?? && "CC" == paymentMethodType>checked="checked"</#if>/>
               </td>
               <td width='95%' nowrap="nowrap">
                 <div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div>
@@ -355,7 +355,7 @@ under the License.
             <tr>
               <td width='5%' nowrap="nowrap">
                 <input type="radio" name="paymentMethodType" value="EFT"
-                    <#if paymentMethodType?? && paymentMethodType == "EFT">checked="checked"</#if>/>
+                    <#if paymentMethodType?? && "EFT" == paymentMethodType>checked="checked"</#if>/>
               </td>
               <td width='95%' nowrap="nowrap">
                 <div>${uiLabelMap.AccountingAHCElectronicCheck}</div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingOptions.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingOptions.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CheckoutShippingOptions.ftl Sat Jul  8 12:54:32 2017
@@ -20,35 +20,35 @@ under the License.
 <script language="javascript" type="text/javascript">
   //<![CDATA[
   function submitForm(form, mode, value) {
-    if (mode == "DN") {
+    if ("DN" == mode) {
       // done action; checkout
       form.action = "<@ofbizUrl>checkoutoptions</@ofbizUrl>";
       form.submit();
-    } else if (mode == "CS") {
+    } else if ("CS" == mode) {
       // continue shopping
       form.action = "<@ofbizUrl>updateCheckoutOptions/showcart</@ofbizUrl>";
       form.submit();
-    } else if (mode == "NA") {
+    } else if ("NA" == mode) {
       // new address
       form.action = "<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>";
       form.submit();
-    } else if (mode == "EA") {
+    } else if ("EA" == mode) {
       // edit address
       form.action = "<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+ value+"</@ofbizUrl>";
       form.submit();
-    } else if (mode == "NC") {
+    } else if ("NC" == mode) {
       // new credit card
       form.action = "<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions</@ofbizUrl>";
       form.submit();
-    } else if (mode == "EC") {
+    } else if ("EC" == mode) {
       // edit credit card
       form.action = "<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&paymentMethodId="+ value+"</@ofbizUrl>";
       form.submit();
-    } else if (mode == "NE") {
+    } else if ("NE" == mode) {
       // new eft account
       form.action = "<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions</@ofbizUrl>";
       form.submit();
-    } else if (mode == "EE") {
+    } else if ("EE" == mode) {
       // edit eft account
       form.action = "<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&paymentMethodId="+ value+"</@ofbizUrl>";
       form.submit();

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustSettings.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/CustSettings.ftl Sat Jul  8 12:54:32 2017
@@ -78,9 +78,9 @@ under the License.
       <td><input type="text" name="homeExt" value="${parameters.homeExt!}"/></td>
       <td>
         <select name="homeSol">
-        <#if (((parameters.homeSol)!"") == "Y")>
+        <#if ("Y" == ((parameters.homeSol)!""))>
           <option value="Y">${uiLabelMap.CommonY}</option></#if>
-        <#if (((parameters.homeSol)!"") == "N")>
+        <#if ("N" == ((parameters.homeSol)!""))>
           <option value="N">${uiLabelMap.CommonN}</option></#if>
           <option></option>
           <option value="Y">${uiLabelMap.CommonY}</option>
@@ -97,10 +97,10 @@ under the License.
       <td><input type="text" name="workExt" value="${parameters.workExt!}"/></td>
       <td>
         <select name="workSol">
-          <#if (((parameters.workSol)!"") == "Y")>
+          <#if ("Y" == ((parameters.workSol)!""))>
             <option value="Y">${uiLabelMap.CommonY}</option>
           </#if>
-          <#if (((parameters.workSol)!"") == "N")>
+          <#if ("N" == ((parameters.workSol)!""))>
             <option value="N">${uiLabelMap.CommonN}</option>
           </#if>
           <option></option>
@@ -120,9 +120,9 @@ under the License.
       <span>
       <label for="emailSol">${uiLabelMap.PartyAllowSolicitation}</label>
       <select name="emailSol" class="selectBox">
-        <#if (((parameters.emailSol)!"") == "Y")>
+        <#if ("Y" == ((parameters.emailSol)!""))>
           <option value="Y">${uiLabelMap.CommonY}</option></#if>
-        <#if (((parameters.emailSol)!"") == "N")>
+        <#if ("N" == ((parameters.emailSol)!""))>
           <option value="N">${uiLabelMap.CommonN}</option></#if>
           <option></option>
         <option value="Y">${uiLabelMap.CommonY}</option>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/GenericAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/GenericAddress.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/GenericAddress.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/GenericAddress.ftl Sat Jul  8 12:54:32 2017
@@ -127,10 +127,10 @@ under the License.
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr??>disabled</#if>>
-      <#if (((parameters.allowSolicitation)!"") == "Y")>
+      <#if ("Y" == ((parameters.allowSolicitation)!""))>
         <option value="Y">${uiLabelMap.CommonY}</option>
       </#if>
-      <#if (((parameters.allowSolicitation)!"") == "N")>
+      <#if ("N" == ((parameters.allowSolicitation)!""))>
         <option value="N">${uiLabelMap.CommonN}</option>
       </#if>
       <option></option>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OptionSettings.ftl Sat Jul  8 12:54:32 2017
@@ -55,12 +55,12 @@ under the License.
   <fieldset>
     <legend>${uiLabelMap.OrderShipAllAtOnce}?</legend>
     <div>
-      <input type="radio" id="maySplit_N" <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if>
+      <input type="radio" id="maySplit_N" <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
           name="may_split" value="false"/>
       <label for="maySplit_N">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</label>
     </div>
     <div>
-      <input type="radio" id="maySplit_Y" <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if>
+      <input type="radio" id="maySplit_Y" <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if>
           name="may_split" value="true"/>
       <label for="maySplit_Y">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</label>
     </div>
@@ -79,12 +79,12 @@ under the License.
     <fieldset>
       <legend>${uiLabelMap.OrderIsThisGift}</legend>
       <div>
-        <input type="radio" id="is_gift_Y" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if>
+        <input type="radio" id="is_gift_Y" <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if>
             name="is_gift" value="true"/>
         <label for="is_gift_Y">${uiLabelMap.CommonYes}</label>
       </div>
       <div>
-        <input type="radio" id="is_gift_N" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if>
+        <input type="radio" id="is_gift_N" <#if "N" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if>
             name="is_gift" value="false"/>
         <label far="is_gift_N">${uiLabelMap.CommonNo}</label>
       </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderHeader.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderHeader.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderHeader.ftl Sat Jul  8 12:54:32 2017
@@ -26,7 +26,7 @@ under the License.
 
     <div class="screenlet">
       <h3>
-      <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)! == "ORDER_COMPLETED" && roleTypeId! == "PLACING_CUSTOMER">
+      <#if "Y" == maySelectItems?default("N") && "Y" == returnLink?default("N") && "ORDER_COMPLETED" == (orderHeader.statusId)! && "PLACING_CUSTOMER" == roleTypeId!>
         <a href="<@ofbizUrl fullPath="true">makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>"
             class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
       </#if>
@@ -87,7 +87,7 @@ under the License.
         <ul>
           <#if !paymentMethod?has_content && paymentMethodType?has_content>
             <li>
-              <#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE">
+              <#if "EXT_OFFLINE" == paymentMethodType.paymentMethodTypeId>
                 ${uiLabelMap.AccountingOfflinePayment}
                 <#if orderHeader?has_content && paymentAddress?has_content>
                   ${uiLabelMap.OrderSendPaymentTo}:
@@ -330,8 +330,8 @@ under the License.
           </#if>
           <li>
             ${uiLabelMap.OrderSplittingPreference}:
-            <#if maySplit?default("N") == "N">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</#if>
-            <#if maySplit?default("N") == "Y">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</#if>
+            <#if "N" == maySplit?default("N")>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</#if>
+            <#if "Y" == maySplit?default("N")>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</#if>
           </li>
           <#-- shipping instructions -->
           <#if orderHeader?has_content>
@@ -355,8 +355,8 @@ under the License.
           <#if productStore.showCheckoutGiftOptions! != "N">
             <li>
               ${uiLabelMap.OrderGift}?
-              <#if isGift?default("N") == "N">${uiLabelMap.OrderThisIsNotGift}.</#if>
-              <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisIsGift}.</#if>
+              <#if "N" == isGift?default("N")>${uiLabelMap.OrderThisIsNotGift}.</#if>
+              <#if "Y" == isGift?default("N")>${uiLabelMap.OrderThisIsGift}.</#if>
             </li>
             <#if giftMessage?has_content>
               <li>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderItems.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderItems.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/OrderItems.ftl Sat Jul  8 12:54:32 2017
@@ -21,7 +21,7 @@ under the License.
 <#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
 <#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
 <div class="screenlet">
-    <#if maySelectItems?default("N") == "Y" >
+    <#if "Y" == maySelectItems?default("N")>
       <form name="addCommonToCartForm" action="<@ofbizUrl>addordertocart/orderstatus</@ofbizUrl>" method="post">
         <input type="hidden" name="add_all" value="false" />    
             <input type="hidden" name="orderId" value="${orderHeader.orderId}" />
@@ -29,7 +29,7 @@ under the License.
   <h3>
     <#assign numColumns = 8>
     ${uiLabelMap.OrderOrderItems}
-    <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
+    <#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!>
       <#assign numColumns = 11>
       <a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()"
           class="submenutext">${uiLabelMap.OrderAddAllToCart}</a>
@@ -43,7 +43,7 @@ under the License.
     <thead>
       <tr>
         <th>${uiLabelMap.OrderProduct}</th>
-        <#if maySelectItems?default("N") == "Y">
+        <#if "Y" == maySelectItems?default("N")>
           <th>${uiLabelMap.OrderQtyOrdered}</th>
           <th>${uiLabelMap.OrderQtyPicked}</th>
           <th>${uiLabelMap.OrderQtyShipped}</th>
@@ -57,7 +57,7 @@ under the License.
           <th>${uiLabelMap.EcommerceUnitPrice}</th>
           <th>${uiLabelMap.OrderAdjustments}</th>
           <th>${uiLabelMap.CommonSubtotal}</th>
-        <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
+        <#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!>
           <th colspan="3"></th>
         </#if>
       </tr>
@@ -66,7 +66,7 @@ under the License.
       <tr>
         <th colspan="7">${uiLabelMap.CommonSubtotal}</th>
         <td><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td>
-        <#if maySelectItems?default("N") == "Y">
+        <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
       </tr>
@@ -74,7 +74,7 @@ under the License.
         <tr>
           <th colspan="7">${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</th>
           <td><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></td>
-          <#if maySelectItems?default("N") == "Y">
+          <#if "Y" == maySelectItems?default("N")>
             <td colspan="3"></td>
           </#if>
         </tr>
@@ -82,20 +82,20 @@ under the License.
       <tr>
         <th colspan="7">${uiLabelMap.OrderShippingAndHandling}</th>
         <td><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></td>
-        <#if maySelectItems?default("N") == "Y">
+        <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
       </tr>
       <tr>
         <th colspan="7">${uiLabelMap.OrderSalesTax}</th>
         <td><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></td>
-        <#if maySelectItems?default("N") == "Y">
+        <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
       </tr>
       <tr>
         <td colspan="3"></td>
-        <#if maySelectItems?default("N") == "Y">
+        <#if "Y" == maySelectItems?default("N")>
           <td colspan="${numColumns - 6}"></td>
           <td colspan="3"></td>
         <#else>
@@ -107,7 +107,7 @@ under the License.
         <td>
           <@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/>
         </td>
-        <#if maySelectItems?default("N") == "Y">
+        <#if "Y" == maySelectItems?default("N")>
           <td colspan="3"></td>
         </#if>
       </tr>
@@ -116,7 +116,7 @@ under the License.
       <#list orderItems as orderItem>
         <#-- get info from workeffort and calculate rental quantity, if it was a rental item -->
         <#assign rentalQuantity = 1> <#-- no change if no rental item -->
-        <#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM" && workEfforts??>
+        <#if "RENTAL_ORDER_ITEM" == orderItem.orderItemTypeId && workEfforts??>
           <#list workEfforts as workEffort>
             <#if workEffort.workEffortId == orderItem.orderItemSeqId>
               <#assign rentalQuantity = localOrderReadHelper.getWorkEffortRentalQuantity(workEffort)>
@@ -137,7 +137,7 @@ under the License.
           <td colspan="${numColumns}"></td>
         </tr>
         <tr>
-          <#if !orderItem.productId?? || orderItem.productId == "_?_">
+          <#if !orderItem.productId?? || "_?_" == orderItem.productId>
             <td>${orderItem.itemDescription?default("")}</td>
           <#else>
             <#assign product = orderItem.getRelatedOne("Product", true)!/> <#-- should always exist because of FK constraint, but just in case -->
@@ -182,13 +182,13 @@ under the License.
                   : ${product.productDepth!} ${((depthUom.abbreviation)?default(product.depthUomId))!}]
                 </#if>
               </#if>
-              <#if maySelectItems?default("N") == "Y">
+              <#if "Y" == maySelectItems?default("N")>
                 <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)!>
                 <#if returns?has_content>
                   <#list returns as return>
                     <#assign returnHeader = return.getRelatedOne("ReturnHeader", false)>
                     <#if returnHeader.statusId != "RETURN_CANCELLED">
-                      <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "RETURN_APPROVED">
+                      <#if "RETURN_REQUESTED" == returnHeader.statusId || "RETURN_APPROVED" == returnHeader.statusId>
                         <#assign displayState = "Return Pending">
                       <#else>
                         <#assign displayState = "Returned">
@@ -199,7 +199,7 @@ under the License.
                 </#if>
               </#if>
             </td>
-            <#if !(maySelectItems?default("N") == "Y")>
+            <#if !("Y" == maySelectItems?default("N"))>
               <td></td>
               <td></td>
               <td></td>
@@ -207,10 +207,10 @@ under the License.
             <td>
               ${orderItem.quantity?string.number}
             </td>
-            <#if maySelectItems?default("N") == "Y">
+            <#if "Y" == maySelectItems?default("N")>
               <td>
                 <#assign pickedQty = localOrderReadHelper.getItemPickedQuantityBd(orderItem)>
-                <#if pickedQty gt 0 && orderHeader.statusId == "ORDER_APPROVED">${pickedQty?default(0)?string.number}<#else>${pickedQty?default(0)?string.number}</#if>
+                <#if pickedQty gt 0 && "ORDER_APPROVED" == orderHeader.statusId>${pickedQty?default(0)?string.number}<#else>${pickedQty?default(0)?string.number}</#if>
               </td>
               <td>
                 <#assign shippedQty = localOrderReadHelper.getItemShippedQuantity(orderItem)>
@@ -234,7 +234,7 @@ under the License.
                 <@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem) isoCode=currencyUomId/>
               </#if>
             </td>
-            <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
+            <#if "Y" == maySelectItems?default("N") && "PLACING_CUSTOMER" == roleTypeId!>
               <td></td>
               <td>
                 <input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox"/>
@@ -244,7 +244,7 @@ under the License.
           </#if>
         </tr>
         <#-- now cancel reason and comment field -->
-        <#if maySelectItems?default("N") == "Y" && (orderHeader.statusId != "ORDER_SENT" && orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty == 0)>
+        <#if "Y" == maySelectItems?default("N") && (orderHeader.statusId != "ORDER_SENT" && orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty == 0)>
           <tr>
             <td colspan="7">${uiLabelMap.OrderReturnReason}
               <select name="irm_${orderItem.orderItemSeqId}" class="selectBox">
@@ -264,7 +264,7 @@ under the License.
           </tr>
         </#if>
         <#-- show info from workeffort if it was a rental item -->
-        <#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM">
+        <#if "RENTAL_ORDER_ITEM" == orderItem.orderItemTypeId>
           <#if workEffortSave??>
           <tr>
             <td></td>
@@ -285,7 +285,7 @@ under the License.
               : ${StringUtil.wrapString(localOrderReadHelper.getAdjustmentType(orderItemAdjustment))}
               <#if orderItemAdjustment.description?has_content>
                 : ${StringUtil.wrapString(orderItemAdjustment.description)}</#if>
-              <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
+              <#if "SALES_TAX" == orderItemAdjustment.orderAdjustmentTypeId>
                 <#if orderItemAdjustment.primaryGeoId?has_content>
                   <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
                   <#if primaryGeo.geoName?has_content>
@@ -309,7 +309,7 @@ under the License.
               <@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/>
             </td>
             <td></td>
-            <#if maySelectItems?default("N") == "Y">
+            <#if "Y" == maySelectItems?default("N")>
               <td colspan="3"></td>
             </#if>
           </tr>
@@ -342,7 +342,7 @@ under the License.
       </tr>
     </tbody>
   </table>
-    <#if maySelectItems?default("N") == "Y" >
+    <#if "Y" == maySelectItems?default("N") >
         </form>
      </#if>
 </div>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentInformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentInformation.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentInformation.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentInformation.ftl Sat Jul  8 12:54:32 2017
@@ -21,7 +21,7 @@ under the License.
 </#if>
 <script language="JavaScript" type="text/javascript">
 function shipBillAddr() {
-    <#if requestParameters.singleUsePayment?default("N") == "Y">
+    <#if "Y" == requestParameters.singleUsePayment?default("N")>
       <#assign singleUse = "&amp;singleUsePayment=Y">
     <#else>
       <#assign singleUse = "">
@@ -40,7 +40,7 @@ function shipBillAddr() {
     </div>
     <div class="screenlet-body">
           <#-- after initial screen; show detailed screens for selected type -->
-          <#if paymentMethodTypeId! == "CREDIT_CARD">
+          <#if "CREDIT_CARD" == paymentMethodTypeId!>
             <#if creditCard?has_content && postalAddress?has_content && !requestParameters.useShipAddr??>
               <form method="post" action="<@ofbizUrl>changeCreditCardAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
                 <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/>
@@ -50,7 +50,7 @@ function shipBillAddr() {
             <#else>
               <form method="post" action="<@ofbizUrl>enterCreditCardAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
             </#if>
-          <#elseif paymentMethodTypeId! == "EFT_ACCOUNT">
+          <#elseif "EFT_ACCOUNT" == paymentMethodTypeId!>
             <#if eftAccount?has_content && postalAddress?has_content>
               <form method="post" action="<@ofbizUrl>changeEftAccountAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
                 <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/>
@@ -60,15 +60,15 @@ function shipBillAddr() {
             <#else>
               <form method="post" action="<@ofbizUrl>enterEftAccountAndBillingAddress</@ofbizUrl>" name="${parameters.formNameValue}">
             </#if>
-          <#elseif paymentMethodTypeId! == "GIFT_CARD"> <#--Don't know much how this is handled -->
+          <#elseif "GIFT_CARD" == paymentMethodTypeId!> <#--Don't know much how this is handled -->
             <form method="post" action="<@ofbizUrl>enterGiftCard</@ofbizUrl>" name="${parameters.formNameValue}">
-          <#elseif paymentMethodTypeId! == "EXT_OFFLINE">
+          <#elseif "EXT_OFFLINE" == paymentMethodTypeId!>
             <form method="post" action="<@ofbizUrl>processPaymentSettings</@ofbizUrl>" name="${parameters.formNameValue}">
           <#else>
             <div>${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId!}</div>
           </#if>
 
-          <#if requestParameters.singleUsePayment?default("N") == "Y">
+          <#if "Y" == requestParameters.singleUsePayment?default("N")>
             <input type="hidden" name="singleUsePayment" value="Y"/>
             <input type="hidden" name="appendPayment" value="Y"/>
           </#if>
@@ -95,7 +95,7 @@ function shipBillAddr() {
               </tr>
             </#if>
 
-            <#if (paymentMethodTypeId! == "CREDIT_CARD" || paymentMethodTypeId! == "EFT_ACCOUNT")>
+            <#if ("CREDIT_CARD" == paymentMethodTypeId! || "EFT_ACCOUNT" == paymentMethodTypeId!)>
               <tr>
                 <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div></td>
                 <td width="5">&nbsp;</td>
@@ -105,7 +105,7 @@ function shipBillAddr() {
             </#if>
 
             <#-- credit card fields -->
-            <#if paymentMethodTypeId! == "CREDIT_CARD">
+            <#if "CREDIT_CARD" == paymentMethodTypeId!>
               <#if !creditCard?has_content>
                 <#assign creditCard = requestParameters>
               </#if>
@@ -191,7 +191,7 @@ function shipBillAddr() {
             </#if>
 
             <#-- gift card fields -->
-            <#if requestParameters.addGiftCard?default("") == "Y" || paymentMethodTypeId! == "GIFT_CARD">
+            <#if "Y" == requestParameters.addGiftCard?default("") || "GIFT_CARD" == paymentMethodTypeId!>
               <input type="hidden" name="addGiftCard" value="Y"/>
               <#assign giftCard = giftCard!>
               <#if paymentMethodTypeId! != "GIFT_CARD">