Bugzilla – Attachment 116144 Details for
Bug 27339
Display OPAC notes and OPAC messages on check-in
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27339: Display opac notes and opac messages on check-in
Bug-27339-Display-opac-notes-and-opac-messages-on-.patch (text/plain), 3.59 KB, created by
PTFS Europe Sandboxes
on 2021-02-01 10:11:44 UTC
(
hide
)
Description:
Bug 27339: Display opac notes and opac messages on check-in
Filename:
MIME Type:
Creator:
PTFS Europe Sandboxes
Created:
2021-02-01 10:11:44 UTC
Size:
3.59 KB
patch
obsolete
>From 1ae401a446fde423d663dd475a03f6bfa7db7208 Mon Sep 17 00:00:00 2001 >From: Matthias Meusburger <matthias.meusburger@biblibre.com> >Date: Tue, 5 Jan 2021 11:10:38 +0100 >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. >6- Check that Opac note and Opac message(s) are displayed on check-in. > >Signed-off-by: Stina Hallin <stina.hallin@ub.lu.se> >--- > circ/returns.pl | 10 +++++++++- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 8 ++++++++ > 2 files changed, 17 insertions(+), 1 deletion(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index 4e9662024c..8e649427fa 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -56,6 +56,7 @@ use Koha::DateUtils; > use Koha::Holds; > use Koha::Items; > use Koha::Patrons; >+use Koha::Patron::Messages; > > my $query = CGI->new; > >@@ -573,12 +574,19 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { > $ri{minute} = $duedate->minute(); > $ri{duedate} = output_pref($duedate); > my $patron = Koha::Patrons->find( $riborrowernumber{$_} ); >+ my $patron_messages = Koha::Patron::Messages->search( >+ { >+ borrowernumber => $riborrowernumber{$_}, >+ message_type => 'B', >+ }); >+ > unless ( $dropboxmode ) { > $ri{return_overdue} = 1 if (DateTime->compare($duedate, dt_from_string()) == -1); > } else { > $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1); > } >- $ri{patron} = $patron, >+ $ri{patron} = $patron; >+ $ri{messages} = $patron_messages; > $ri{borissuescount} = $patron->checkouts->count; > } > else { >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 c2bdd03bb9..29aed21021 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -916,6 +916,14 @@ > [% IF ( riloo.patron.borrowernotes ) %] > <p><span class="circ-hlt patron-note">[% riloo.patron.borrowernotes | html %]</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> >+ [% END %] >+ [% END %] > [% IF ( riloo.itemnote ) %] > <p><span class="circ-hlt item-note-public">[% riloo.itemnote | html %]</span></p> > [% END %] >-- >2.11.0
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 27339
:
114856
|
116144
|
170069
|
170070
|
170071
|
176012
|
176072
|
176094
|
176095
|
177843
|
177844
|
179079