From 93f6a8ebd25d240e0d59df43cf1b82b1f1511831 Mon Sep 17 00:00:00 2001 From: Baptiste Date: Wed, 23 Jul 2025 16:52:57 +0200 Subject: [PATCH] Bug 37661: Have 37737 depend on EnableBooking Signed-off-by: Andrew Fuerste Henry --- .../prog/en/includes/patron-detail-tabs.inc | 38 ++++++++++--------- .../prog/en/modules/members/moremember.tt | 10 +++-- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc index 24e01ea9b38..8b121248830 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc @@ -23,10 +23,12 @@ [% WRAPPER tab_item tabname= "holds" %] Holds ([% holds_count || 0 | html %]) [% END %] - [% WRAPPER tab_item tabname="bookings" %] - [% SET bookings_count = patron.bookings.filter_by_active.count %] - [% SET expired_bookings_count = patron.bookings.count - bookings_count %] - Bookings ([% bookings_count || 0 | html %]) + [% IF Koha.Preference('EnableBooking') %] + [% WRAPPER tab_item tabname="bookings" %] + [% SET bookings_count = patron.bookings.filter_by_active.count %] + [% SET expired_bookings_count = patron.bookings.count - bookings_count %] + Bookings ([% bookings_count || 0 | html %]) + [% END %] [% END %] [% END %] @@ -214,19 +216,21 @@ [% END %] [% END # /tab_panel#holds %] - [% WRAPPER tab_panel tabname="bookings" %] - [% IF ( bookings_count ) %] -
- Show expired -
-
- [% ELSIF ( expired_bookings_count ) %] -
- Hide expired -
-
- [% ELSE %] -

Patron has nothing booked.

+ [% IF Koha.Preference('EnableBooking') %] + [% WRAPPER tab_panel tabname="bookings" %] + [% IF ( bookings_count ) %] +
+ Show expired +
+
+ [% ELSIF ( expired_bookings_count ) %] +
+ Hide expired +
+
+ [% ELSE %] +

Patron has nothing booked.

+ [% END %] [% END %] [% END %] [% END %] 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 cdb10f8e48b..f53883744e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -756,7 +756,9 @@ [% INCLUDE 'modals/resolve_return_claim.inc' %] [% END %] -[% INCLUDE modals/cancel_booking.inc %] +[% IF Koha.Preference('EnableBooking') %] + [% INCLUDE modals/cancel_booking.inc %] +[% END %] [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] @@ -790,7 +792,10 @@ [% END %] [% Asset.js("js/holds.js") | $raw %] [% INCLUDE 'calendar.inc' %] - [% Asset.js("js/cancel_booking_modal.js") | $raw %] + [% IF Koha.Preference('EnableBooking') %] + [% Asset.js("js/cancel_booking_modal.js") | $raw %] + [% Asset.js("js/tables/bookings.js") | $raw %] + [% END %] [% Asset.js("js/combobox.js") | $raw %] [% INCLUDE 'js-biblio-format.inc' %] [% INCLUDE 'str/members-menu.inc' %] @@ -859,7 +864,6 @@ }); [% Asset.js("js/checkouts.js") | $raw %] - [% Asset.js("js/tables/bookings.js") | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5