From 334f045edb606f9addd11b2f8095cd877e259049 Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Fri, 1 Jul 2022 10:07:08 +0200 Subject: [PATCH] Bug 30952: update circulation --- .../prog/en/includes/checkouts-table.inc | 4 +- .../prog/en/modules/circ/circulation.tt | 170 +++++++----------- .../prog/en/modules/circ/returns.tt | 6 +- .../prog/en/modules/members/moremember.tt | 3 + .../prog/en/modules/reserve/request.tt | 22 +-- 5 files changed, 79 insertions(+), 126 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index e3b04aba1f..abb94cf21a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -53,8 +53,8 @@ [% END %] - - + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 8001e5a389..fb7d35ceec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -66,8 +66,6 @@ [% INCLUDE 'members-toolbar.inc' %] [% END %] -

Checkouts

- [% IF ( was_renewed ) %]
Patron's account has been renewed until [% expiry | $KohaDates %]
@@ -237,15 +235,6 @@ Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS | html %] [% END %] - - [% IF RECALLED %] - [% IF RECALLED.waiting %] -
  • Item [% RECALLED.biblio.title | html %] ([% RECALLED.item.barcode | html %]) has been waiting for [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.waiting_date | $KohaDates %]
  • - [% ELSIF RECALLED.requested or RECALLED.overdue %] -
  • Item [% RECALLED.biblio.title | html %] [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by [% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %] ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.created_date | $KohaDates %]
  • - [% END %] - [% END %] - [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] @@ -295,21 +284,6 @@

    [% END %] - [% IF ( RECALLED ) %] -

    - - - -

    - [% IF RECALLED.waiting %] -

    - - - -

    - [% END %] - [% END %] - @@ -350,12 +324,6 @@ [% END %] - [% IF ( RECALLED ) %] -
    - -
    - [% END %] -
    [% IF (forceallow) %][% END %] @@ -373,9 +341,9 @@ [% END %]
    - [% IF ( RESERVED || ISSUED_TO_ANOTHER || RECALLED ) && (CAN_user_reserveforothers_place_holds ) %] + [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %] [% UNLESS noissues %] - + [% END %] [% END %] @@ -414,7 +382,7 @@ [% IF ( fast_cataloging ) %] [% IF ( CAN_user_editcatalogue_fast_cataloging ) %] - Add record using fast cataloging + Add record using fast cataloging [% END %] [% END %] @@ -495,10 +463,6 @@ [% IF ( USERBLOCKEDOVERDUE ) %]
  • Checkouts are BLOCKED because patron has overdue items.
  • [% END %] - - [% IF ( RECALLED_INTRANSIT ) %] -
  • Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) | html %].
  • - [% END %] [% IF (forceallow) %] @@ -566,7 +530,7 @@ - + @@ -575,7 +539,7 @@ @@ -610,11 +574,12 @@ [% END %] -
    +
    [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
    +
    [% IF ( issue ) %]
    [% ELSE %] @@ -628,7 +593,7 @@ [% IF (forceallow) %][% END %] - +

    Checking out to [% INCLUDE 'patron-title.inc' %]

    [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
    Enter item barcode or keyword:
    @@ -645,8 +610,8 @@
    - +
    @@ -670,33 +635,31 @@ [% END %] [% UNLESS ( noissues ) %] - [% IF Koha.Preference('AllowSetAutomaticRenewal') %] -
    - [% IF NEEDSCONFIRMATION %] - [% IF auto_renew %] - [% IF patron.autorenew_checkouts %] - - [% ELSE %] - - [% END %] - [% ELSE %] - - [% END %] - [% ELSE %] - [% IF ( auto_renew && patron.autorenew_checkouts ) %] - - [% ELSIF patron.autorenew_checkouts %] - - [% ELSE %] +
    + [% IF NEEDSCONFIRMATION %] + [% IF auto_renew %] + [% IF patron.autorenew_checkouts %] + [% ELSE %] + [% END %] + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF ( auto_renew && patron.autorenew_checkouts ) %] + + [% ELSIF patron.autorenew_checkouts %] + + [% ELSE %] + [% END %] + [% END %] - -
    - [% END %] + +
    [% IF Koha.Preference('decreaseLoanHighHolds') %]
    [% IF NEEDSCONFIRMATION %] @@ -744,6 +707,7 @@ [% END %]
    +
    [% IF ( issue ) %]
    @@ -765,12 +729,13 @@
    [% END %] +
    [% IF ( noissues ) %] [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] -
    +
    [% ELSE %] -

    Checking out to [% INCLUDE 'patron-title.inc' %]

    -
    +

    Checking out to [% INCLUDE 'patron-title.inc' %]

    +
    [% END %]

    Cannot check out! @@ -779,42 +744,42 @@ [% END %]

    [% ELSE %] -
    +
    [% END %] +
    [% INCLUDE 'patron_messages.inc' %] - -
    +
    - [% IF Koha.Preference('UseRecalls') %] -
    - [% INCLUDE 'recalls.inc' %] -
    - [% END %] - [% IF Koha.Preference('ClaimReturnedLostValue') %] [% INCLUDE 'patron-return-claims.inc' %] [% END %] @@ -955,7 +912,7 @@
    [% ELSIF borrowernumber # IF patron %] -
    Patron not found. Return to search
    +
    Patron not found. Return to search
    [% END # /IF patron %]
    @@ -999,6 +956,8 @@ [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] + [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %] + [% INCLUDE 'timepicker.inc' %] [% INCLUDE 'select2.inc' %] [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %] [% INCLUDE 'js-date-format.inc' %] @@ -1028,8 +987,8 @@ [% Asset.js("js/checkouts.js") | $raw %] [% Asset.js("js/holds.js") | $raw %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - [% Asset.js("js/recalls.js") | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 4f4511a033..94142d34f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -1060,7 +1060,8 @@ [% IF ( riloop ) %] -

    Checked-in items

    +
    +

    Checked-in items

    @@ -1148,7 +1149,7 @@ [% END %] - Print checkin slip + Print checkin slip [% ELSE %] Not checked out [% END %] @@ -1167,6 +1168,7 @@ [% END # /FOREACH riloo %]
    +
    [% END # /IF riloop %] [% IF Koha.Preference('CircSidebar') %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index d0bca84871..ac162e34ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -93,6 +93,8 @@
    + +
    [% IF ( was_renewed ) %]
    @@ -104,6 +106,7 @@
    [% INCLUDE 'patron_messages.inc' %]
    +

    [% UNLESS ( I ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 93a8f4281e..bc907bf666 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -285,7 +285,7 @@ [% END %] [% UNLESS ( multi_hold ) %]
    - +
    [% ELSE %] @@ -569,17 +569,7 @@ [% UNLESS ( multi_hold ) %] -
    - [% IF ( patron.borrowernumber ) %] - [% IF ( override_required ) %] - - [% ELSIF ( none_available ) %] - - [% ELSE %] - - [% END %] - [% END %] -
    + [% FOREACH bibitemloo IN bibitemloop %]
      @@ -896,14 +886,14 @@
      [% IF ( patron AND patron.borrowernumber ) %] [% IF ( override_required ) %] - + [% ELSIF ( none_available ) %] - + [% ELSE %] [% IF ( multi_hold ) %] - + [% ELSE %] - + [% END %] [% END %] [% END # /IF patron %] -- 2.17.1