This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new d322a77 Fixed: Add button for 'Gift Message is shown on completed
order (OFBIZ-11160)
d322a77 is described below
commit d322a77b6706a53339beef5ef6c75518dc028393
Author: Pawan Verma <[email protected]>
AuthorDate: Thu Dec 12 16:07:56 2019 +0530
Fixed: Add button for 'Gift Message is shown on completed order
(OFBIZ-11160)
Thanks: Pierre Smits for report and Shivanand Chhatre for the fix.
---
applications/order/template/order/OrderShippingInfo.ftl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/applications/order/template/order/OrderShippingInfo.ftl
b/applications/order/template/order/OrderShippingInfo.ftl
index cfb44d4..0138d2a 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -693,6 +693,7 @@ under the License.
<span class="label"> ${uiLabelMap.OrderGiftMessage}</span>
</td>
<td>
+ <#if "ORDER_COMPLETED" != orderHeader.statusId!>
<form id="setGiftMessageForm_${shipGroup.shipGroupSeqId}"
name="setGiftMessageForm" method="post"
action="<@ofbizUrl>setGiftMessage</@ofbizUrl>">
<input type="hidden" name="orderId"
value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId"
value="${shipGroup.shipGroupSeqId}"/>
@@ -705,6 +706,7 @@ under the License.
<textarea name="giftMessage"
id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0"
cols="0">${shipGroup.giftMessage!}</textarea>
<a
href="javascript:saveGiftMessage('${shipGroup.shipGroupSeqId}');"
class="buttontext" id="saveGiftMessage_${shipGroup.shipGroupSeqId}"
style="display:none">${uiLabelMap.CommonSave}</a>
</form>
+ </#if>
</td>
</tr>
</#if>
