Bugzilla – Attachment 185102 Details for
Bug 32938
Acquisitions EDI - ORDRSP messages are loaded as invoices
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32938: Add ORDRSP message display to basket page
Bug-32938-Add-ORDRSP-message-display-to-basket-pag.patch (text/plain), 9.21 KB, created by
Martin Renvoize (ashimema)
on 2025-08-04 14:20:44 UTC
(
hide
)
Description:
Bug 32938: Add ORDRSP message display to basket page
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2025-08-04 14:20:44 UTC
Size:
9.21 KB
patch
obsolete
>From 60a9c96c229dc5dd1114bf000af1b8848359f579 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@openfifth.co.uk> >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 %] >- <!-- Both quote and order messages exist --> >+ [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %] >+ [% IF total_messages > 1 %] >+ <!-- Multiple messages exist - show dropdown --> > <div class="btn-group"> > <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button> > <ul class="dropdown-menu"> >@@ -153,6 +157,13 @@ > </a> > </li> > [% END %] >+ [% FOR message IN ordrsp_messages %] >+ <li> >+ <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]"> >+ <i class="fa fa-reply"></i> View order response ([% message.transfer_date | $KohaDates %]) >+ </a> >+ </li> >+ [% END %] > </ul> > </div> > [% ELSIF quote_messages.size > 0 %] >@@ -169,6 +180,13 @@ > <i class="fa fa-shopping-cart"></i> View EDIFACT order > </button> > </div> >+ [% ELSIF ordrsp_messages.size > 0 %] >+ <!-- Only order response messages exist --> >+ <div class="btn-group"> >+ <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% ordrsp_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]"> >+ <i class="fa fa-reply"></i> View EDIFACT order response >+ </button> >+ </div> > [% 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 %] >- <!-- Both quote and order interchanges exist --> >+ [% SET total_messages = quote_messages.size + order_messages.size + ordrsp_messages.size %] >+ [% IF total_messages > 1 %] >+ <!-- Multiple messages exist - show dropdown --> > <div class="btn-group"> > <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i class="fa fa-file-text"></i> View EDIFACT interchanges </button> > <ul class="dropdown-menu"> >@@ -339,10 +361,17 @@ > </a> > </li> > [% END %] >+ [% FOR message IN ordrsp_messages %] >+ <li> >+ <a class="dropdown-item view_edifact_message" href="#" data-message-id="[% message.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]"> >+ <i class="fa fa-reply"></i> View order response ([% message.transfer_date | $KohaDates %]) >+ </a> >+ </li> >+ [% END %] > </ul> > </div> > [% ELSIF quote_messages.size > 0 %] >- <!-- Only quote interchanges exist --> >+ <!-- Only quote messages exist --> > <div class="btn-group"> > <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% quote_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]"> > <i class="fa fa-quote-left"></i> View EDIFACT quote >@@ -355,6 +384,13 @@ > <i class="fa fa-shopping-cart"></i> View EDIFACT order > </button> > </div> >+ [% ELSIF ordrsp_messages.size > 0 %] >+ <!-- Only order response messages exist --> >+ <div class="btn-group"> >+ <button type="button" class="btn btn-default view_edifact_message" data-message-id="[% ordrsp_messages.0.id | html %]" data-basketno="[% basketno | html %]" data-basketname="[% basketname | html %]"> >+ <i class="fa fa-reply"></i> View EDIFACT order response >+ </button> >+ </div> > [% END %] > [% END %] > [% END %] >-- >2.50.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32938
:
146468
|
185101
| 185102