@@ -, +, @@ make sure they have all the restrictions mentioned above as well) --- .../prog/en/includes/patron_messages.inc | 11 +++++++++- .../bootstrap/en/modules/opac-reserve.tt | 22 +++++++++++++++++-- .../bootstrap/en/modules/opac-user.tt | 22 +++++++++++++++++-- 3 files changed, 50 insertions(+), 5 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -70,8 +70,17 @@ [% IF debarredcomment.search('OVERDUES_PROCESS') %] Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %] [% ELSE %] - [% FOR restriction IN patron.restrictions %] + [% FOREACH restriction IN patron.restrictions %] + [% IF restriction.expiration %] + [% restriction.expiration | $KohaDates %] + [% ELSE %] + Indefinite + [% END %] + [% IF restriction.comment %] [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %]
+ [% ELSE %] + [% restriction.type.display_text | html %]
+ [% END %] [% END %] [% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -47,13 +47,31 @@
  • Your account has been frozen. [% IF debarred_comment %] - Comment: + Comment:
    [% IF debarred_comment.search('OVERDUES_PROCESS') %] Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %] [% ELSE %] - [% debarred_comment | html_line_break %] + [% FOR restriction IN logged_in_user.restrictions %] + [% IF restriction.comment %] + [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %], frozen until: + [% IF restriction.expiration %] + [% restriction.expiration | $KohaDates %] + [% ELSE %] + Indefinite + [% END %] +
    + [% ELSE %] + [% restriction.type.display_text | html %], frozen until: + [% IF restriction.expiration %] + [% restriction.expiration | $KohaDates %] + [% ELSE %] + Indefinite + [% END %] +
    + [% END %] + [% END %] [% END %]
    --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -168,13 +168,31 @@ [% ELSE %]
  • Please note: Your account has been frozen. [% IF ( borrower.debarredcomment ) %] - Comment: + Comment:
    [% IF borrower.debarredcomment.search('OVERDUES_PROCESS') %] Restriction added by overdues process [% borrower.debarredcomment.remove('OVERDUES_PROCESS ') | html_line_break %] [% ELSE %] - [% borrower.debarredcomment | html_line_break %] + [% FOR restriction IN logged_in_user.restrictions %] + [% IF restriction.comment %] + [% restriction.type.display_text | html %]: [% restriction.comment | html_line_break %], frozen until: + [% IF restriction.expiration %] + [% restriction.expiration | $KohaDates %] + [% ELSE %] + Indefinite + [% END %] +
    + [% ELSE %] + [% restriction.type.display_text | html %], frozen until: + [% IF restriction.expiration %] + [% restriction.expiration | $KohaDates %] + [% ELSE %] + Indefinite + [% END %] +
    + [% END %] + [% END %] [% END %]
    --