@@ -, +, @@ --- .../prog/en/includes/patron-title.inc | 4 +- .../prog/en/modules/reserve/request.tt | 42 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -44,7 +44,8 @@ [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%] [%- END -%] [%- SET display_patron_name = 1 -%] -[%- SET display_cardnumber = 1 -%] +[%- SET display_cardnumber = 1 -%] +[%- IF no_cardnumber %][% SET display_cardnumber = 0 %][% END -%] [%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%] [%- SET can_see_patron_infos = logged_in_user.can_see_patron_infos( patron ) -%] [%- UNLESS can_see_patron_infos -%] @@ -57,6 +58,7 @@ [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] [%- IF link_to == 'circulation_reserves' %] [%- ELSIF link_to == 'circulation_recalls' %] + [%- ELSIF link_to == 'members_pay' %] [%- ELSE %] [%- END -%] [%- END -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -233,7 +233,7 @@ [% FOREACH member IN members %] [% SET patron = member.patron %]
  • -
    [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])
    +
    [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]
    [% IF member.exceeded_maxreserves %]
    @@ -329,8 +329,7 @@ [% IF ( biblioloo.alreadyres ) %]
  • - [% patron.firstname | html %] [% patron.surname | html %] - already has a hold on this item + [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] already has a hold on this item
  • [% END %] [% IF ( biblioloo.none_avail || biblioloo.noitems ) %] @@ -368,35 +367,35 @@

    Cannot place hold

    [% ELSE # UNLESS multi_hold %]

    Cannot place hold on some items

    [% IF (no_reserves_allowed ) %] -
  • No holds allowed: [% patron.firstname | html %] [% patron.surname | html %] cannot place holds on some of these title's items.
  • +
  • No holds allowed: [% 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.
  • [% ELSIF ( exceeded_maxreserves ) %] -
  • Too many holds: [% patron.firstname | html %] [% patron.surname | html %] can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.
  • +
  • Too many holds: [% 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.
  • [% ELSIF ( exceeded_holds_per_record ) %] [% FOREACH biblioloo IN biblioloop %] [% IF (biblioloo.tooManyHoldsForThisRecord) %] -
  • Too many holds for [% biblioloo.title | html %]: [% patron.firstname | html %] [% patron.surname | html %] can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.
  • +
  • Too many holds for [% biblioloo.title | html %]: [% 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.
  • [% END %] [% END %] [% END # /IF exceeded_maxreserves %] @@ -408,19 +407,19 @@
    @@ -463,7 +462,7 @@
  • Patron: [% IF ( patron.borrowernumber ) %] - [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %]) + [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] [% ELSE %] Not defined yet [% END %] @@ -858,10 +857,9 @@ [% END %] [% IF ( biblioloo.alreadyres ) %] -
  • - [% patron.firstname | html %] [% patron.surname | html %] - already has a hold on this item -
  • +
  • + [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] already has a hold on this item +
  • [% END %] [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
  • No items are available to be placed on hold
  • --