From 8902df15b38bd4007b367e29dd4bcd9090c16d75 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> Date: Wed, 12 Feb 2025 12:30:29 +0100 Subject: [PATCH] Bug 27339: (follow-up) 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. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> --- admin/columns_settings.yml | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 2a632acc..b2188dd8 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1837,6 +1837,8 @@ modules: columnname: borrower - columnname: itemnote + - + columnname: opacnote view_holdsqueue: holds-table: 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 70f52c22..b3c5b34a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1292,6 +1292,7 @@ <th class="ci-collection">Collection</th> <th class="ci-patron">Patron</th> <th class="ci-note">Note</th> + <th class="ci-opacnote">Opac Note</th> </tr> </thead> @@ -1397,9 +1398,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> @@ -1412,6 +1410,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> -- 2.30.2