Display patron messages from OPAC summary page on SCO screen as well.
To test:
- Make sure you have patrons with and without OPAC note and OPAC messages
- Log in to OPAC and go to patrons 'your summary' page to display note
and messages
- Apply patch
- Refresh patrons detail page. Verify that it looks the same as before
- Go to SCO
- Log in as such patron
- Verify that note and messages appear the same as on OPAC summary page
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
--- /dev/null
+<div class="alert alert-info">
+ <h3>Messages for you</h3>
+ <ul>
+ [% FOREACH message IN patron_messages %]
+ <li>
+ <strong>[% message.message %]</strong><br>
+ <i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) %]</i>
+ </li>
+ [% END %]
+
+ [% IF ( opacnote ) %]<li>[% opacnote %]</li>[% END %]
+ </ul>
+</div>
[% END %]
[% IF ( bor_messages ) %]
- <div class="alert alert-info">
- <h3>Messages for you</h3>
- <ul>
- [% FOREACH message IN patron_messages %]
- <li>
- <strong>[% message.message %]</strong><br>
- <i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) %]</i>
- </li>
- [% END %]
-
- [% IF ( opacnote ) %]<li>[% opacnote %]</li>[% END %]
- </ul>
- </div>
+ [% INCLUDE 'opac-note.inc' %]
[% END %]
<h2>Hello, [% INCLUDE 'patron-title.inc' category_type = BORROWER_INFO.category_type firstname = BORROWER_INFO.firstname surname = BORROWER_INFO.surname othernames = BORROWER_INFO.othernames cardnumber = BORROWER_INFO.cardnumber %]
</h2>
[% IF ( patronid ) %]
[% IF ( validuser ) %]
<div class="alert alert-info">You are logged in as [% borrowername %].</div>
+ [% IF ( bor_messages ) %]
+ [% INCLUDE 'opac-note.inc' %]
+ [% END %]
[% END %]
[% IF ( nouser ) %]
use C4::Items;
use Koha::Acquisition::Currencies;
use Koha::Patron::Images;
+use Koha::Patron::Messages;
my $query = new CGI;
noitemlinks => 1 ,
borrowernumber => $borrower->{'borrowernumber'},
);
+
+ my $patron_messages = Koha::Patron::Messages->search(
+ {
+ borrowernumber => $borrower->{'borrowernumber'},
+ message_type => 'B',
+ }
+ );
+ if ( $patron_messages->count ) {
+ $template->param( bor_messages => 1,
+ patron_messages => $patron_messages,
+ );
+ }
+
+ if ( $borrower->{'opacnote'} ) {
+ $template->param(
+ bor_messages => 1,
+ opacnote => $borrower->{'opacnote'},
+ );
+ }
+
my $inputfocus = ($return_only == 1) ? 'returnbook' :
($confirm_required == 1) ? 'confirm' : 'barcode' ;
$template->param(