[ofbiz-framework] branch release17.12 updated: Fixed: Add button for 'Gift Message is shown on completed order (OFBIZ-11160)

[pawan]

This is an automated email from the ASF dual-hosted git repository.

pawan pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release17.12 by this push:
     new 2e87ed1  Fixed: Add button for 'Gift Message is shown on completed 
order (OFBIZ-11160)
2e87ed1 is described below

commit 2e87ed1065e54242496a0d34c733036260753ad7
Author: Pawan Verma <pawan.ve...@hotwaxsystems.com>
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 a7d0f50..7ba8f00 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -691,6 +691,7 @@ under the License.
             </td>
             <td width="5">&nbsp;</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}"/>
@@ -703,6 +704,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>