svn commit: r1801284 [2/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 [2/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
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/PaymentOptions.ftl Sat Jul  8 12:54:32 2017
@@ -24,31 +24,31 @@ under the License.
      <fieldset>
        <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
          <div>
-           <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?? && addGiftCard == "Y">checked="checked"</#if> />
+           <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?? && "Y" == addGiftCard>checked="checked"</#if> />
            <label for="addGiftCard">${uiLabelMap.AccountingCheckGiftCard}</label>
          </div>
        </#if>
        <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
          <div>
-           <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?? && paymentMethodTypeId == "EXT_OFFLINE">checked="checked"</#if> />
+           <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?? && "EXT_OFFLINE" == paymentMethodTypeId>checked="checked"</#if> />
            <label for="paymentMethodTypeId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
          </div>
        </#if>
        <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
          <div>
-           <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?? && paymentMethodTypeId == "CREDIT_CARD">checked="checked"</#if> />
+           <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?? && "CREDIT_CARD" == paymentMethodTypeId>checked="checked"</#if> />
            <label for="paymentMethodTypeId_CREDIT_CARD">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</label>
          </div>
        </#if>
        <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
          <div>
-           <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?? && paymentMethodTypeId == "EFT_ACCOUNT">checked="checked"</#if> />
+           <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?? && "EFT_ACCOUNT" == paymentMethodTypeId>checked="checked"</#if> />
            <label for="paymentMethodTypeId_EFT_ACCOUNT">${uiLabelMap.AccountingAHCElectronicCheck}</label>
          </div>
        </#if>
        <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
          <div>
-           <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?? && paymentMethodTypeId == "EXT_PAYPAL">checked="checked"</#if> />
+           <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?? && "EXT_PAYPAL" == paymentMethodTypeId>checked="checked"</#if> />
            <label for="paymentMethodTypeId_EXT_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
          </div>
        </#if>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOptionSettings.ftl Sat Jul  8 12:54:32 2017
@@ -123,8 +123,8 @@ function onClickShippingMethod(e) {
               <td colspan="2">
                 <div>
                   <h2>${uiLabelMap.OrderIsThisGift}</h2>
-                  <input type='radio' <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name='is_gift' value='true'/><span class='tabletext'>${uiLabelMap.CommonYes}</span>
-                  <input type='radio' <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name='is_gift' value='false'/><span class='tabletext'>${uiLabelMap.CommonNo}</span>
+                  <input type='radio' <#if "Y" == shoppingCart.getIsGift()?default("Y")>checked="checked"</#if> name='is_gift' value='true'/><span class='tabletext'>${uiLabelMap.CommonYes}</span>
+                  <input type='radio' <#if "N" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name='is_gift' value='false'/><span class='tabletext'>${uiLabelMap.CommonNo}</span>
                 </div>
               </td>
             </tr>
@@ -148,7 +148,7 @@ function onClickShippingMethod(e) {
     <tr>
         <td valign="top" colspan="2">
             <div>
-                <input type='radio' <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name='may_split' value='false'/>
+                <input type='radio' <#if "N" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name='may_split' value='false'/>
                 <span>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</span>
             </div>
         </td>
@@ -156,7 +156,7 @@ function onClickShippingMethod(e) {
     <tr>
         <td valign="top"  colspan="2">
             <div>
-                <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type='radio' name='may_split' value='true'/>
+                <input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type='radio' name='may_split' value='true'/>
                 <span>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</span>
             </div>
         </td>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOrderHeader.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOrderHeader.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonOrderHeader.ftl Sat Jul  8 12:54:32 2017
@@ -29,7 +29,7 @@ under the License.
     <div class="screenlet">
         <div class="screenlet-title-bar">
             <div class="boxlink">
-                <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)! == "ORDER_COMPLETED">
+                <#if "Y" == maySelectItems?default("N") && "Y" == returnLink?default("N") && "ORDER_COMPLETED" == (orderHeader.statusId)!>
                     <a href="<@ofbizUrl>makeReturn?orderId=${orderHeader.orderId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
                 </#if>
             </div>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonPaymentInformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonPaymentInformation.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonPaymentInformation.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAnonPaymentInformation.ftl Sat Jul  8 12:54:32 2017
@@ -31,7 +31,7 @@ function init() {
 function aroundSubmitOrder(invocation) {
     var formToSubmit = document.setPaymentInformation;
     var paymentMethodTypeOption = document.setPaymentInformation.paymentMethodTypeOptionList.options[document.setPaymentInformation.paymentMethodTypeOptionList.selectedIndex].value;
-    if(paymentMethodTypeOption == "none"){
+    if("none" == paymentMethodTypeOption){
         document.setPaymentInformation.action = "<@ofbizUrl>quickAnonAddGiftCardToCart</@ofbizUrl>";
     }
 
@@ -41,7 +41,7 @@ function aroundSubmitOrder(invocation) {
         data: jQuery("#setPaymentInformation").serialize(),
         success: function(data) {
             if (paymentMethodTypeOption != "EXT_OFFLINE"){
-                   if(paymentMethodTypeOption == "none"){
+                   if("none" == paymentMethodTypeOption){
                        document.getElementById("noPaymentMethodSelectedError").innerHTML = "${uiLabelMap.EcommerceMessagePleaseSelectPaymentMethod}";
                    } else {
                        document.getElementById("paymentInfoSection").innerHTML = data;
@@ -72,7 +72,7 @@ function getPaymentInformation() {
   var paymentMethodTypeOption = document.setPaymentInformation.paymentMethodTypeOptionList.options[document.setPaymentInformation.paymentMethodTypeOptionList.selectedIndex].value;
   var connectionObject;
    if (paymentMethodTypeOption.length > 0){
-      if(paymentMethodTypeOption == "CREDIT_CARD"){
+      if("CREDIT_CARD" == paymentMethodTypeOption){
 
         jQuery.ajax({
             url: "<@ofbizUrl>quickAnonCcInfo</@ofbizUrl>",
@@ -84,7 +84,7 @@ function getPaymentInformation() {
 
         document.setPaymentInformation.paymentMethodTypeId.value = "CREDIT_CARD";
         document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterCreditCard</@ofbizUrl>";
-      } else if (paymentMethodTypeOption == "EFT_ACCOUNT"){
+      } else if ("EFT_ACCOUNT" == paymentMethodTypeOption){
 
        jQuery.ajax({
             url: "<@ofbizUrl>quickAnonEftInfo</@ofbizUrl>",
@@ -96,7 +96,7 @@ function getPaymentInformation() {
 
         document.setPaymentInformation.paymentMethodTypeId.value = "EFT_ACCOUNT";
         document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterEftAccount</@ofbizUrl>";
-      } else if (paymentMethodTypeOption == "EXT_OFFLINE"){
+      } else if ("EXT_OFFLINE" == paymentMethodTypeOption){
         document.setPaymentInformation.paymentMethodTypeId.value = "EXT_OFFLINE";
         document.getElementById("paymentInfoSection").innerHTML = "";
         document.setPaymentInformation.action = "<@ofbizUrl>quickAnonEnterExtOffline</@ofbizUrl>";
@@ -113,7 +113,7 @@ function getPaymentInformation() {
         <div class='h3'>${uiLabelMap.AccountingPaymentInformation}</div>
     </div>
     <div class="screenlet-body">
-          <#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>
@@ -133,13 +133,13 @@ function getPaymentInformation() {
                    <select name="paymentMethodTypeOptionList" class="selectBox"  onchange="javascript:getPaymentInformation();">
                        <option value="none">Select One</option>
                      <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
-                       <option value="CREDIT_CARD" <#if (parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")> selected="selected"</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option>
+                       <option value="CREDIT_CARD" <#if ("CREDIT_CARD" == parameters.paymentMethodTypeId?default(""))> selected="selected"</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option>
                      </#if>
                      <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
-                       <option value="EFT_ACCOUNT" <#if (parameters.paymentMethodTypeId?default("") == "EFT_ACCOUNT")> selected="selected"</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option>
+                       <option value="EFT_ACCOUNT" <#if ("EFT_ACCOUNT" == parameters.paymentMethodTypeId?default(""))> selected="selected"</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option>
                      </#if>
                      <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
-                       <option value="EXT_OFFLINE" <#if (parameters.paymentMethodTypeId?default("") == "EXT_OFFLINE")> selected="selected"</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option>
+                       <option value="EXT_OFFLINE" <#if ("EXT_OFFLINE" == parameters.paymentMethodTypeId?default(""))> selected="selected"</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option>
                      </#if>
                    </select>
                  </td>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/SplitShip.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/SplitShip.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/SplitShip.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/SplitShip.ftl Sat Jul  8 12:54:32 2017
@@ -20,23 +20,23 @@ under the License.
 <script language="javascript" type="text/javascript">
 //<![CDATA[
 function submitForm(form, mode, value) {
-    if (mode == "DN") {
+    if ("DN" == mode) {
         // done action; payment info
         form.action="<@ofbizUrl>updateShippingOptions/checkoutpayment</@ofbizUrl>";
         form.submit();
-    } else if (mode == "CS") {
+    } else if ("CS" == mode) {
         // continue shopping
         form.action="<@ofbizUrl>updateShippingOptions/showcart</@ofbizUrl>";
         form.submit();
-    } else if (mode == "NA") {
+    } else if ("NA" == mode) {
         // new address
         form.action="<@ofbizUrl>updateShippingOptions/editcontactmech?DONE_PAGE=splitship&preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SV") {
+    } else if ("SV" == mode) {
         // save option; return to current screen
         form.action="<@ofbizUrl>updateShippingOptions/splitship</@ofbizUrl>";
         form.submit();
-    } else if (mode == "SA") {
+    } else if ("SA" == mode) {
         // selected shipping address
         form.action="<@ofbizUrl>updateShippingAddress/splitship</@ofbizUrl>";
         form.submit();
@@ -118,16 +118,16 @@ function submitForm(form, mode, value) {
                       <select name="maySplit" class="selectBox">
                         <#assign maySplitStr = cart.getMaySplit(groupIdx)?default("")>
                         <option value="">${uiLabelMap.OrderSplittingPreference}</option>
-                        <option value="false" <#if maySplitStr == "N">selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
-                        <option value="true" <#if maySplitStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
+                        <option value="false" <#if "N" == maySplitStr>selected="selected"</#if>>${uiLabelMap.OrderShipAllItemsTogether}</option>
+                        <option value="true" <#if "Y" == maySplitStr>selected="selected"</#if>>${uiLabelMap.OrderShipItemsWhenAvailable}</option>
                       </select>
                     </div>
                     <div>
                       <select name="isGift" class="selectBox">
                         <#assign isGiftStr = cart.getIsGift(groupIdx)?default("")>
                         <option value="">${uiLabelMap.OrderIsGift} ?</option>
-                        <option value="false" <#if isGiftStr == "N">selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
-                        <option value="true" <#if isGiftStr == "Y">selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
+                        <option value="false" <#if "N" == isGiftStr>selected="selected"</#if>>${uiLabelMap.OrderNotAGift}</option>
+                        <option value="true" <#if "Y" == isGiftStr>selected="selected"</#if>>${uiLabelMap.OrderYesIsAGift}</option>
                       </select>
                     </div>
 

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/CreateOrderQuote.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/CreateOrderQuote.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/CreateOrderQuote.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/quote/CreateOrderQuote.ftl Sat Jul  8 12:54:32 2017
@@ -19,7 +19,7 @@ under the License.
 
 <div>
     <#if quote??>
-        <#if quote.statusId == "QUO_APPROVED">
+        <#if "QUO_APPROVED" == quote.statusId>
             <a href="<@ofbizUrl>loadCartFromQuote?quoteId=${quote.quoteId}&amp;finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateOrder}</a>
         <#else>
             <span class="buttontextdisabled">${uiLabelMap.OrderCreateOrder}</span>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/shoppinglist/EditShoppingList.ftl Sat Jul  8 12:54:32 2017
@@ -166,8 +166,8 @@ under the License.
             <div>
               <label for="isPublic">${uiLabelMap.EcommercePublic}?</label>
               <select name="isPublic" id="isPublic">
-                <#if (((shoppingList.isPublic)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                <#if (((shoppingList.isPublic)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                <#if ("Y" == ((shoppingList.isPublic)!""))><option value="Y">${uiLabelMap.CommonY}</option></#if>
+                <#if ("N" == ((shoppingList.isPublic)!""))><option value="N">${uiLabelMap.CommonN}</option></#if>
                 <option></option>
                 <option value="Y">${uiLabelMap.CommonY}</option>
                 <option value="N">${uiLabelMap.CommonN}</option>
@@ -176,8 +176,8 @@ under the License.
             <div>
               <label for="isActive">${uiLabelMap.EcommerceActive}?</label>
               <select name="isActive" id="isActive">
-                <#if (((shoppingList.isActive)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if>
-                <#if (((shoppingList.isActive)!"") == "N")><option value="N">${uiLabelMap.CommonN}</option></#if>
+                <#if ("Y" == ((shoppingList.isActive)!""))><option value="Y">${uiLabelMap.CommonY}</option></#if>
+                <#if ("N" == ((shoppingList.isActive)!""))><option value="N">${uiLabelMap.CommonN}</option></#if>
                 <option></option>
                 <option value="Y">${uiLabelMap.CommonY}</option>
                 <option value="N">${uiLabelMap.CommonN}</option>
@@ -206,7 +206,7 @@ under the License.
     </div>
 </div>
 
-<#if shoppingListType?? && shoppingListType.shoppingListTypeId == "SLT_AUTO_REODR">
+<#if shoppingListType?? && "SLT_AUTO_REODR" == shoppingListType.shoppingListTypeId>
   <#assign nowTimestamp = Static["org.apache.ofbiz.base.util.UtilDateTime"].monthBegin()>
 <div class="screenlet">
     <div class="screenlet-title-bar">
@@ -215,7 +215,7 @@ under the License.
         </div>
         <h3>
             ${uiLabelMap.EcommerceShoppingListReorder} - ${shoppingList.listName}
-            <#if shoppingList.isActive?default("N") == "N">
+            <#if "N" == shoppingList.isActive?default("N")>
                 ${uiLabelMap.EcommerceOrderNotActive}
             </#if>
         </h3>
@@ -240,10 +240,10 @@ under the License.
                 </select>
                 <select name="frequency" class="selectBox">
                   <option value="">${uiLabelMap.EcommerceSelectFrequency}</option>
-                  <option value="4" <#if (recurrenceRule.frequency)?default("") == "DAILY">selected="selected"</#if>>${uiLabelMap.CommonDay}</option>
-                  <option value="5" <#if (recurrenceRule.frequency)?default("") == "WEEKLY">selected="selected"</#if>>${uiLabelMap.CommonWeek}</option>
-                  <option value="6" <#if (recurrenceRule.frequency)?default("") == "MONTHLY">selected="selected"</#if>>${uiLabelMap.CommonMonth}</option>
-                  <option value="7" <#if (recurrenceRule.frequency)?default("") == "YEARLY">selected="selected"</#if>>${uiLabelMap.CommonYear}</option>
+                  <option value="4" <#if ("DAILY">selected="selected"</#if>>${uiLabelMap.CommonDay}</option>
+                  <option value="5" <#if ("WEEKLY" == recurrenceRule.frequency)?default("")>selected="selected"</#if>>${uiLabelMap.CommonWeek}</option>
+                  <option value="6" <#if ("MONTHLY" == recurrenceRule.frequency)?default("")>selected="selected"</#if>>${uiLabelMap.CommonMonth}</option>
+                  <option value="7" <#if ("YEARLY" == recurrenceRule.frequency)?default("")>selected="selected"</#if>>${uiLabelMap.CommonYear}</option>
                 </select>
               </span>
               <span>
@@ -300,10 +300,10 @@ under the License.
                   <select name="paymentMethodId" class="selectBox">
                     <option value="">${uiLabelMap.OrderSelectPaymentMethod}</option>
                     <#list paymentMethodList as paymentMethod>
-                      <#if paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
+                      <#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
                         <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)>
                         <option value="${paymentMethod.paymentMethodId}" <#if (shoppingList.paymentMethodId)?default("") == paymentMethod.paymentMethodId>selected="selected"</#if>>CC:&nbsp;${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</option>
-                      <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">
+                      <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId>
                         <#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
                         <option value="${paymentMethod.paymentMethodId}">EFT:&nbsp;${eftAccount.bankName!}: ${eftAccount.accountNumber!}</option>
                       </#if>
@@ -317,7 +317,7 @@ under the License.
                 <a href="<@ofbizUrl>editcreditcard?DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceNewCreditCard}</a>
                 <a href="<@ofbizUrl>editeftaccount?DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceNewEFTAccount}</a>
               </div>
-              <#if shoppingList.isActive?default("N") == "Y">
+              <#if "Y" == shoppingList.isActive?default("N")>
                 <div>
                   <#assign nextTime = recInfo.next(lastSlOrderTime)?if_exists />
                   <#if nextTime?has_content>
@@ -443,7 +443,7 @@ under the License.
                           <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}" />
                           <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}" />
                           <input type="hidden" name="reservStart" />
-                          <#if product.productTypeId == "ASSET_USAGE">
+                          <#if "ASSET_USAGE" == product.productTypeId>
                            <table>
                              <tr>
                                <td>&nbsp;</td>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/GenericResult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/GenericResult.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/GenericResult.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/GenericResult.ftl Sat Jul  8 12:54:32 2017
@@ -27,7 +27,7 @@ under the License.
 
     <#-- special formatting for select boxes -->
     <#assign align = "left">
-    <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")>
+    <#if ("BOOLEAN" == surveyQuestionAndAppl.surveyQuestionTypeId || "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId)>
       <#assign align = "right">
     </#if>
 
@@ -44,9 +44,9 @@ under the License.
     <tr>
 
       <#-- seperator options -->
-      <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT">
+      <#if "SEPERATOR_TEXT" == surveyQuestionAndAppl.surveyQuestionTypeId>
         <td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td>
-      <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE">
+      <#elseif "SEPERATOR_LINE" == surveyQuestionAndAppl.surveyQuestionTypeId>
         <td colspan="5"><hr /></td>
       <#else>
 
@@ -64,7 +64,7 @@ under the License.
         <td width='1'>&nbsp;</td>
 
         <td align="${align}">
-          <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN">
+          <#if "BOOLEAN" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <#assign selectedOption = (answer.booleanResponse)?default("Y")>
             <div><span style="white-space: nowrap;">
               <#if "Y" == selectedOption><b>==>&nbsp;<font color="red"></#if>${uiLabelMap.CommonY}<#if "Y" == selectedOption></font></b></#if>&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]
@@ -72,36 +72,36 @@ under the License.
             <div><span style="white-space: nowrap;">
               <#if "N" == selectedOption><b>==>&nbsp;<font color="red"></#if>N<#if "N" == selectedOption></font></b></#if>&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]
             </span></div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA">
+          <#elseif "TEXTAREA" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT">
+          <#elseif "TEXT_SHORT" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG">
+          <#elseif "TEXT_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL">
+          <#elseif "EMAIL" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL">
+          <#elseif "URL" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE">
+          <#elseif "DATE" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD">
+          <#elseif "CREDIT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD">
+          <#elseif "GIFT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${(answer.textResponse)!}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY">
+          <#elseif "NUMBER_CURRENCY" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${answer.currencyResponse?number?default(0)}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT">
+          <#elseif "NUMBER_FLOAT" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${answer.floatResponse?number?default(0)?string("#")}</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG">
+          <#elseif "NUMBER_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>${answer.numericResponse?number?default(0)?string("#")}&nbsp;[${uiLabelMap.CommonTally}: ${results._tally?default(0)?string("#")} / ${uiLabelMap.CommonAverage}: ${results._average?default(0)?string("#")}]</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD">
+          <#elseif "PASSWORD" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <div>[${uiLabelMap.CommonNotShown}]</div>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT">
+          <#elseif "CONTENT" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <#if answer.contentId?has_content>
               <#assign content = answer.getRelatedOne("Content", false)>
               <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a>&nbsp;-&nbsp;${content.contentName!}
             </#if>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION">
+          <#elseif "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!>
             <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")>
             <#if options?has_content>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniResult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniResult.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniResult.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniResult.ftl Sat Jul  8 12:54:32 2017
@@ -47,7 +47,7 @@ under the License.
 
     <tr>
       <td>
-        <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN">
+        <#if "BOOLEAN" == surveyQuestionAndAppl.surveyQuestionTypeId>
           <#assign selectedOption = (answer.booleanResponse)?default("Y")>
           <div><span style="white-space: nowrap;">
             <#if "Y" == selectedOption><b>==>&nbsp;<font color="red"></#if>${uiLabelMap.CommonY}<#if "Y" == selectedOption></font></b></#if>&nbsp;[${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%]
@@ -56,7 +56,7 @@ under the License.
             <#if "N" == selectedOption><b>==>&nbsp;<font color="red"></#if>${uiLabelMap.CommonN}<#if "N" == selectedOption></font></b></#if>&nbsp;[${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]
           </span></div>
 
-        <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION">
+        <#elseif "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId>
           <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!>
           <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")>
           <#if options?has_content>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniSurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniSurvey.ftl?rev=1801284&r1=1801283&r2=1801284&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniSurvey.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/survey/MiniSurvey.ftl Sat Jul  8 12:54:32 2017
@@ -55,7 +55,7 @@ under the License.
 
       <tr>
         <td align="center">
-          <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN">
+          <#if "BOOLEAN" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <#assign selectedOption = (answer.booleanResponse)?default("Y")>
             <select class="selectBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}">
               <#if surveyQuestionAndAppl.requiredField?default("N") != "Y">
@@ -64,31 +64,31 @@ under the License.
               <option value="Y" <#if "Y" == selectedOption>selected="selected"</#if>>Y</option>
               <option value="N" <#if "N" == selectedOption>selected="selected"</#if>>N</option>
             </select>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA">
+          <#elseif "TEXTAREA" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <textarea class="textAreaBox" cols="40" rows="5" name="answers_${surveyQuestionAndAppl.surveyQuestionId}">${(answer.textResponse)!}</textarea>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT">
+          <#elseif "TEXT_SHORT" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="15" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG">
+          <#elseif "TEXT_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="35" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL">
+          <#elseif "EMAIL" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL">
+          <#elseif "URL" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="40" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE">
+          <#elseif "DATE" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="12" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD">
+          <#elseif "CREDIT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="20" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD">
+          <#elseif "GIFT_CARD" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="20" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY">
+          <#elseif "NUMBER_CURRENCY" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.currencyResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT">
+          <#elseif "NUMBER_FLOAT" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.floatResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG">
+          <#elseif "NUMBER_LONG" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="text" size="6" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.numericResponse?string("#"))!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD">
+          <#elseif "PASSWORD" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <input type="password" size="30" class="textBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}" value="${(answer.textResponse)!}"/>
-          <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION">
+          <#elseif "OPTION" == surveyQuestionAndAppl.surveyQuestionTypeId>
             <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!>
             <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")>
             <select class="selectBox" name="answers_${surveyQuestionAndAppl.surveyQuestionId}">
@@ -106,7 +106,7 @@ under the License.
           <#else>
             <div>Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div>
           </#if>
-          <#if surveyQuestionAndAppl.requiredField?default("N") == "Y">
+          <#if "Y" == surveyQuestionAndAppl.requiredField?default("N")>
             <span>*</span>
           <#else>
             <span>[optional]</span>