View | Details | Raw Unified | Return to bug 17386
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-note.inc (+13 lines)
Line 0 Link Here
1
<div class="alert alert-info">
2
    <h3>Messages for you</h3>
3
    <ul>
4
        [% FOREACH message IN patron_messages %]
5
            <li>
6
                <strong>[% message.message %]</strong><br>
7
                &nbsp;&nbsp;&nbsp;<i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) %]</i>
8
            </li>
9
        [% END %]
10
11
        [% IF ( opacnote ) %]<li>[% opacnote %]</li>[% END %]
12
    </ul>
13
</div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-13 / +1 lines)
Lines 41-59 Using this account is not recommended because some parts of Koha will not functi Link Here
41
                    [% END %]
41
                    [% END %]
42
42
43
                    [% IF ( bor_messages ) %]
43
                    [% IF ( bor_messages ) %]
44
                        <div class="alert alert-info">
44
                        [% INCLUDE 'opac-note.inc' %]
45
                            <h3>Messages for you</h3>
46
                                <ul>
47
                                    [% FOREACH message IN patron_messages %]
48
                                        <li>
49
                                        <strong>[% message.message %]</strong><br>
50
                                        &nbsp;&nbsp;&nbsp;<i>Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) %]</i>
51
                                        </li>
52
                                    [% END %]
53
54
                                    [% IF ( opacnote ) %]<li>[% opacnote %]</li>[% END %]
55
                                </ul>
56
                        </div>
57
                    [% END %]
45
                    [% END %]
58
                    <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 %]
46
                    <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 %]
59
                    </h2>
47
                    </h2>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (+3 lines)
Lines 166-171 Link Here
166
                        [% IF ( patronid ) %]
166
                        [% IF ( patronid ) %]
167
                            [% IF ( validuser ) %]
167
                            [% IF ( validuser ) %]
168
                                <div class="alert alert-info">You are logged in as [% borrowername %].</div>
168
                                <div class="alert alert-info">You are logged in as [% borrowername %].</div>
169
                                [% IF ( bor_messages ) %]
170
                                    [% INCLUDE 'opac-note.inc' %]
171
                                [% END %]
169
                            [% END %]
172
                            [% END %]
170
173
171
                            [% IF ( nouser ) %]
174
                            [% IF ( nouser ) %]
(-)a/opac/sco/sco-main.pl (-1 / +21 lines)
Lines 47-52 use C4::Biblio; Link Here
47
use C4::Items;
47
use C4::Items;
48
use Koha::Acquisition::Currencies;
48
use Koha::Acquisition::Currencies;
49
use Koha::Patron::Images;
49
use Koha::Patron::Images;
50
use Koha::Patron::Messages;
50
51
51
my $query = new CGI;
52
my $query = new CGI;
52
53
Lines 249-254 if ($borrower->{cardnumber}) { Link Here
249
        noitemlinks => 1 ,
250
        noitemlinks => 1 ,
250
        borrowernumber => $borrower->{'borrowernumber'},
251
        borrowernumber => $borrower->{'borrowernumber'},
251
    );
252
    );
253
254
    my $patron_messages = Koha::Patron::Messages->search(
255
        {
256
            borrowernumber => $borrower->{'borrowernumber'},
257
            message_type => 'B',
258
        }
259
    );
260
    if ( $patron_messages->count ) {
261
        $template->param( bor_messages => 1,
262
            patron_messages => $patron_messages,
263
        );
264
    }
265
266
    if ( $borrower->{'opacnote'} ) {
267
        $template->param(
268
            bor_messages => 1,
269
            opacnote => $borrower->{'opacnote'},
270
        );
271
    }
272
252
    my $inputfocus = ($return_only      == 1) ? 'returnbook' :
273
    my $inputfocus = ($return_only      == 1) ? 'returnbook' :
253
                     ($confirm_required == 1) ? 'confirm'    : 'barcode' ;
274
                     ($confirm_required == 1) ? 'confirm'    : 'barcode' ;
254
    $template->param(
275
    $template->param(
255
- 

Return to bug 17386