From fe981989ca05eb022de00478c4175bdc676d36f1 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Fri, 15 Jul 2022 14:10:47 +1200 Subject: [PATCH] Bug 15348: (follow-up) Fix calendar widget, translateability, etc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also add functionality to edit the estimated delivery date from a closed basket. Signed-off-by: Christian Stelzenmüller Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- acqui/moddeliverydate.pl | 4 +- .../prog/en/modules/acqui/basket.tt | 54 ++++++++++++++++++- .../prog/en/modules/acqui/lateorders.tt | 6 +-- .../prog/en/modules/acqui/moddeliverydate.tt | 8 +-- .../prog/en/modules/acqui/neworderempty.tt | 4 +- 5 files changed, 59 insertions(+), 17 deletions(-) diff --git a/acqui/moddeliverydate.pl b/acqui/moddeliverydate.pl index 5eb698ad86..50de045d81 100755 --- a/acqui/moddeliverydate.pl +++ b/acqui/moddeliverydate.pl @@ -33,10 +33,10 @@ use Modern::Perl; use CGI qw ( -utf8 ); use C4::Auth qw( get_template_and_user ); use C4::Output qw( output_html_with_http_headers ); -use C4::Acquisition qw( GetOrder GetBasket ); +use C4::Acquisition qw( GetOrder GetBasket ModOrder ); use Koha::Acquisition::Booksellers; -use Koha::DateUtils; +use Koha::DateUtils qw( dt_from_string ); my $input = CGI->new; my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { 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 47c5d3f405..c068e87460 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -596,7 +596,14 @@ [% IF Koha.Preference('EDIFACT') && ediaccount %] [% books_loo.suppliers_report | html %] [% END %] - [% books_loo.estimated_delivery_date | $KohaDates %] + + [% books_loo.estimated_delivery_date | $KohaDates %] + [% IF CAN_user_acquisition_order_manage %] + + Edit + + + [% END %] [% IF ( active ) %] [% UNLESS ( closedate ) %] @@ -839,12 +846,37 @@ + + + [% MACRO jsinclude BLOCK %] [% Asset.js("js/acquisitions-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% Asset.js("lib/hc-sticky.js") | $raw %] [% Asset.js("js/acq.js") | $raw %] + [% INCLUDE 'calendar.inc' %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index cdde27d7d8..593a00d7d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -483,7 +483,7 @@
  • - +
    [% INCLUDE 'date-format.inc' %]
  • The 2 following fields are available for your own usage. They can be useful for statistical purposes
    @@ -686,8 +686,6 @@ getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 ); }); $("#budget_id").change(); - - $("#estimated_delivery_date").datepicker(); }); function UserSearchPopup(f) { -- 2.39.5