From 0ace653d4676a007625098844007bb8c97be2b71 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Mon, 5 Aug 2024 16:56:28 +0200 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. --- 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 cf3beff5..6b3ca0f8 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1784,6 +1784,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 d6699696..376c0a1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1275,6 +1275,7 @@ Collection Patron Note + Opac Note @@ -1378,9 +1379,6 @@ [% IF ( riloo.patron.borrowernotes ) %]

[% riloo.patron.borrowernotes | $raw | html_line_break %]

[% END %] - [% IF ( riloo.patron.opacnote ) %] -

[% riloo.patron.opacnote | html %]

- [% END %] [% IF ( riloo.messages.count ) %] [% FOREACH message IN riloo.messages %]

[% message.message | html %]

@@ -1393,6 +1391,11 @@

[% riloo.itemnotes_nonpublic | html %]

[% END %] + + [% IF ( riloo.patron.opacnote ) %] +

[% riloo.patron.opacnote | html %]

+ [% END %] + [% END # /FOREACH riloo %] -- 2.30.2