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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-5 / +50 lines)
Lines 450-463 Link Here
450
                                [% END %]
450
                                [% END %]
451
                            </p>
451
                            </p>
452
                                [% IF ( books_loo.order_internalnote ) %]
452
                                [% IF ( books_loo.order_internalnote ) %]
453
                                    <p class="ordernote"><strong>Internal note: </strong>[% books_loo.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p>
453
                                    <p class="ordernote"><strong>Internal note: </strong><span id="internal-note-[% books_loo.ordernumber %]">[% books_loo.order_internalnote|html %]</span> <a class="edit_note" data-ordernumber="[% books_loo.ordernumber %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal" title="Edit internal note"><i class="fa fa-pencil"></i> Edit internal note</a></p>
454
                                [% ELSE %]
454
                                [% ELSE %]
455
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Add internal note</a>]
455
                                    <a class="edit_note" data-ordernumber="[% books_loo.ordernumber %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal" title="Add internal note"><i class="fa fa-plus"></i> Add internal note</a>
456
                                [% END %]
456
                                [% END %]
457
                                [% IF ( books_loo.order_vendornote ) %]
457
                                [% IF ( books_loo.order_vendornote ) %]
458
                                    <p class="ordernote"><strong>Vendor note: </strong>[% books_loo.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Change vendor note</a>]</p>
458
                                    <p class="ordernote"><strong>Vendor note: </strong> <span id="vendor-note-[% books_loo.ordernumber %]">[% books_loo.order_vendornote|html %]</span> <a class="edit_note" data-ordernumber="[% books_loo.ordernumber %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor" title="Edit vendor note"><i class="fa fa-pencil"></i> Edit vendor note</a></p>
459
                                [% ELSE %]
459
                                [% ELSE %]
460
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Add vendor note</a>]
460
                                    <a class="edit_note" data-ordernumber="[% books_loo.ordernumber %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor" title="Add vendor note"><i class="fa fa-plus"></i> Add vendor note</a>
461
                                [% END %]
461
                                [% END %]
462
                            [% IF (books_loo.transferred_from) %]
462
                            [% IF (books_loo.transferred_from) %]
463
                              [% basket = books_loo.transferred_from.basket %]
463
                              [% basket = books_loo.transferred_from.basket %]
Lines 685-690 Link Here
685
</div>
685
</div>
686
</div>
686
</div>
687
687
688
<!-- Modal for editing vendor and internal notes -->
689
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
690
    <div class="modal-dialog" role="document">
691
        <form id="modify_order_notes" action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
692
            <div class="modal-content">
693
                <div class="modal-header">
694
                    <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
695
                    <h4 class="modal-title" id="noteEditorLabel">Order note</h4>
696
                </div>
697
                <div class="modal-body">
698
                <textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes %]</textarea>
699
                <input type="hidden" id="ordernumber" name="ordernumber" value="" />
700
                <input type="hidden" name="op" value="save" />
701
                <input type="hidden" id="type" name="type" value="" />
702
            </div>
703
            <div class="modal-footer">
704
                <button type="submit" class="btn btn-default">Save</button>
705
                <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
706
            </div>
707
        </form>
708
    </div>
709
</div>
710
</div>
711
688
[% MACRO jsinclude BLOCK %]
712
[% MACRO jsinclude BLOCK %]
689
    [% Asset.js("js/acquisitions-menu.js") %]
713
    [% Asset.js("js/acquisitions-menu.js") %]
690
[% INCLUDE 'datatables.inc' %]
714
[% INCLUDE 'datatables.inc' %]
Lines 730-735 Link Here
730
                e.preventDefault();
754
                e.preventDefault();
731
                transfer_order_popup( $(this).data("ordernumber"));
755
                transfer_order_popup( $(this).data("ordernumber"));
732
            });
756
            });
757
758
            $(".edit_note").on("click", function(e) {
759
                e.preventDefault();
760
                var ordernumber = $(this).data("ordernumber");
761
                var note_type = $(this).data("note_type");
762
                var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
763
                var note_text = $( "#" + note_type + "-note-" + ordernumber ).html();
764
                $("#noteEditor .modal-title").text(modalTitle);
765
                $("#ordernumber").val( ordernumber );
766
                $("#ordernotes").html( note_text );
767
                $("#type").val( note_type );
768
                $("#noteEditor").modal("show");
769
            });
770
771
             $("#noteEditor").on('hidden.bs.modal', function (e) {
772
                $("#noteEditorLabel").html("");
773
                $("#noteEditor .modal-title").text("");
774
                $("#ordernotes").html( "" );
775
                $("#ordernumber").val("");
776
                $("#type").val("");
777
            });
778
733
        });
779
        });
734
    </script>
780
    </script>
735
781
736
- 

Return to bug 20969