(ofbiz-framework) branch trunk updated: Improved: Inform user about no agreements when creating an order (OFBIZ-13116)

[jleroux]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 3b15ef6d18 Improved: Inform user about no agreements when creating an 
order (OFBIZ-13116)
3b15ef6d18 is described below

commit 3b15ef6d18f7c121245ccd5958e5f4f3ce0a2ae1
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jun 11 20:34:05 2024 +0200

    Improved: Inform user about no agreements when creating an order 
(OFBIZ-13116)
    
    On 2nd create order screen, despite the title
    <<Enter Order Currency, Agreements, and Ship Dates>>
    currently when no agreement exist this information is not shown.
    That's a pre Apache situation. It can be useful to be known and it's an easy
    and safe change: only static information so no possible regression.
    
    This was respectively reminded to us by these messages on dev and user MLs
    https://lists.apache.org/thread/9cz2q5kcovnqm86lfj2nloozvzswgmpm
    https://lists.apache.org/thread/5ll9o8onhzlll4h9vxngnz31ytjrl67f
    
    Thanks: Bill Harder for report
---
 applications/order/template/entry/OrderAgreements.ftl | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/applications/order/template/entry/OrderAgreements.ftl 
b/applications/order/template/entry/OrderAgreements.ftl
index 62135645cf..a2852065ca 100644
--- a/applications/order/template/entry/OrderAgreements.ftl
+++ b/applications/order/template/entry/OrderAgreements.ftl
@@ -57,7 +57,20 @@ under the License.
         </td>
       </tr>
       <#else>
-      <tr><td colspan="4">&nbsp;<input type='hidden' name='hasAgreements' 
value='N'/></td></tr>
+      <tr>
+       <td colspan="4">&nbsp;
+         <input type='hidden' name='hasAgreements' value='N'/></td>
+       </tr>
+       <tr>
+         <td class="label">
+           <label>${uiLabelMap.OrderSelectAgreement}</label>
+        </td>
+        <td valign='middle'>
+        <div class='tabletext' valign='top'>
+               ${uiLabelMap.CommonNone} ${uiLabelMap.CommonAvailable}
+        </div>
+      </td>
+      </tr>
       </#if>
       <#if agreementRoles??>
         <tr>