svn commit: r1801280 [2/2] - in /ofbiz/ofbiz-framework/trunk/applications/product/template: category/ config/ facility/ feature/ find/ imagemanagement/ inventory/ price/ product/ promo/ returns/ shipment/ store/ thesaurus/

[Arun Patidar-4]

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl Sat Jul  8 11:33:19 2017
@@ -80,7 +80,7 @@ under the License.
                     /
                     <input type="text" name="shipGroupSeqId" size="6" maxlength="6" value="${shipGroupSeqId?default("00001")}"/>
                   </td>
-                  <td><label><span class="label">${uiLabelMap.ProductHideGrid}</span>&nbsp;<input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></label></td>
+                  <td><label><span class="label">${uiLabelMap.ProductHideGrid}</span>&nbsp;<input type="checkbox" name="hideGrid" value="Y" <#if ("Y" == hideGrid)>checked=""</#if> /></label></td>
                   <td>&nbsp;</td>
                 </tr>
                 <tr>
@@ -105,7 +105,7 @@ under the License.
                   <td width="25%">
                     <input type="text" name="picklistBinId" size="29" maxlength="60" value="${picklistBinId!}"/>
                   </td>
-                  <td><label><span class="label">${uiLabelMap.ProductHideGrid}</span>&nbsp;<input type="checkbox" name="hideGrid" value="Y" <#if (hideGrid == "Y")>checked=""</#if> /></label></td>
+                  <td><label><span class="label">${uiLabelMap.ProductHideGrid}</span>&nbsp;<input type="checkbox" name="hideGrid" value="Y" <#if ("Y" == hideGrid)>checked=""</#if> /></label></td>
                   <td>&nbsp;</td>
                 </tr>
                 <tr>
@@ -182,14 +182,14 @@ under the License.
                     <td valign="top">
                       <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span>
                       <br />
-                      <#if carrier == "USPS">
+                      <#if "USPS" == carrier>
                         <#assign color = "red">
-                      <#elseif carrier == "UPS">
+                      <#elseif "UPS" == carrier>
                         <#assign color = "green">
                       <#else>
                         <#assign color = "black">
                       </#if>
-                      <#if carrier != "_NA_">
+                      <#if "_NA_" != carrier>
                         <font color="${color}">${carrier}</font>
                         &nbsp;
                       </#if>
@@ -407,7 +407,7 @@ under the License.
                       <td align="right">
                         <div>
                           <#assign buttonName = "${uiLabelMap.ProductComplete}">
-                          <#if forceComplete?default("false") == "true">
+                          <#if "true" == forceComplete?default("false")>
                             <#assign buttonName = "${uiLabelMap.ProductCompleteForce}">
                           </#if>
                           <input type="button" value="${buttonName}" onclick="javascript:document.completePackForm.submit();"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/QuickShipOrder.ftl Sat Jul  8 11:33:19 2017
@@ -157,7 +157,7 @@ under the License.
       ${pages.get("/shipment/ViewShipmentInfo.ftl")}
       <br />${pages.get("/shipment/ViewShipmentItemInfo.ftl")}
       <br />${pages.get("/shipment/ViewShipmentPackageInfo.ftl")}
-      <#if allDone?default("no") == "yes">
+      <#if "yes" == allDone?default("no")>
         <br />${pages.get("/shipment/ViewShipmentRouteInfo.ftl")}
       </#if>
     </#if>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl Sat Jul  8 11:33:19 2017
@@ -140,14 +140,14 @@ under the License.
               <td valign="top">
                 <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span>
                 <br />
-                <#if carrier == "USPS">
+                <#if "USPS" == carrier>
                   <#assign color = "red">
-                <#elseif carrier == "UPS">
+                <#elseif "UPS" == carrier>
                   <#assign color = "green">
                 <#else>
                   <#assign color = "black">
                 </#if>
-                <#if carrier != "_NA_">
+                <#if "_NA_" != carrier>
                   <font color="${color}">${carrier}</font>
                   &nbsp;
                 </#if>
@@ -302,7 +302,7 @@ under the License.
             </tr>
             <tr>
               <td colspan="12" align="right">
-                <#if isShowVerifyItemButton == "true">
+                <#if "true" == isShowVerifyItemButton>
                   <input type="submit" value="${uiLabelMap.ProductVerify}&nbsp;${uiLabelMap.OrderItems}"/>
                 </#if>
                 &nbsp;

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl Sat Jul  8 11:33:19 2017
@@ -145,7 +145,7 @@ under the License.
                           <#if shipmentBoxTypes?has_content>
                             <#assign shipmentBoxTypeId = "${(packedLine.getShipmentBoxTypeId())!}"/>
                             <#list shipmentBoxTypes as shipmentBoxType>
-                              <#if shipmentBoxTypeId == "${shipmentBoxType.shipmentBoxTypeId}">
+                              <#if "${shipmentBoxType.shipmentBoxTypeId}" == shipmentBoxTypeId>
                                 <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description}</option>
                               </#if>
                             </#list>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/store/EditProductStoreWebSites.ftl Sat Jul  8 11:33:19 2017
@@ -32,7 +32,7 @@ under the License.
             <#if storeWebSites?has_content>
               <#assign rowClass = "2">
               <#list storeWebSites as webSite>
-                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
                   <td><a href="/content/control/EditWebSite?webSiteId=${webSite.webSiteId}&amp;externalLoginKey=${requestAttributes.externalLoginKey}" class="buttontext">${webSite.siteName!} [${webSite.webSiteId}]</a></td>
                   <td>${webSite.httpHost?default('&nbsp;')}</td>
                   <td>${webSite.httpPort?default('&nbsp;')}</td>
@@ -46,7 +46,7 @@ under the License.
                   </td>
                 </tr>
                 <#-- toggle the row color -->
-                <#if rowClass == "2">
+                <#if "2" == rowClass>
                     <#assign rowClass = "1">
                 <#else>
                     <#assign rowClass = "2">

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/thesaurus/EditKeywordThesaurus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/thesaurus/EditKeywordThesaurus.ftl?rev=1801280&r1=1801279&r2=1801280&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/thesaurus/EditKeywordThesaurus.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/thesaurus/EditKeywordThesaurus.ftl Sat Jul  8 11:33:19 2017
@@ -52,7 +52,7 @@ under the License.
                   </td>
                 </tr>
                 </#if>
-                <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+                <tr valign="middle"<#if "1" == rowClass> class="alternate-row"</#if>>
                   <td>
                     <form method="post" action="<@ofbizUrl>createKeywordThesaurus</@ofbizUrl>">
                       <div>
@@ -82,7 +82,7 @@ under the License.
                 ${keyword.alternateKeyword}&nbsp;(${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId!)})
               </div>
               <#-- toggle the row color -->
-              <#if rowClass == "2">
+              <#if "2" == rowClass>
                   <#assign rowClass = "1">
               <#else>
                   <#assign rowClass = "2">