@@ -, +, @@ - Check out to a patron and check the holds tab - View patron details and check the holds tab - Patron hold history - Patron details -> Print -> Print summary - Place a hold on a title which already has at least one hold on it, check the table of existing holds. - Log in to the OPAC as a patron with holds - Your summary -> Holds tab - Your holds history (OPACHoldsHistory must be enabled). --- .../intranet-tmpl/prog/en/includes/holds_table.inc | 8 +++-- .../prog/en/modules/circ/circulation.tt | 1 + .../prog/en/modules/members/holdshistory.tt | 41 +++++++++++++--------- .../prog/en/modules/members/moremember-print.tt | 8 +++-- .../prog/en/modules/members/moremember.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/holds.js | 5 ++- .../bootstrap/en/includes/holds-table.inc | 36 ++++++++++--------- .../bootstrap/en/modules/opac-holdshistory.tt | 20 ++++++----- 8 files changed, 74 insertions(+), 46 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -12,7 +12,9 @@ Patron Notes Date - Expiration + [% IF Koha.Preference('ReserveExpiration') %] + Expiration + [% END %] Pickup library Details [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] @@ -117,7 +119,9 @@ [% hold.date | $KohaDates %] [% END %] - + [% IF Koha.Preference('ReserveExpiration') %] + + [% END %] [% IF ( hold.found ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1094,6 +1094,7 @@ relatives_borrowernumbers.push("[% b | html %]"); [% END %] var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %]; + var ReserveExpiration = [% ( Koha.Preference('ReserveExpiration') ) ? 1 : 0 | html %]; [% Asset.js("js/pages/circulation.js") | $raw %] [% Asset.js("js/checkouts.js") | $raw %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -48,9 +48,7 @@ Expiration date Waiting date Cancellation date - [% IF show_itemtype_column %] - Requested item type - [% END %] + Requested item type Status @@ -62,13 +60,13 @@ [% hold.item.barcode | html %] [% Branches.GetName( hold.branchcode ) | html %] [% hold.reservedate | $KohaDates %] - - [% IF hold.expirationdate %] - [% hold.expirationdate | $KohaDates %] - [% ELSE %] - - [% END %] - + + [% IF hold.expirationdate %] + [% hold.expirationdate | $KohaDates %] + [% ELSE %] + + [% END %] + [% IF hold.waitingdate %] [% hold.waitingdate | $KohaDates %] @@ -83,7 +81,6 @@ [% END %] - [% IF show_itemtype_column %] [% IF hold.itemtype %] [% ItemTypes.GetDescription( hold.itemtype ) | html %] @@ -91,7 +88,6 @@ Any item type [% END %] - [% END %] [% IF hold.found == 'F' %] Fulfilled @@ -134,12 +130,23 @@ [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] [% Asset.js("js/pages/circulation.js") | $raw %] [% Asset.js("js/checkouts.js") | $raw %] --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ a/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -100,7 +100,10 @@ $(document).ready(function() { else { return oObj.branchcode.escapeHtml() || ""; } } }, - { "data": { _: "expirationdate_formatted", "sort": "expirationdate" } }, + { + "visible": ReserveExpiration, + "data": { _: "expirationdate_formatted", "sort": "expirationdate" } + }, { "mDataProp": function( oObj ) { if ( oObj.priority && parseInt( oObj.priority ) && parseInt( oObj.priority ) > 0 ) { --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -16,7 +16,9 @@ [% ELSE %] Placed on [% END %] - Expires on + [% IF Koha.Preference('ReserveExpiration') %] + Expires on + [% END %] [% UNLESS( singleBranchMode) %] Pick up location [% END %] @@ -68,23 +70,25 @@ [% HOLD.reservedate | $KohaDates %] - - [% IF ! HOLD.found %] - [% IF ( HOLD.expirationdate ) %] - - Expiration: - [% HOLD.expirationdate | $KohaDates %] - + [% IF Koha.Preference('ReserveExpiration') %] + + [% IF ! HOLD.found %] + [% IF ( HOLD.expirationdate ) %] + + Expiration: + [% HOLD.expirationdate | $KohaDates %] + + [% ELSE %] + + Expiration: + Never expires + + [% END %] [% ELSE %] - - Expiration: - Never expires - + - [% END %] - [% ELSE %] - - - [% END %] - + + [% END %] [% UNLESS( singleBranchMode) %] Pick up location: --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt @@ -90,7 +90,9 @@ Barcode Library Hold date - Expiration date + [% IF Koha.Preference('ReserveExpiration') %] + Expiration date + [% END %] Waiting date Cancellation date [% IF show_itemtype_column %] @@ -107,13 +109,15 @@ [% hold.item.barcode | html %] [% Branches.GetName( hold.branchcode ) | html %] [% hold.reservedate | $KohaDates %] - - [% IF hold.expirationdate %] - [% hold.expirationdate | $KohaDates %] - [% ELSE %] - - [% END %] - + [% IF Koha.Preference('ReserveExpiration') %] + + [% IF hold.expirationdate %] + [% hold.expirationdate | $KohaDates %] + [% ELSE %] + + [% END %] + + [% END %] [% IF hold.waitingdate %] [% hold.waitingdate | $KohaDates %] --