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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-1 / +3 lines)
Lines 44-50 Link Here
44
    [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
44
    [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
45
[%- END -%]
45
[%- END -%]
46
[%- SET display_patron_name = 1 -%]
46
[%- SET display_patron_name = 1 -%]
47
[%- SET display_cardnumber  = 1 -%]
47
[%- SET display_cardnumber = 1 -%]
48
[%- IF no_cardnumber %][% SET display_cardnumber = 0 %][% END -%]
48
[%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%]
49
[%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%]
49
    [%- SET can_see_patron_infos = logged_in_user.can_see_patron_infos( patron ) -%]
50
    [%- SET can_see_patron_infos = logged_in_user.can_see_patron_infos( patron ) -%]
50
    [%- UNLESS can_see_patron_infos -%]
51
    [%- UNLESS can_see_patron_infos -%]
Lines 57-62 Link Here
57
[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
58
[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
58
    [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#reserves">
59
    [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#reserves">
59
    [%- ELSIF link_to == 'circulation_recalls' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#recalls">
60
    [%- ELSIF link_to == 'circulation_recalls' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#recalls">
61
    [%- ELSIF link_to == 'members_pay' %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">
60
    [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | uri %]">
62
    [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | uri %]">
61
    [%- END -%]
63
    [%- END -%]
62
[%- END -%]
64
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-23 / +20 lines)
Lines 233-239 Link Here
233
                            [% FOREACH member IN members %]
233
                            [% FOREACH member IN members %]
234
                                [% SET patron = member.patron %]
234
                                [% SET patron = member.patron %]
235
                                <li style="padding: 0.5em 1em;">
235
                                <li style="padding: 0.5em 1em;">
236
                                    <div><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></div>
236
                                    <div>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]</div>
237
                                    [% IF member.exceeded_maxreserves %]
237
                                    [% IF member.exceeded_maxreserves %]
238
                                        <div>
238
                                        <div>
239
                                            <i class="fa fa-error"></i>
239
                                            <i class="fa fa-error"></i>
Lines 329-336 Link Here
329
329
330
                                            [% IF ( biblioloo.alreadyres ) %]
330
                                            [% IF ( biblioloo.alreadyres ) %]
331
                                                <li>
331
                                                <li>
332
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>
332
                                                    [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] <strong>already has a hold</strong> on this item
333
                                                    <strong>already has a hold</strong> on this item
334
                                                </li>
333
                                                </li>
335
                                            [% END %]
334
                                            [% END %]
336
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
335
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
Lines 368-402 Link Here
368
                            <h3>Cannot place hold</h3>
367
                            <h3>Cannot place hold</h3>
369
                            <ul>
368
                            <ul>
370
                                [% IF ( no_reserves_allowed ) %]
369
                                [% IF ( no_reserves_allowed ) %]
371
                                    <li><strong>No holds allowed: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> cannot place a hold on any of these items.</li>
370
                                    <li><strong>No holds allowed:</strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] cannot place a hold on any of these items.</li>
372
                                [% ELSIF ( exceeded_maxreserves ) %]
371
                                [% ELSIF ( exceeded_maxreserves ) %]
373
                                    <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% maxreserves | html %] total holds.</li>
372
                                    <li><strong>Too many holds:</strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can only place a maximum of [% maxreserves | html %] total holds.</li>
374
                                [% ELSIF ( exceeded_holds_per_record ) %]
373
                                [% ELSIF ( exceeded_holds_per_record ) %]
375
                                    <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
374
                                    <li><strong>Too many holds for this record: </strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
376
                                [% ELSIF ( alreadypossession ) %]
375
                                [% ELSIF ( alreadypossession ) %]
377
                                    <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>is already in possession</strong> of one item.</li>
376
                                <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 hide_patron_infos_if_needed => 1 %] <strong>is already in possession</strong> of one item.</li>
378
                                [% ELSIF ( alreadyreserved ) %]
377
                                [% ELSIF ( alreadyreserved ) %]
379
                                    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item.</li>
378
                                    <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] <strong>already has a hold</strong> on this item.</li>
380
                                [% ELSIF ( ageRestricted ) %]
379
                                [% ELSIF ( ageRestricted ) %]
381
                                    <li><strong>Age restricted</strong></li>
380
                                    <li><strong>Age restricted</strong></li>
382
                                [% ELSIF ( none_available ) %]
381
                                [% ELSIF ( none_available ) %]
383
                                    <li> <strong>No items are available</strong> to be placed on hold.</li>
382
                                    <li> <strong>No items are available</strong> to be placed on hold.</li>
384
                                [% ELSIF ( maxreserves ) %]
383
                                [% ELSIF ( maxreserves ) %]
385
                                    <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li>
384
                                <li><strong>Too many holds: </strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] has too many holds.</li>
386
                                [% ELSIF ( recall ) %]
385
                                [% ELSIF ( recall ) %]
387
                                    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> has <strong>already placed a recall</strong> on this item.</li>
386
                                    <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] has <strong>already placed a recall</strong> on this item.</li>
388
                                [% END # /IF exceeded_maxreserves %]
387
                                [% END # /IF exceeded_maxreserves %]
389
                            </ul>
388
                            </ul>
390
                        [% ELSE # UNLESS multi_hold %]
389
                        [% ELSE # UNLESS multi_hold %]
391
                            <h3>Cannot place hold on some items</h3>
390
                            <h3>Cannot place hold on some items</h3>
392
                            [% IF (no_reserves_allowed ) %]
391
                            [% IF (no_reserves_allowed ) %]
393
                                <li><strong>No holds allowed: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> cannot place holds on some of these title's items.</li>
392
                                <li><strong>No holds allowed:</strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] cannot place holds on some of these title's items.</li>
394
                            [% ELSIF ( exceeded_maxreserves ) %]
393
                            [% ELSIF ( exceeded_maxreserves ) %]
395
                                <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li>
394
                                <li><strong>Too many holds: </strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li>
396
                            [% ELSIF ( exceeded_holds_per_record ) %]
395
                            [% ELSIF ( exceeded_holds_per_record ) %]
397
                                [% FOREACH biblioloo IN biblioloop %]
396
                                [% FOREACH biblioloo IN biblioloop %]
398
                                    [% IF (biblioloo.tooManyHoldsForThisRecord) %]
397
                                    [% IF (biblioloo.tooManyHoldsForThisRecord) %]
399
                                        <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]"> [% biblioloo.title | html %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
398
                                        <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]"> [% biblioloo.title | html %]</a>: </strong> [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
400
                                    [% END %]
399
                                    [% END %]
401
                                [% END %]
400
                                [% END %]
402
                            [% END # /IF exceeded_maxreserves %]
401
                            [% END # /IF exceeded_maxreserves %]
Lines 408-426 Link Here
408
                    <div class="dialog message">
407
                    <div class="dialog message">
409
                        <ul>
408
                        <ul>
410
                            [% IF ( patron.is_expired ) %]
409
                            [% IF ( patron.is_expired ) %]
411
                                <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li>
410
                                <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]: <strong>Account has expired</strong></li>
412
                            [% END %]
411
                            [% END %]
413
412
414
                            [% IF patron.is_debarred %]
413
                            [% IF patron.is_debarred %]
415
                                <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]#reldebarments">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has restrictions</strong></li>
414
                                <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]: <strong>Patron has restrictions</strong></li>
416
                            [% END %]
415
                            [% END %]
417
416
418
                            [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
417
                            [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
419
                                <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | $Price %]</strong></li>
418
                            <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 link_to => 'members_pay' %]: <strong>Patron has outstanding fines: [% amount_outstanding | $Price %]</strong></li>
420
                            [% END %]
419
                            [% END %]
421
420
422
                            [% IF ( diffbranch ) %]
421
                            [% IF ( diffbranch ) %]
423
                                <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li>
422
                                <li> <strong>Pickup library is different. </strong>Patron: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li>
424
                            [% END %]
423
                            [% END %]
425
                        </ul> <!-- /.dialog.message -->
424
                        </ul> <!-- /.dialog.message -->
426
                    </div>
425
                    </div>
Lines 463-469 Link Here
463
                            <li>
462
                            <li>
464
                                <span class="label">Patron:</span>
463
                                <span class="label">Patron:</span>
465
                                [% IF ( patron.borrowernumber ) %]
464
                                [% IF ( patron.borrowernumber ) %]
466
                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a>
465
                                    [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]
467
                                [% ELSE %]
466
                                [% ELSE %]
468
                                    Not defined yet
467
                                    Not defined yet
469
                                [% END %]
468
                                [% END %]
Lines 844-853 Link Here
844
                                            [% END %]
843
                                            [% END %]
845
844
846
                                            [% IF ( biblioloo.alreadyres ) %]
845
                                            [% IF ( biblioloo.alreadyres ) %]
847
                                                <li>
846
                                            <li>
848
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>
847
                                                [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] <strong>already has a hold</strong> on this item
849
                                                    <strong>already has a hold</strong> on this item
848
                                            </li>
850
                                                </li>
851
                                            [% END %]
849
                                            [% END %]
852
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
850
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
853
                                                <li> <strong>No items are available</strong> to be placed on hold</li>
851
                                                <li> <strong>No items are available</strong> to be placed on hold</li>
854
- 

Return to bug 21978