From 68b5309149690a579aff46418992aed05d8b7088 Mon Sep 17 00:00:00 2001
From: Baptiste Wojtkowski <bski@laposte.net>
Date: Mon, 5 Aug 2024 16:56:28 +0200
Subject: [PATCH] Bug 27339: Display opac notes and opac messages on check-in

Adds Opac note (borrowers.opacnote) and Opac messages (messages table) during check-in.

Test plan:
1- Add an Opac note and one or several Opac messages to a patron.
2- Checkout and check-in an item for this patron.
3- Check that Opac note and Opac message(s) are not displayed on check-in.
4- Apply the patch.
5- Checkout and check-in an item for this patron.
7- Check that Opac note and Opac message(s) are displayed on check-in in
two columns.
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 535d403..c01752b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -1260,6 +1260,7 @@
                                             <th class="ci-collection">Collection</th>
                                             <th class="ci-patron">Patron</th>
                                             <th class="ci-note">Note</th>
+                                            <th class="ci-opac-note">Opac Note</th>
                                         </tr>
                                     </thead>
 
@@ -1363,9 +1364,6 @@
                                                 [% IF ( riloo.patron.borrowernotes ) %]
                                                     <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | $raw | html_line_break %]</span></p>
                                                 [% END %]
-                                                [% IF ( riloo.patron.opacnote ) %]
-                                                    <p><span class="circ-hlt opac-note">[% riloo.patron.opacnote | html %]</span></p>
-                                                [% END %]
                                                 [% IF ( riloo.messages.count ) %]
                                                     [% FOREACH message IN riloo.messages %]
                                                         <p><span class="circ-hlt patron-opac-messages">[% message.message | html %]</span></p>
@@ -1378,6 +1376,11 @@
                                                     <p><span class="circ-hlt item-note-nonpublic">[% riloo.itemnotes_nonpublic | html %]</span></p>
                                                 [% END %]
                                             </td>
+                                            <td>
+                                                [% IF ( riloo.patron.opacnote ) %]
+                                                    <p><span class="circ-hlt opac-note">[% riloo.patron.opacnote | html %]</span></p>
+                                                [% END %]
+                                            </td>
                                         </tr>
                                     [% END # /FOREACH riloo %]
                                 </table> <!-- /#checkedintable -->
-- 
2.43.0