@@ -, +, @@ - 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 --- .../opac-tmpl/bootstrap/en/includes/opac-note.inc | 13 +++++++++++++ .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 14 +------------- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 +++ opac/sco/sco-main.pl | 21 +++++++++++++++++++++ 4 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc @@ -0,0 +1,13 @@ +
+

Messages for you

+ +
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -41,19 +41,7 @@ Using this account is not recommended because some parts of Koha will not functi [% END %] [% IF ( bor_messages ) %] -
-

Messages for you

- -
+ [% INCLUDE 'opac-note.inc' %] [% END %]

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 %]

--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -166,6 +166,9 @@ [% IF ( patronid ) %] [% IF ( validuser ) %]
You are logged in as [% borrowername %].
+ [% IF ( bor_messages ) %] + [% INCLUDE 'opac-note.inc' %] + [% END %] [% END %] [% IF ( nouser ) %] --- a/opac/sco/sco-main.pl +++ a/opac/sco/sco-main.pl @@ -47,6 +47,7 @@ use C4::Biblio; use C4::Items; use Koha::Acquisition::Currencies; use Koha::Patron::Images; +use Koha::Patron::Messages; my $query = new CGI; @@ -249,6 +250,26 @@ if ($borrower->{cardnumber}) { 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( --