-<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 patron_messages.count OR opacnote %]
+ <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>
+ [% IF ( opacnote ) %]<li>[% opacnote %]</li>[% END %]
+ </ul>
+ </div>
+[% END %]
</div>
[% END %]
- [% IF ( bor_messages ) %]
- [% INCLUDE 'opac-note.inc' %]
- [% END %]
+ [% INCLUDE 'opac-note.inc' %]
+
<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 %]
+ [% INCLUDE 'opac-note.inc' %]
[% END %]
[% IF ( nouser ) %]
message_type => 'B',
}
);
-if ( $patron_messages->count ) {
- $template->param( bor_messages => 1 );
-}
-
-if ( $borr->{'opacnote'} ) {
- $template->param(
- bor_messages => 1,
- opacnote => $borr->{'opacnote'},
- );
-}
if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
|| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
$template->param(
borrower => $borr,
patron_messages => $patron_messages,
+ opacnote => $borr->{opacnote},
patronupdate => $patronupdate,
OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
userview => 1,
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'},
- );
- }
+ $template->param(
+ patron_messages => $patron_messages,
+ opacnote => $borrower->{opacnote},
+ );
my $inputfocus = ($return_only == 1) ? 'returnbook' :
($confirm_required == 1) ? 'confirm' : 'barcode' ;