Bugzilla – Attachment 138110 Details for
Bug 15348
Change/Edit estimated delivery date per order line
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15348: (follow-up) Fix modal to edit delivery date
Bug-15348-follow-up-Fix-modal-to-edit-delivery-dat.patch (text/plain), 3.04 KB, created by
Aleisha Amohia
on 2022-07-26 05:09:20 UTC
(
hide
)
Description:
Bug 15348: (follow-up) Fix modal to edit delivery date
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2022-07-26 05:09:20 UTC
Size:
3.04 KB
patch
obsolete
>From 48a141c895670fc81ce2623f080a3d761ebd133b Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 26 Jul 2022 16:49:39 +1200 >Subject: [PATCH] Bug 15348: (follow-up) Fix modal to edit delivery date > >This allows you to empty the delivery date and ensures the current date >shows >--- > acqui/moddeliverydate.pl | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/acqui/moddeliverydate.pl b/acqui/moddeliverydate.pl >index 50de045d813..975fccdb958 100755 >--- a/acqui/moddeliverydate.pl >+++ b/acqui/moddeliverydate.pl >@@ -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; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index c068e874603..02c785c73ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -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"); > }); > >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15348
:
114430
|
114583
|
114623
|
115121
|
115122
|
115123
|
115124
|
116517
|
118788
|
118789
|
119297
|
119298
|
119299
|
120653
|
120654
|
120655
|
120656
|
136560
|
136561
|
136562
|
136563
|
137057
|
137058
|
137061
|
137098
|
137099
|
137740
|
137741
|
137742
|
137743
|
138110
|
138491
|
138529
|
138530
|
138531
|
138532
|
138533
|
138534
|
138535
|
138536
|
138537
|
138538
|
138539
|
138540
|
139245
|
139274
|
139301
|
139329
|
139330
|
139331
|
139332
|
139333
|
139334
|
139335
|
139336
|
139337
|
139338
|
139339
|
139340
|
139341
|
139342
|
139343
|
139351
|
139352
|
139353
|
139354
|
139355
|
139356
|
139357
|
139358
|
139359
|
139360
|
139361
|
139362
|
139363
|
139364
|
139365
|
139831
|
139832
|
139833
|
139834
|
139835
|
139836
|
139837
|
139838
|
139839
|
139840
|
139841
|
139842
|
139843
|
139844
|
139845
|
140708
|
140735
|
143896
|
143900
|
143903
|
143904