@@ -, +, @@ - Checkouts - Holds - Recalls (with UseRecalls enabled) - Claims (with a LOST value defined in ClaimReturnedLostValue) - Restrictions - Article Requests (with ArticleRequests preference enabled) - Clubs (with at least one club defined) - Relatives' checkouts (patron must have a guarantee linked to their account). --- .../prog/en/includes/checkouts-table.inc | 169 +++++++------ .../prog/en/includes/html_helpers.inc | 2 +- .../en/includes/patron-article-requests.inc | 2 - .../prog/en/includes/patron-detail-tabs.inc | 227 ++++++++++++++++++ .../en/includes/patron-restrictions-tab.inc | 142 ++++++----- .../prog/en/includes/patron-return-claims.inc | 48 ++-- .../prog/en/includes/patron_messages.inc | 6 +- .../en/includes/relatives-issues-table.inc | 46 ++-- .../prog/en/modules/circ/circulation.tt | 175 +------------- .../prog/en/modules/clubs/patron-clubs-tab.tt | 4 +- .../prog/en/modules/clubs/patron-enroll.tt | 4 +- .../prog/en/modules/members/moremember.tt | 227 +----------------- .../prog/js/pages/circulation.js | 9 +- 13 files changed, 446 insertions(+), 615 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -1,98 +1,97 @@ [% USE Koha %] [% PROCESS 'modal-claims.inc' %] [% INCLUDE 'format_price.inc' %] -
- Show checkouts -
-Patron has nothing checked out.
+[% END %] [% PROCESS 'modal-claims-display' %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -393,7 +393,7 @@ [% ELSE %]Guarantee | +Amount outstanding | +|
---|---|---|
[% INCLUDE 'patron-title.inc' patron=guarantee hide_patron_infos_if_needed=1 %] | + [% IF logged_in_user.can_see_patron_infos( guarantee ) %] +[% guarantee.account.balance | $Price %] | + [% ELSE %] +- | + [% END %] +Total due | +[% guarantees_fines | $Price %] | + +
Patron has nothing on hold.
+ [% END %] + [% END # /tab_panel#holds %] + [% END %] + + [% IF Koha.Preference('UseRecalls') %] + [% WRAPPER tab_panel tabname="recalls" %] + [% INCLUDE 'recalls.inc' %] + [% END # /tab_panel# %] + [% END %] + + [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %] + [% WRAPPER tab_panel tabname="return-claims" %] + [% INCLUDE 'patron-return-claims.inc' %] + [% END # /tab_panel# %] + [% END %] + + [% IF Koha.Preference('ArticleRequests') %] + [% WRAPPER tab_panel tabname="article-requests" %] + [% INCLUDE 'patron-article-requests.inc' %] + [% END %] + [% END # /tab_panel# %] + + [% END # /WRAPPER tab_panels %] +[% END # /WRAPPER tabs %] + --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc @@ -1,81 +1,79 @@ [% USE raw %] [% USE Koha %] [% PROCESS 'restriction-types.inc' %] -Patron is currently unrestricted.
- [% ELSE %] -Type | +Comment | +Expiration | +Created | + [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] ++ [% END %] + | |
---|---|---|---|---|---|
Type | -Comment | -Expiration | -Created | - [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %] -- [% END %] - | |
+ [% PROCESS restriction_type_description restriction_type=restriction.type %] + | ++ [% IF restriction.comment.search('OVERDUES_PROCESS') %] + Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %] + [% ELSE %] + [% restriction.comment | $raw %] + [% END %] + | +[% IF restriction.expiration %] [% restriction.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] | +[% restriction.created | $KohaDates %] | + [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]- [% PROCESS restriction_type_description restriction_type=restriction.type %] + + Remove + | -- [% IF restriction.comment.search('OVERDUES_PROCESS') %] - Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %] - [% ELSE %] - [% restriction.comment | $raw %] + [% END %] + |
- [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %] - Show all [% patron.return_claims.count | html %] claim(s) - Show [% patron.return_claims.unresolved.count | html %] unresolved claims - [% ELSE %] - - - [% END %] -
-Claim ID | -Resolved? | -Title | -Notes | -Created on | -Updated on | -Resolution | -- |
---|
+ [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %] + Show all [% patron.return_claims.count | html %] claim(s) + Show [% patron.return_claims.unresolved.count | html %] unresolved claims + [% ELSE %] + + + [% END %] +
+Claim ID | +Resolved? | +Title | +Notes | +Created on | +Updated on | +Resolution | ++ |
---|
Due date (unformatted, hidden) | -Due date | -Title | -Record-level item type | -Item type | -Collection | -Location | -Checked out on (hidden, unformatted) | -Checked out on | -Checked out from | -Call number | -Copy number | -Charge | -Fine | -Price | -Patron | -
---|
Due date (unformatted, hidden) | +Due date | +Title | +Record-level item type | +Item type | +Collection | +Location | +Checked out on (hidden, unformatted) | +Checked out on | +Checked out from | +Call number | +Copy number | +Charge | +Fine | +Price | +Patron | +
---|
Patron has nothing on hold.
- [% END # /IF holds_count %] -Total due: [% fines | $Price %]
- [% ELSE %] -No outstanding charges
- [% END %] -Guarantee | -Amount outstanding | -|
---|---|---|
[% INCLUDE 'patron-title.inc' patron=guarantee hide_patron_infos_if_needed=1 %] | - [% IF logged_in_user.can_see_patron_infos( guarantee ) %] -[% guarantee.account.balance | $Price %] | - [% ELSE %] -- | - [% END %] -Total due | -[% guarantees_fines | $Price %] | - -
Patron has nothing on hold.
- [% END %] -