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 300-306 Link Here
300
                            [% FOREACH member IN members %]
300
                            [% FOREACH member IN members %]
301
                                [% SET patron = member.patron %]
301
                                [% SET patron = member.patron %]
302
                                <li style="padding: 0.5em 1em;">
302
                                <li style="padding: 0.5em 1em;">
303
                                    <div><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></div>
303
                                    <div>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]</div>
304
                                    [% IF member.exceeded_maxreserves %]
304
                                    [% IF member.exceeded_maxreserves %]
305
                                        <div>
305
                                        <div>
306
                                            <i class="fa fa-error"></i>
306
                                            <i class="fa fa-error"></i>
Lines 396-403 Link Here
396
396
397
                                            [% IF ( biblioloo.alreadyres ) %]
397
                                            [% IF ( biblioloo.alreadyres ) %]
398
                                                <li>
398
                                                <li>
399
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>
399
                                                    [% 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
400
                                                    <strong>already has a hold</strong> on this item
401
                                                </li>
400
                                                </li>
402
                                            [% END %]
401
                                            [% END %]
403
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
402
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
Lines 435-469 Link Here
435
                            <h3>Cannot place hold</h3>
434
                            <h3>Cannot place hold</h3>
436
                            <ul>
435
                            <ul>
437
                                [% IF ( no_reserves_allowed ) %]
436
                                [% IF ( no_reserves_allowed ) %]
438
                                    <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>
437
                                    <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>
439
                                [% ELSIF ( exceeded_maxreserves ) %]
438
                                [% ELSIF ( exceeded_maxreserves ) %]
440
                                    <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>
439
                                    <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>
441
                                [% ELSIF ( exceeded_holds_per_record ) %]
440
                                [% ELSIF ( exceeded_holds_per_record ) %]
442
                                    <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>
441
                                    <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>
443
                                [% ELSIF ( alreadypossession ) %]
442
                                [% ELSIF ( alreadypossession ) %]
444
                                    <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>
443
                                    <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>
445
                                [% ELSIF ( alreadyreserved ) %]
444
                                [% ELSIF ( alreadyreserved ) %]
446
                                    <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>
445
                                    <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>
447
                                [% ELSIF ( ageRestricted ) %]
446
                                [% ELSIF ( ageRestricted ) %]
448
                                    <li><strong>Age restricted</strong></li>
447
                                    <li><strong>Age restricted</strong></li>
449
                                [% ELSIF ( none_available ) %]
448
                                [% ELSIF ( none_available ) %]
450
                                    <li> <strong>No items are available</strong> to be placed on hold.</li>
449
                                    <li> <strong>No items are available</strong> to be placed on hold.</li>
451
                                [% ELSIF ( maxreserves ) %]
450
                                [% ELSIF ( maxreserves ) %]
452
                                    <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>
451
                                    <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>
453
                                [% ELSIF ( recall ) %]
452
                                [% ELSIF ( recall ) %]
454
                                    <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>
453
                                    <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>
455
                                [% END # /IF exceeded_maxreserves %]
454
                                [% END # /IF exceeded_maxreserves %]
456
                            </ul>
455
                            </ul>
457
                        [% ELSE # UNLESS multi_hold %]
456
                        [% ELSE # UNLESS multi_hold %]
458
                            <h3>Cannot place hold on some items</h3>
457
                            <h3>Cannot place hold on some items</h3>
459
                            [% IF (no_reserves_allowed ) %]
458
                            [% IF (no_reserves_allowed ) %]
460
                                <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>
459
                                <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>
461
                            [% ELSIF ( exceeded_maxreserves ) %]
460
                            [% ELSIF ( exceeded_maxreserves ) %]
462
                                <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>
461
                                <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>
463
                            [% ELSIF ( exceeded_holds_per_record ) %]
462
                            [% ELSIF ( exceeded_holds_per_record ) %]
464
                                [% FOREACH biblioloo IN biblioloop %]
463
                                [% FOREACH biblioloo IN biblioloop %]
465
                                    [% IF (biblioloo.tooManyHoldsForThisRecord) %]
464
                                    [% IF (biblioloo.tooManyHoldsForThisRecord) %]
466
                                        <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>
465
                                        <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>
467
                                    [% END %]
466
                                    [% END %]
468
                                [% END %]
467
                                [% END %]
469
                            [% ELSIF ( none_available ) %]
468
                            [% ELSIF ( none_available ) %]
Lines 477-495 Link Here
477
                    <div class="dialog message">
476
                    <div class="dialog message">
478
                        <ul>
477
                        <ul>
479
                            [% IF ( patron.is_expired ) %]
478
                            [% IF ( patron.is_expired ) %]
480
                                <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>
479
                                <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>
481
                            [% END %]
480
                            [% END %]
482
481
483
                            [% IF patron.is_debarred %]
482
                            [% IF patron.is_debarred %]
484
                                <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>
483
                                <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>
485
                            [% END %]
484
                            [% END %]
486
485
487
                            [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
486
                            [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
488
                                <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>
487
                                <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>
489
                            [% END %]
488
                            [% END %]
490
489
491
                            [% IF ( diffbranch ) %]
490
                            [% IF ( diffbranch ) %]
492
                                <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>
491
                                <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>
493
                            [% END %]
492
                            [% END %]
494
                        </ul> <!-- /.dialog.message -->
493
                        </ul> <!-- /.dialog.message -->
495
                    </div>
494
                    </div>
Lines 533-539 Link Here
533
                            <li>
532
                            <li>
534
                                <span class="label">Patron:</span>
533
                                <span class="label">Patron:</span>
535
                                [% IF ( patron.borrowernumber ) %]
534
                                [% IF ( patron.borrowernumber ) %]
536
                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a>
535
                                    [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]
537
                                [% ELSE %]
536
                                [% ELSE %]
538
                                    Not defined yet
537
                                    Not defined yet
539
                                [% END %]
538
                                [% END %]
Lines 932-941 Link Here
932
                                            [% END %]
931
                                            [% END %]
933
932
934
                                            [% IF ( biblioloo.alreadyres ) %]
933
                                            [% IF ( biblioloo.alreadyres ) %]
935
                                                <li>
934
                                            <li>
936
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>
935
                                                [% 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
937
                                                    <strong>already has a hold</strong> on this item
936
                                            </li>
938
                                                </li>
939
                                            [% END %]
937
                                            [% END %]
940
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
938
                                            [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
941
                                                <li> <strong>No items are available</strong> to be placed on hold</li>
939
                                                <li> <strong>No items are available</strong> to be placed on hold</li>
942
- 

Return to bug 21978