From 60a9c96c229dc5dd1114bf000af1b8848359f579 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 4 Aug 2025 15:12:27 +0100 Subject: [PATCH] Bug 32938: Add ORDRSP message display to basket page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch extends the EDIFACT message display functionality on the basket page to include ORDRSP (Order Response) messages alongside existing QUOTE and ORDERS messages. Features added: - ORDRSP message collection and filtering - Smart button display logic: * Single button for one message type * Dropdown for multiple message types (now includes ORDRSP) - ORDRSP-specific UI elements: * Reply icon (fa-reply) indicating response nature * "View order response" labeling * Integration with existing modal and highlighting system The ORDRSP messages correctly link to baskets since they are vendor responses to the original order, following the standard EDI workflow: ORDERS → ORDRSP → INVOICE --- .../prog/en/modules/acqui/basket.tt | 46 +++++++++++++++++-- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index c9c86136a03..2e3c8ac75c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -126,16 +126,20 @@ [% IF edifact_enabled && edifact_messages.size > 0 %] [% SET quote_messages = [] %] [% SET order_messages = [] %] + [% SET ordrsp_messages = [] %] [% FOR message IN edifact_messages %] [% IF message.message_type == 'QUOTE' %] [% quote_messages.push(message) %] [% ELSIF message.message_type == 'ORDERS' %] [% order_messages.push(message) %] + [% ELSIF message.message_type == 'ORDRSP' %] + [% ordrsp_messages.push(message) %] [% END %] [% END %] - [% IF quote_messages.size > 0 && order_messages.size > 0 %] - + [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %] + [% IF total_messages > 1 %] +
[% ELSIF quote_messages.size > 0 %] @@ -169,6 +180,13 @@ View EDIFACT order + [% ELSIF ordrsp_messages.size > 0 %] + +
+ +
[% END %] [% END %] @@ -312,16 +330,20 @@ [% IF edifact_enabled && edifact_messages.size > 0 %] [% SET quote_messages = [] %] [% SET order_messages = [] %] + [% SET ordrsp_messages = [] %] [% FOR message IN edifact_messages %] [% IF message.message_type == 'QUOTE' %] [% quote_messages.push(message) %] [% ELSIF message.message_type == 'ORDERS' %] [% order_messages.push(message) %] + [% ELSIF message.message_type == 'ORDRSP' %] + [% ordrsp_messages.push(message) %] [% END %] [% END %] - [% IF quote_messages.size > 0 && order_messages.size > 0 %] - + [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %] + [% IF total_messages > 1 %] +
[% ELSIF quote_messages.size > 0 %] - +
+ [% ELSIF ordrsp_messages.size > 0 %] + +
+ +
[% END %] [% END %] [% END %] -- 2.50.1