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

(-)a/acqui/moddeliverydate.pl (-1 / +1 lines)
Lines 55-61 my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} ) Link Here
55
55
56
if($op and $op eq 'save') {
56
if($op and $op eq 'save') {
57
    my $estimated_delivery_date = $input->param('estimated_delivery_date');
57
    my $estimated_delivery_date = $input->param('estimated_delivery_date');
58
    $order->{'estimated_delivery_date'} = dt_from_string( $estimated_delivery_date );
58
    $order->{'estimated_delivery_date'} = $estimated_delivery_date ? dt_from_string( $estimated_delivery_date ) : undef;
59
    ModOrder($order);
59
    ModOrder($order);
60
    print $input->redirect($referrer);
60
    print $input->redirect($referrer);
61
    exit;
61
    exit;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-4 / +3 lines)
Lines 599-605 Link Here
599
                        <td class="actions">
599
                        <td class="actions">
600
                            [% books_loo.estimated_delivery_date | $KohaDates %]
600
                            [% books_loo.estimated_delivery_date | $KohaDates %]
601
                            [% IF CAN_user_acquisition_order_manage %]
601
                            [% IF CAN_user_acquisition_order_manage %]
602
                            <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]">
602
                            <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | $KohaDates %]">
603
                                <i class="fa fa-pencil"></i> Edit
603
                                <i class="fa fa-pencil"></i> Edit
604
                            </a>
604
                            </a>
605
                        </td>
605
                        </td>
Lines 1056-1065 Link Here
1056
                e.preventDefault();
1056
                e.preventDefault();
1057
                var ordernumber = $(this).data("ordernumber");
1057
                var ordernumber = $(this).data("ordernumber");
1058
                var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
1058
                var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
1059
                var date_text = $( "#delivery_date_" + ordernumber ).html();
1059
                var date_text = $( "#delivery_date_" + ordernumber ).data("delivery_date");
1060
                $("#dateEditor .modal-title").text(modalTitle);
1060
                $("#dateEditor .modal-title").text(modalTitle);
1061
                $("#date_ordernumber").val(ordernumber);
1061
                $("#date_ordernumber").val(ordernumber);
1062
                $("#estimated_delivery_date").html( date_text );
1062
                $("#estimated_delivery_date").val(date_text);
1063
                $("#dateEditor").modal("show");
1063
                $("#dateEditor").modal("show");
1064
            });
1064
            });
1065
1065
1066
- 

Return to bug 15348