From 2ff5cf976c39d5d0759492a078f0623575bcdc31 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 18 May 2023 14:52:58 +0100
Subject: [PATCH] Bug 29002: Fix 'Place booking' for cat pages

We added the 'Place booking' option to the cat-toolbar, but it require
includes for select2 and calendar which weren't present everywhere..
This patch corrects that.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Janet McGowan <janet.mcgowan@ptfs-europe.com>
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt   | 7 +------
 .../intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt  | 3 +++
 .../intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt  | 3 +++
 .../intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt | 3 +++
 .../prog/en/modules/catalogue/labeledMARCdetail.tt         | 3 +++
 .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt  | 3 +++
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
index 52834a6aab..a0b61bc34d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
@@ -36,11 +36,7 @@
         <div class="col-sm-10 col-sm-push-2">
             <main>
                 <div class="row">
-                    <div class="btn-toolbar">
-                        <div class="btn-group">
-                            <button id="placbooking" class="btn btn-default" data-toggle="modal" data-target="#placeBookingModal" data-biblionumber="[% biblionumber | html %]"><i class="fa fa-calendar"></i> Place booking</button>
-                        </div>
-                    </div>
+                    [% INCLUDE 'cat-toolbar.inc' %]
                     <h1>Bookings for [% INCLUDE 'biblio-title-head.inc' %]</h1>
                     <div class="page-section">
                         <table id="bookings_table"></table>
@@ -56,7 +52,6 @@
         </div> <!-- /.col-sm-2.col-sm-pull-10 -->
     </div> <!-- /.row -->
 
-    [% INCLUDE modals/place_booking.inc %]
 
     [% MACRO jsinclude BLOCK %]
     [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
index 29dfc33b09..b2e706b3ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
@@ -85,7 +85,10 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'catalog-strings.inc' %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'select2.inc' %]
     [% Asset.js("js/catalog.js") | $raw %]
+    [% Asset.js("js/place_booking_modal.js") | $raw %]
     [% Asset.js("js/browser.js") | $raw %]
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
         <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index 257292383e..3575bec9c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -211,7 +211,10 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'catalog-strings.inc' %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'select2.inc' %]
     [% Asset.js("js/catalog.js") | $raw %]
+    [% Asset.js("js/place_booking_modal.js") | $raw %]
     [% Asset.js("js/browser.js") | $raw %]
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
         <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
index abe62a938e..5eb7895f43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
@@ -138,7 +138,10 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'catalog-strings.inc' %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'select2.inc' %]
     [% Asset.js("js/catalog.js") | $raw %]
+    [% Asset.js("js/place_booking_modal.js") | $raw %]
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
         <script>
             /* Set a variable needed by add_catalog_concern.js */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
index 946573cadc..c2d891cc99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -100,7 +100,10 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'catalog-strings.inc' %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'select2.inc' %]
     [% Asset.js("js/catalog.js") | $raw %]
+    [% Asset.js("js/place_booking_modal.js") | $raw %]
     [% Asset.js("js/browser.js") | $raw %]
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
         <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 9274ff450e..673366ce6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -487,7 +487,10 @@
     [% INCLUDE 'modals/checkout_renewals.inc' %]
     [% INCLUDE 'js-date-format.inc' %]
     [% INCLUDE 'js-patron-format.inc' %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'select2.inc' %]
     [% Asset.js("js/catalog.js") | $raw %]
+    [% Asset.js("js/place_booking_modal.js") | $raw %]
     [% Asset.js("js/browser.js") | $raw %]
     [% Asset.js("js/checkout_renewals_modal.js") | $raw %]
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-- 
2.39.5