gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15348: (follow-up) Fix modal to edit delivery date 

This allows you to empty the delivery date and ensures the current date
shows

Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller@bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Aleisha Amohia 2022-07-26 16:49:39 +12:00 committed by Tomas Cohen Arazi
parent fe981989ca
commit efeef8df7c
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acqui/moddeliverydate.pl
View File

@ -55,7 +55,7 @@ my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} )
if($op and $op eq 'save') {
my $estimated_delivery_date = $input->param('estimated_delivery_date');
$order->{'estimated_delivery_date'} = dt_from_string( $estimated_delivery_date );
$order->{'estimated_delivery_date'} = $estimated_delivery_date ? dt_from_string( $estimated_delivery_date ) : undef;
ModOrder($order);
print $input->redirect($referrer);
exit;

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View File

@ -599,7 +599,7 @@
<td class="actions">
[% books_loo.estimated_delivery_date | $KohaDates %]
[% IF CAN_user_acquisition_order_manage %]
<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 %]">
<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 %]">
<i class="fa fa-pencil"></i> Edit
</a>
</td>
@ -1056,10 +1056,10 @@
e.preventDefault();
var ordernumber = $(this).data("ordernumber");
var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
var date_text = $( "#delivery_date_" + ordernumber ).html();
var date_text = $( "#delivery_date_" + ordernumber ).data("delivery_date");
$("#dateEditor .modal-title").text(modalTitle);
$("#date_ordernumber").val(ordernumber);
$("#estimated_delivery_date").html( date_text );
$("#estimated_delivery_date").val(date_text);
$("#dateEditor").modal("show");
});