View | Details | Raw Unified | Return to bug 36789
Collapse All | Expand All

(-)a/bookings/list.pl (-5 / +7 lines)
Lines 34-46 my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( Link Here
34
    }
34
    }
35
);
35
);
36
36
37
my $biblionumber = $input->param('biblionumber');
37
my $biblionumber           = $input->param('biblionumber');
38
my $biblio       = Koha::Biblios->find($biblionumber);
38
my $biblio                 = Koha::Biblios->find($biblionumber);
39
my $bookings_period_length = Koha::CirculationRules->find( { rule_name => 'bookings_period_length' } )->rule_value;
39
40
40
$template->param(
41
$template->param(
41
    biblionumber => $biblionumber,
42
    biblionumber           => $biblionumber,
42
    biblio       => $biblio,
43
    biblio                 => $biblio,
43
    bookingsview => 1,
44
    bookingsview           => 1,
45
    bookings_period_length => $bookings_period_length,
44
);
46
);
45
47
46
output_html_with_http_headers $input, $cookie, $template->output;
48
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/circ/circulation.pl (+7 lines)
Lines 56-61 use Koha::SearchEngine; Link Here
56
use Koha::SearchEngine::Search;
56
use Koha::SearchEngine::Search;
57
use Koha::Patron::Modifications;
57
use Koha::Patron::Modifications;
58
use Koha::Token;
58
use Koha::Token;
59
use Koha::Bookings;
59
60
60
use List::MoreUtils qw( uniq );
61
use List::MoreUtils qw( uniq );
61
62
Lines 321-331 if ($patron) { Link Here
321
#
322
#
322
if (@$barcodes && $op eq 'cud-checkout') {
323
if (@$barcodes && $op eq 'cud-checkout') {
323
    my $checkout_infos;
324
    my $checkout_infos;
325
    my $from_booking = $query->param('booking_id') ? '1' : '0';
324
    for my $barcode ( @$barcodes ) {
326
    for my $barcode ( @$barcodes ) {
325
327
326
        my $template_params = {
328
        my $template_params = {
327
            barcode         => $barcode,
329
            barcode         => $barcode,
328
            onsite_checkout => $onsite_checkout,
330
            onsite_checkout => $onsite_checkout,
331
            from_booking    => $from_booking,
329
        };
332
        };
330
333
331
        # always check for blockers on issuing
334
        # always check for blockers on issuing
Lines 553-558 if (@$barcodes && $op eq 'cud-checkout') { Link Here
553
        confirmation_needed => $confirmation_needed,
556
        confirmation_needed => $confirmation_needed,
554
    );
557
    );
555
  }
558
  }
559
  if($from_booking){
560
    my $booking = Koha::Bookings->find( $query->param('booking_id') );
561
    $booking->delete;
562
  }
556
}
563
}
557
564
558
##################################################################################
565
##################################################################################
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt (+6 lines)
Lines 73-78 Link Here
73
    var update_success = 0;
73
    var update_success = 0;
74
    var bookings_table;
74
    var bookings_table;
75
    var timeline;
75
    var timeline;
76
    var bookings_period_length = "[% bookings_period_length | html %]";
76
    $(document).ready(function(){
77
    $(document).ready(function(){
77
78
78
        var items = $.ajax({
79
        var items = $.ajax({
Lines 273-281 Link Here
273
                "orderable": false,
274
                "orderable": false,
274
                "render": function(data, type, row, meta) {
275
                "render": function(data, type, row, meta) {
275
                    let result = "";
276
                    let result = "";
277
                    let today = new Date();
278
                    let due_date = new Date();
279
                    due_date.setDate(today.getDate() + parseInt(bookings_period_length));
280
                    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()}`;
276
                    [% IF CAN_user_circulate_manage_bookings %]
281
                    [% IF CAN_user_circulate_manage_bookings %]
277
                    result += '<button type="button" class="btn btn-default btn-xs edit-action" data-toggle="modal" data-target="#placeBookingModal" data-booking="'+row.booking_id+'" data-biblionumber="[% biblionumber | uri %]" data-itemnumber="'+row.item_id+'" data-patron="'+row.patron_id+'" data-pickup_library="'+row.pickup_library_id+'" data-start_date="'+row.start_date+'" data-end_date="'+row.end_date+'"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</button>';
282
                    result += '<button type="button" class="btn btn-default btn-xs edit-action" data-toggle="modal" data-target="#placeBookingModal" data-booking="'+row.booking_id+'" data-biblionumber="[% biblionumber | uri %]" data-itemnumber="'+row.item_id+'" data-patron="'+row.patron_id+'" data-pickup_library="'+row.pickup_library_id+'" data-start_date="'+row.start_date+'" data-end_date="'+row.end_date+'"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</button>';
278
                    result += '<button type="button" class="btn btn-default btn-xs cancel-action" data-toggle="modal" data-target="#cancelBookingModal" data-booking="'+row.booking_id+'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Cancel")+'</button>';
283
                    result += '<button type="button" class="btn btn-default btn-xs cancel-action" data-toggle="modal" data-target="#cancelBookingModal" data-booking="'+row.booking_id+'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Cancel")+'</button>';
284
                    result += `<form name="checkout-transform" method="post" action="/cgi-bin/koha/circ/circulation.pl?borrowernumber=${row.patron_id}"><input type="hidden" name="op" value="cud-checkout"/><input type="hidden" name="borrowernumber" value="${row.patron_id}"/><input type="hidden" name="barcode" value="${row.item.external_id}"/><input type="hidden" name="duedatespec" value="${formatted_date}"/><input type="hidden" name="booking_id" value="${row.booking_id}"/><button id="checkout_action" class="btn btn-default btn-xs" type="submit">${_("Transform to checkout")}</button></form>`;
279
                    [% END %]
285
                    [% END %]
280
                    return result;
286
                    return result;
281
                }
287
                }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +3 lines)
Lines 1049-1055 Link Here
1049
                if ( $("#onsite_checkout").prop('checked') ) {
1049
                if ( $("#onsite_checkout").prop('checked') ) {
1050
                    duedatespec_fp.setDate("[% today_due_date_and_time | $KohaDates dateformat => 'iso', with_hours => 1 %]");
1050
                    duedatespec_fp.setDate("[% today_due_date_and_time | $KohaDates dateformat => 'iso', with_hours => 1 %]");
1051
                } else {
1051
                } else {
1052
                    duedatespec_fp.setDate("");
1052
                    if (!from_booking) {
1053
                        duedatespec_fp.setDate("");
1054
                    }
1053
                }
1055
                }
1054
            }
1056
            }
1055
        }
1057
        }
1056
- 

Return to bug 36789