From 2cd457dce8953e59a340a9970aec216224b6a6bb Mon Sep 17 00:00:00 2001 From: Thibaud Guillot Date: Mon, 6 May 2024 12:50:01 +0200 Subject: [PATCH] Bug 36789: Transform a booking into checkout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Directly from the bookings list, you can perform a checkout with booked item. Test plan: 1) Got an item booked :) 2) Click on transform to checkout 3) Normally you will be redirected to circulation.pl checkout view with form infos from booking (due date is calculated from today + booking length period - new circulation rule - see bug 36271) 4) If issue is confirmed, the booking will be deleted. Sponsored by: Association de Gestion des Ĺ’uvres Sociales d'Inria (AGOS) --- bookings/list.pl | 12 +++++++----- circ/circulation.pl | 7 +++++++ .../intranet-tmpl/prog/en/modules/bookings/list.tt | 6 ++++++ .../prog/en/modules/circ/circulation.tt | 4 +++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/bookings/list.pl b/bookings/list.pl index 6333287e041..aca447c37c8 100755 --- a/bookings/list.pl +++ b/bookings/list.pl @@ -34,13 +34,15 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( } ); -my $biblionumber = $input->param('biblionumber'); -my $biblio = Koha::Biblios->find($biblionumber); +my $biblionumber = $input->param('biblionumber'); +my $biblio = Koha::Biblios->find($biblionumber); +my $bookings_period_length = Koha::CirculationRules->find( { rule_name => 'bookings_period_length' } )->rule_value; $template->param( - biblionumber => $biblionumber, - biblio => $biblio, - bookingsview => 1, + biblionumber => $biblionumber, + biblio => $biblio, + bookingsview => 1, + bookings_period_length => $bookings_period_length, ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/circ/circulation.pl b/circ/circulation.pl index d1c2b3b0cfb..6958c507278 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -56,6 +56,7 @@ use Koha::SearchEngine; use Koha::SearchEngine::Search; use Koha::Patron::Modifications; use Koha::Token; +use Koha::Bookings; use List::MoreUtils qw( uniq ); @@ -321,11 +322,13 @@ if ($patron) { # if (@$barcodes && $op eq 'cud-checkout') { my $checkout_infos; + my $from_booking = $query->param('booking_id') ? '1' : '0'; for my $barcode ( @$barcodes ) { my $template_params = { barcode => $barcode, onsite_checkout => $onsite_checkout, + from_booking => $from_booking, }; # always check for blockers on issuing @@ -553,6 +556,10 @@ if (@$barcodes && $op eq 'cud-checkout') { confirmation_needed => $confirmation_needed, ); } + if($from_booking){ + my $booking = Koha::Bookings->find( $query->param('booking_id') ); + $booking->delete; + } } ################################################################################## 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 47740506f89..08c41d135b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt @@ -73,6 +73,7 @@ var update_success = 0; var bookings_table; var timeline; + var bookings_period_length = "[% bookings_period_length | html %]"; $(document).ready(function(){ var items = $.ajax({ @@ -273,9 +274,14 @@ "orderable": false, "render": function(data, type, row, meta) { let result = ""; + let today = new Date(); + let due_date = new Date(); + due_date.setDate(today.getDate() + parseInt(bookings_period_length)); + let formatted_date = `${due_date.getFullYear()}-${String(due_date.getMonth() + 1).padStart(2, '0')}-${String(due_date.getDate()).padStart(2, '0')} ${due_date.getHours()}:${due_date.getMinutes()}`; [% IF CAN_user_circulate_manage_bookings %] result += ''; result += ''; + result += `
`; [% END %] return result; } 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 d6ebd2a0cfb..3d883dabd65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1049,7 +1049,9 @@ if ( $("#onsite_checkout").prop('checked') ) { duedatespec_fp.setDate("[% today_due_date_and_time | $KohaDates dateformat => 'iso', with_hours => 1 %]"); } else { - duedatespec_fp.setDate(""); + if (!from_booking) { + duedatespec_fp.setDate(""); + } } } } -- 2.30.2