Author: deepak
Date: Mon Jul 10 12:29:06 2017
New Revision: 1801457
URL: http://svn.apache.org/viewvc?rev=1801457&view=rev
Log:
Fixed: order page shows widget exceptions (OFBIZ-9481)
Thanks Wai and Devanshu for your contribution.
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl?rev=1801457&r1=1801456&r2=1801457&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderContactInfo.ftl
Mon Jul 10 12:29:06 2017
@@ -18,7 +18,7 @@ under the License.
-->
<#macro updateOrderContactMech orderHeader contactMechTypeId contactMechList
contactMechPurposeTypeId contactMechAddress>
- <#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)>
<form name="updateOrderContactMech" method="post"
action="<@ofbizUrl>updateOrderContactMech</@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId!}" />
<input type="hidden" name="contactMechPurposeTypeId"
value="${contactMechPurpose.contactMechPurposeTypeId!}" />
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=1801457&r1=1801456&r2=1801457&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
Mon Jul 10 12:29:06 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="<@ofbizUrl>updateOrderPaymentPreference</@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="<@ofbizUrl>updateOrderPaymentPreference</@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="<@ofbizUrl>updateOrderPaymentPreference</@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="<@ofbizUrl>addPaymentMethodToOrder</@ofbizUrl>">
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1801457&r1=1801456&r2=1801457&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
Mon Jul 10 12:29:06 2017
@@ -652,7 +652,7 @@ under the License.
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <#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)>
<form
id="updateShippingInstructionsForm_${shipGroup.shipGroupSeqId}"
name="updateShippingInstructionsForm" method="post"
action="<@ofbizUrl>setShippingInstructions</@ofbizUrl>">
<input type="hidden" name="orderId"
value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId"
value="${shipGroup.shipGroupSeqId}"/>
