From 221d5b2ef81e3b145d9e05d3de1c6835eb2691d4 Mon Sep 17 00:00:00 2001 From: Thibaud Guillot Date: Wed, 8 Jan 2025 13:46:06 +0000 Subject: [PATCH] Bug 33738 : Add bookings feature on the OPAC side MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inspired by the work of Paul and Martin, I'm submitting this proposal for the bookings functionality on the OPAC side. Bookings are perform as on the staff side with the api, adding, cancelling and modifying the pickup library works (normally :) ). Test plan: 1) Apply this patch and restart_all 2) Having a bookable item 3) Go to the OPAC side and click on “Place booking” in the menu. 4) Add a booking; if there is an error, it will appear in the modal (preparation of errors linked to circulation rules). 5) Cancel or Modify pickup library Thanks for testing --- .../bootstrap/en/includes/bookings-table.inc | 4 +- .../bootstrap/en/includes/modals/bookings.inc | 78 ++- .../bootstrap/en/includes/select2.inc | 6 + .../bootstrap/en/modules/opac-bookings.tt | 17 +- .../bootstrap/js/modals/place_booking.js | 500 ++++++++++++++++++ .../lib/select2/css/select2-spinner.gif | Bin 0 -> 1849 bytes .../opac-tmpl/lib/select2/css/select2.min.css | 1 + .../opac-tmpl/lib/select2/css/select2.png | Bin 0 -> 613 bytes .../opac-tmpl/lib/select2/css/select2x2.png | Bin 0 -> 845 bytes .../opac-tmpl/lib/select2/js/select2.min.js | 2 + opac/opac-bookings.pl | 39 +- 11 files changed, 590 insertions(+), 57 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/select2.inc create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/modals/place_booking.js create mode 100644 koha-tmpl/opac-tmpl/lib/select2/css/select2-spinner.gif create mode 100644 koha-tmpl/opac-tmpl/lib/select2/css/select2.min.css create mode 100644 koha-tmpl/opac-tmpl/lib/select2/css/select2.png create mode 100644 koha-tmpl/opac-tmpl/lib/select2/css/select2x2.png create mode 100644 koha-tmpl/opac-tmpl/lib/select2/js/select2.min.js diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bookings-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bookings-table.inc index 6afe5c67cf..1ab8e4fad2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bookings-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bookings-table.inc @@ -32,7 +32,7 @@ [% BOOKING.pickup_library.branchname | html %] - [% PROCESS 'modals/bookings.inc' action = 'change-pickup-location' %] @@ -62,7 +62,7 @@ type="button" class="btn btn-sm btn-danger btn-delete-booking" data-bs-toggle="modal" - data-bs-target="#cancel-[% BOOKING.booking_id | html %]" + data-bs-target="#opac-cancel-booking-modal" >  [% tp('Cancel booking button', 'Cancel') | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/bookings.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/bookings.inc index a146d7a408..2645a244d4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/bookings.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/bookings.inc @@ -1,14 +1,14 @@ [% USE Branches %] [% SET booking_id = BOOKING.booking_id | html %] -