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

(-)a/acqui/moddeliverydate.pl (-2 / +2 lines)
Lines 33-42 use Modern::Perl; Link Here
33
use CGI qw ( -utf8 );
33
use CGI qw ( -utf8 );
34
use C4::Auth qw( get_template_and_user );
34
use C4::Auth qw( get_template_and_user );
35
use C4::Output qw( output_html_with_http_headers );
35
use C4::Output qw( output_html_with_http_headers );
36
use C4::Acquisition qw( GetOrder GetBasket );
36
use C4::Acquisition qw( GetOrder GetBasket ModOrder );
37
37
38
use Koha::Acquisition::Booksellers;
38
use Koha::Acquisition::Booksellers;
39
use Koha::DateUtils;
39
use Koha::DateUtils qw( dt_from_string );
40
40
41
my $input = CGI->new;
41
my $input = CGI->new;
42
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
42
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +52 lines)
Lines 596-602 Link Here
596
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
596
                        [% IF Koha.Preference('EDIFACT') && ediaccount %]
597
                        <td>[% books_loo.suppliers_report | html %]</td>
597
                        <td>[% books_loo.suppliers_report | html %]</td>
598
                        [% END %]
598
                        [% END %]
599
                        <td>[% books_loo.estimated_delivery_date | $KohaDates %]</td>
599
                        <td class="actions">
600
                            [% books_loo.estimated_delivery_date | $KohaDates %]
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 %]">
603
                                <i class="fa fa-pencil"></i> Edit
604
                            </a>
605
                        </td>
606
                    [% END %]
600
                        [% IF ( active ) %]
607
                        [% IF ( active ) %]
601
                            [% UNLESS ( closedate ) %]
608
                            [% UNLESS ( closedate ) %]
602
                            <td>
609
                            <td>
Lines 839-850 Link Here
839
    </div>
846
    </div>
840
</div>
847
</div>
841
848
849
<!-- Modal for editing estimated delivery date -->
850
<div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel">
851
    <div class="modal-dialog" role="document">
852
        <form id="modify_estimated_delivery_date" action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
853
            <div class="modal-content">
854
                <div class="modal-header">
855
                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
856
                    <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
857
                </div>
858
                <div class="modal-body">
859
                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | $KohaDates %]"/>
860
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
861
                <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
862
                <input type="hidden" name="op" value="save" />
863
            </div>
864
            <div class="modal-footer">
865
                <button type="submit" class="btn btn-default">Save</button>
866
                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
867
            </div>
868
            </div>
869
        </form>
870
    </div>
871
</div>
872
842
[% MACRO jsinclude BLOCK %]
873
[% MACRO jsinclude BLOCK %]
843
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
874
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
844
    [% INCLUDE 'datatables.inc' %]
875
    [% INCLUDE 'datatables.inc' %]
845
    [% INCLUDE 'columns_settings.inc' %]
876
    [% INCLUDE 'columns_settings.inc' %]
846
    [% Asset.js("lib/hc-sticky.js") | $raw %]
877
    [% Asset.js("lib/hc-sticky.js") | $raw %]
847
    [% Asset.js("js/acq.js") | $raw %]
878
    [% Asset.js("js/acq.js") | $raw %]
879
    [% INCLUDE 'calendar.inc' %]
848
    <script>
880
    <script>
849
        function updateColumnsVisibility(visible) {
881
        function updateColumnsVisibility(visible) {
850
            if ( visible ) {
882
            if ( visible ) {
Lines 936-942 Link Here
936
                $("#set_basket_group").show();
968
                $("#set_basket_group").show();
937
            });
969
            });
938
970
939
            $(".modal").on("shown.bs.modal", function(){
971
            $("#addtoBasket").on("shown.bs.modal", function(){
940
                var basket = $(this).data("basketno");
972
                var basket = $(this).data("basketno");
941
                var legend = _("Add order to basket %s").format(basket);
973
                var legend = _("Add order to basket %s").format(basket);
942
                $(this).find("h4").text( legend );
974
                $(this).find("h4").text( legend );
Lines 1019-1024 Link Here
1019
            $("#select_managing_library").on("change", function(){
1051
            $("#select_managing_library").on("change", function(){
1020
                $(this).parent().submit();
1052
                $(this).parent().submit();
1021
            });
1053
            });
1054
1055
            $(".edit_delivery_date").on("click", function(e) {
1056
                e.preventDefault();
1057
                var ordernumber = $(this).data("ordernumber");
1058
                var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
1059
                var date_text = $( "#delivery_date_" + ordernumber ).html();
1060
                $("#dateEditor .modal-title").text(modalTitle);
1061
                $("#date_ordernumber").val(ordernumber);
1062
                $("#estimated_delivery_date").html( date_text );
1063
                $("#dateEditor").modal("show");
1064
            });
1065
1066
             $("#dateEditor").on('hidden.bs.modal', function (e) {
1067
                $("#dateEditorLabel").html("");
1068
                $("#dateEditor .modal-title").text("");
1069
                $("#estimated_delivery_date").html( "" );
1070
                $("#date_ordernumber").val("");
1071
            });
1022
        });
1072
        });
1023
1073
1024
        function UserSearchPopup(f) {
1074
        function UserSearchPopup(f) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-4 / +2 lines)
Lines 305-311 Link Here
305
                    <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
305
                    <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
306
                </div>
306
                </div>
307
                <div class="modal-body">
307
                <div class="modal-body">
308
                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="datepicker" value="[% estimated_delivery_date | html %]"/>
308
                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
309
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
309
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
310
                <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
310
                <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
311
                <input type="hidden" name="op" value="save" />
311
                <input type="hidden" name="op" value="save" />
Lines 387-393 Link Here
387
                e.preventDefault();
387
                e.preventDefault();
388
                var ordernumber = $(this).data("ordernumber");
388
                var ordernumber = $(this).data("ordernumber");
389
                var note_type = $(this).data("note_type");
389
                var note_type = $(this).data("note_type");
390
                var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
390
                var modalTitle = _("%s (order number %s)").format($(this).attr("title"), ordernumber);
391
                var note_text = $( "#" + note_type + "-note-" + ordernumber ).html();
391
                var note_text = $( "#" + note_type + "-note-" + ordernumber ).html();
392
                $("#noteEditor .modal-title").text(modalTitle);
392
                $("#noteEditor .modal-title").text(modalTitle);
393
                $("#notes_ordernumber").val( ordernumber );
393
                $("#notes_ordernumber").val( ordernumber );
Lines 405-412 Link Here
405
                $("#type").val("");
405
                $("#type").val("");
406
            });
406
            });
407
407
408
             $("#estimated_delivery_date").datepicker();
409
410
            $(".edit_delivery_date").on("click", function(e) {
408
            $(".edit_delivery_date").on("click", function(e) {
411
                e.preventDefault();
409
                e.preventDefault();
412
                var ordernumber = $(this).data("ordernumber");
410
                var ordernumber = $(this).data("ordernumber");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt (-6 / +2 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
1
[% SET footerjs = 1 %]
2
[% SET footerjs = 1 %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Change estimated delivery date &rsaquo; Acquisitions &rsaquo; Koha</title>
4
<title>Change estimated delivery date &rsaquo; Acquisitions &rsaquo; Koha</title>
Lines 35-41 Link Here
35
      <form action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
36
      <form action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
36
        <fieldset class="brief">
37
        <fieldset class="brief">
37
          <label for="estimated_delivery_date">Estimated delivery date:</label>
38
          <label for="estimated_delivery_date">Estimated delivery date:</label>
38
          <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr flatpickr-input noEnterSubmit" value="[% estimated_delivery_date | html %]"/>
39
          <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
39
          <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
40
          <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
40
        </fieldset>
41
        </fieldset>
41
        <input type="hidden" name="referrer" value="[% referrer | html %]" />
42
        <input type="hidden" name="referrer" value="[% referrer | html %]" />
Lines 51-61 Link Here
51
52
52
[% MACRO jsinclude BLOCK %]
53
[% MACRO jsinclude BLOCK %]
53
    [% INCLUDE 'calendar.inc' %]
54
    [% INCLUDE 'calendar.inc' %]
54
    <script>
55
        $(document).ready(function(){
56
            $("#estimated_delivery_date").datepicker();
57
        });
58
    </script>
59
[% END %]
55
[% END %]
60
56
61
[% INCLUDE 'intranet-bottom.inc' %]
57
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-4 / +1 lines)
Lines 483-489 Link Here
483
            </li>
483
            </li>
484
            <li>
484
            <li>
485
                <label for="estimated_delivery_date">Estimated delivery date: </label>
485
                <label for="estimated_delivery_date">Estimated delivery date: </label>
486
                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr flatpickr-input noEnterSubmit" value="[% estimated_delivery_date | html %]"/>
486
                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
487
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
487
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
488
            </li>
488
            </li>
489
            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
489
            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
Lines 685-692 Link Here
685
                getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
685
                getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
686
            });
686
            });
687
            $("#budget_id").change();
687
            $("#budget_id").change();
688
689
            $("#estimated_delivery_date").datepicker();
690
        });
688
        });
691
689
692
        function UserSearchPopup(f) {
690
        function UserSearchPopup(f) {
693
- 

Return to bug 15348