diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index 5d71adf30d..942993dde7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -92,32 +92,28 @@ [% IF ( userdebarred ) %]
  • - Restricted since [% debarredsince | $KohaDates %]: Patron's account is restricted - [% IF ( userdebarreddate ) %] - until [% userdebarreddate | $KohaDates %] - [% END %] - - [% IF ( debarredcomment ) %] - with the explanation:
    - - [% IF debarredcomment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %] - [% ELSE %] - [% FOREACH restriction IN patron.restrictions %] -
    - - [% IF restriction.expiration %] - [% restriction.expiration | $KohaDates %] - [% ELSE %] - Indefinite - [% END %] - - [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%] -
    + Account restricted since [% debarredsince | $KohaDates %] +     View restrictions
    • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc new file mode 100644 index 0000000000..7b2453b7b3 --- /dev/null +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc @@ -0,0 +1,27 @@ +
  • + Your account has been frozen + +
    • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index d07b582690..a81dabfac0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -30,8 +30,8 @@

    Placing a hold

    [% IF ( message ) %] -
    -

    Sorry, you cannot place holds.

    +
    +

    Sorry, you cannot place holds.

      [% IF ( GNA ) %]
    • @@ -49,41 +49,7 @@ [% END %] [% IF ( debarred ) %] -
    • - Your account has been frozen. - [% IF debarred_comment %] - Comment:
      - - - [% IF debarred_comment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %] - [% ELSE %] - [% FOR restriction IN logged_in_user.restrictions %] -
      - [%- restriction.type.display_text | html -%][%- IF restriction.comment -%] - : [% restriction.comment | html_line_break %], frozen until: - - [%- IF restriction.expiration -%] - [%- restriction.expiration | $KohaDates -%] - [%- ELSE -%] - Indefinite - [%- END -%] - - [% END %] -
      - [% END %] - [% END %] -       -       - [% END %] - - [% IF debarred_date && debarred_date != '9999-12-31' %] - End date: - [% debarred_date | $KohaDates %] - [% END %] -
      Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library. - Go to your charges page -
      • + [% INCLUDE "patron-restrictions.inc" %] [% END %] [% IF ( too_much_oweing ) %] @@ -273,9 +239,9 @@ [% END %] [% IF at_least_one_library_not_available_for_pickup %] -
      Note: Library policy does not allow hold/pickup of an item available locally. Please come to the library to retrieve these items
      +
      + Note: Library policy does not allow hold/pickup of an item available locally. Please come to the library to retrieve these items +
      [% END %] [% END # / UNLESS bibitemloo.holdable %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 2bc2eb3631..1c63a78d03 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -167,36 +167,7 @@ [% IF ( discharge_available ) %]
    • Please note: Your account is frozen because it has been discharged. Get your discharge
      • [% ELSE %] -
    • - Please note: Your account has been frozen. - [% IF ( borrower.debarredcomment ) %] - Comment:
      -
        - [% FOREACH restriction IN logged_in_user.restrictions %] -
      • - [%- restriction.type.display_text | html -%]: - [% IF restriction.comment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | html_line_break %] - [% ELSE %] - [%- IF restriction.comment -%] - [% restriction.comment | html_line_break %]. - [%- END -%] - [% END %] - [%- IF restriction.expiration -%] - Account frozen until [%- restriction.expiration | $KohaDates -%] - [%- ELSE -%] - Account frozen indefinitely - [%- END -%] -
        • - [% END %] -
      - [% END %] - -

      Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library. - Go to your charges page

      -
      • + [% INCLUDE "patron-restrictions.inc" %] [% END %] [% END %] [% IF ( borrower.gonenoaddress ) %] @@ -1093,8 +1064,9 @@ $(document).ready(function(){ [% IF ( opac_user_holds ) %] $("#opac-user-views a[href='#opac-user-holds_panel']").tab("show"); - [% END %] - [% IF ( opac_user_article_requests ) %] + [% ELSIF ( opac_user_overdues ) %] + $("#opac-user-views a[href='#opac-user-overdues_panel']").tab("show"); + [% ELSIF ( opac_user_article_requests ) %] $("#opac-user-views a[href='#opac-user-article-requests_panel']").tab("show"); [% END %] $('#article-requests-table caption .count').html(AR_CAPTION_COUNT.format('[% current_article_requests.size | html %]')); diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 9d7109bcac..be5f63896b 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -430,6 +430,7 @@ $template->param( OpacHoldNotes => C4::Context->preference('OpacHoldNotes'), failed_holds => scalar $query->param('failed_holds'), opac_user_holds => scalar $query->param('opac-user-holds') || 0, + opac_user_overdues => scalar $query->param('opac-user-overdues') || 0, opac_user_article_requests => scalar $query->param('opac-user-article-requests') || 0, );