You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2017/07/08 16:14:21 UTC
svn commit: r1801301 -
/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
Author: arunpatidar
Date: Sat Jul 8 16:14:21 2017
New Revision: 1801301
URL: http://svn.apache.org/viewvc?rev=1801301&view=rev
Log:
Fixed: Issue due to my previous commit of consistent pattern in comparision.(OFBIZ-9254)
Thanks Swapnil Mane for reporting.
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl?rev=1801301&r1=1801300&r2=1801301&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl Sat Jul 8 16:14:21 2017
@@ -155,7 +155,7 @@ under the License.
</table>
</td>
<td width="10%">
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<div>
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
@@ -224,7 +224,7 @@ under the License.
</#if>
</td>
<td width="10%">
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<div>
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
@@ -280,7 +280,7 @@ under the License.
</td>
</#if>
<td width="10%">
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<div>
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
@@ -380,7 +380,7 @@ under the License.
</#if>
</td>
<td width="10%">
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
<form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@o...@ofbizUrl>">
@@ -420,7 +420,7 @@ under the License.
</div>
</td>
<td width="10%">
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
<form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@o...@ofbizUrl>">
@@ -479,7 +479,7 @@ under the License.
</div>
</td>
<td width="10%">
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId)>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
<a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
<form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@o...@ofbizUrl>">
@@ -575,7 +575,7 @@ under the License.
<td colspan="4" align="center">${uiLabelMap.OrderNoOrderPaymentPreferences}</td>
</tr>
</#if>
- <#if (!"ORDER_COMPLETED" == orderHeader.statusId) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId) && (paymentMethodValueMaps?has_content)>
+ <#if (!("ORDER_COMPLETED" == orderHeader.statusId)) && !("ORDER_REJECTED" == orderHeader.statusId) && !("ORDER_CANCELLED" == orderHeader.statusId) && (paymentMethodValueMaps?has_content)>
<tr><td colspan="4"><hr /></td></tr>
<tr><td colspan="4">
<form name="addPaymentMethodToOrder" method="post" action="<@o...@ofbizUrl>">