Lines 248-269
Link Here
|
248 |
<br /> |
248 |
<br /> |
249 |
[% IF ( order.order_internalnote ) %] |
249 |
[% IF ( order.order_internalnote ) %] |
250 |
<p class="ordernote" |
250 |
<p class="ordernote" |
251 |
><strong>Internal note: </strong>[% order.order_internalnote | html %] [<a |
251 |
><span id="internal-note-[% order.ordernumber | html %]">[% order.order_internalnote | html %]</span> |
252 |
href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | uri %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=internal" |
252 |
<a |
253 |
>Change internal note</a |
253 |
class="edit_note no-export" |
254 |
>]</p |
254 |
data-ordernumber="[% order.ordernumber | html %]" |
255 |
> |
255 |
data-note_type="internal" |
|
|
256 |
href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | html %]&type=internal" |
257 |
title="Edit internal note" |
258 |
> |
259 |
<i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit internal note |
260 |
</a> |
261 |
</p> |
256 |
[% ELSE %] |
262 |
[% ELSE %] |
257 |
[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | uri %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=internal" |
263 |
<a |
258 |
>Add internal note</a |
264 |
class="edit_note no-export" |
259 |
>] |
265 |
data-ordernumber="[% order.ordernumber | html %]" |
|
|
266 |
data-note_type="internal" |
267 |
href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | html %]&type=internal" |
268 |
title="Add internal note" |
269 |
> |
270 |
<i class="fa fa-plus"></i> Add internal note |
271 |
</a> |
260 |
[% END %] |
272 |
[% END %] |
261 |
[% IF ( order.order_vendornote ) %] |
273 |
[% IF ( order.order_vendornote ) %] |
262 |
<p class="ordernote"><strong>Vendor note: </strong>[% order.order_vendornote | html %]</p> |
274 |
<p class="ordernote"> |
|
|
275 |
<span id="vendor-note-[% order.ordernumber | html %]">[% order.order_vendornote | html %]</span> |
276 |
<a |
277 |
class="edit_note no-export" |
278 |
data-ordernumber="[% order.ordernumber | html %]" |
279 |
data-note_type="vendor" |
280 |
href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | html %]&type=vendor" |
281 |
title="Edit vendor note" |
282 |
> |
283 |
<i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor note |
284 |
</a> |
285 |
</p> |
263 |
[% ELSE %] |
286 |
[% ELSE %] |
264 |
[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | uri %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=vendor" |
287 |
<a |
265 |
>Add vendor note</a |
288 |
class="edit_note no-export" |
266 |
>] |
289 |
data-ordernumber="[% order.ordernumber | html %]" |
|
|
290 |
data-note_type="vendor" |
291 |
href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% order.ordernumber | html %]&type=vendor" |
292 |
title="Add vendor note" |
293 |
> |
294 |
<i class="fa fa-plus"></i> Add vendor note |
295 |
</a> |
267 |
[% END %] |
296 |
[% END %] |
268 |
</td> |
297 |
</td> |
269 |
<td> |
298 |
<td> |
Lines 333-338
Link Here
|
333 |
<!-- /.modal-dialog --> |
362 |
<!-- /.modal-dialog --> |
334 |
</div> |
363 |
</div> |
335 |
<!-- /.modal --> |
364 |
<!-- /.modal --> |
|
|
365 |
<!-- Modal for editing vendor and internal notes --> |
366 |
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel"> |
367 |
<div class="modal-dialog"> |
368 |
<form id="modify_order_notes" action="/cgi-bin/koha/acqui/modordernotes.pl" method="post"> |
369 |
[% INCLUDE 'csrf-token.inc' %] |
370 |
<div class="modal-content"> |
371 |
<div class="modal-header"> |
372 |
<h1 class="modal-title" id="noteEditorLabel">Order note</h1> |
373 |
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> |
374 |
</div> |
375 |
<div class="modal-body"> |
376 |
<textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes | html %]</textarea> |
377 |
<input type="hidden" id="notes_ordernumber" name="ordernumber" value="" /> |
378 |
<input type="hidden" name="op" value="cud-save" /> |
379 |
<input type="hidden" id="type" name="type" value="" /> |
380 |
</div> |
381 |
<div class="modal-footer"> |
382 |
<button type="submit" class="btn btn-primary">Save</button> |
383 |
<button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button> |
384 |
</div> |
385 |
</div> |
386 |
<!-- /.modal-content --> |
387 |
</form> |
388 |
<!-- /#modify_order_notes --> |
389 |
</div> |
390 |
<!-- /.modal-dialog --> |
391 |
</div> |
336 |
|
392 |
|
337 |
[% IF (invoiceclosedate) %] |
393 |
[% IF (invoiceclosedate) %] |
338 |
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a> |
394 |
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a> |
Lines 495-523
Link Here
|
495 |
if ( internal_note != null && internal_note != '' ) { |
551 |
if ( internal_note != null && internal_note != '' ) { |
496 |
result += '<p class="ordernote"><strong>' |
552 |
result += '<p class="ordernote"><strong>' |
497 |
+ _("Internal note: ") |
553 |
+ _("Internal note: ") |
498 |
+ '</strong>' + escape_str(internal_note) |
554 |
+ '</strong>' |
499 |
+ ' [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
555 |
+ '<span id="internal-note-' + escape_str(row.order_id) + '">' + escape_str(row.internal_note) + '</span>' |
500 |
+ encodeURIComponent(row.order_id) + '&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]' |
556 |
+ ' <a' |
501 |
+ '&type=internal">' + _("Change internal note") + '</a>]</p>'; |
557 |
+ ' class="edit_note no-export"' |
|
|
558 |
+ ' data-ordernumber="' + escape_str(row.order_id) + '"' |
559 |
+ ' data-note_type="internal"' |
560 |
+ ' href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
561 |
+ encodeURIComponent(row.order_id) |
562 |
+ '&type=internal"' |
563 |
+ ' title="' + _("Edit internal note") + '"' |
564 |
+ '>' |
565 |
+ '<i class="fa-solid fa-pencil" aria-hidden="true"></i> ' |
566 |
+ _("Edit internal note") |
567 |
+ '</a>' |
568 |
+ '</p>'; |
502 |
} |
569 |
} |
503 |
else { |
570 |
else { |
504 |
result += ' [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
571 |
result += '<p><a' |
505 |
+ encodeURIComponent(row.order_id) + '&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]' |
572 |
+ ' class="edit_note no-export"' |
506 |
+ '&type=internal">' + _("Add internal note") + '</a>]'; |
573 |
+ ' data-ordernumber="' + escape_str(row.order_id) + '"' |
|
|
574 |
+ ' data-note_type="internal"' |
575 |
+ ' href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
576 |
+ encodeURIComponent(row.order_id) |
577 |
+ '&type=internal"' |
578 |
+ ' title="' + _("Add internal note") + '"' |
579 |
+ '>' |
580 |
+ '<i class="fa fa-plus"></i> ' |
581 |
+ _("Add internal note") |
582 |
+ '</a></p>'; |
507 |
} |
583 |
} |
508 |
|
584 |
|
509 |
var vendor_note = row.vendor_note; |
585 |
var vendor_note = row.vendor_note; |
510 |
if ( vendor_note != null && vendor_note != '' ) { |
586 |
if ( vendor_note != null && vendor_note != '' ) { |
511 |
result += '<p class="ordernote"><strong>' |
587 |
result += '<p class="ordernote"><strong>' |
512 |
+ _("Vendor note: ") |
588 |
+ _("Vendor note: ") |
513 |
+ '</strong>' + escape_str(vendor_note) + '</p>'; |
589 |
+ '</strong>' |
|
|
590 |
+ '<span id="vendor-note-' + escape_str(row.order_id) + '">' + escape_str(vendor_note) + '</span>' |
591 |
+ ' <a' |
592 |
+ ' class="edit_note no-export"' |
593 |
+ ' data-ordernumber="' + escape_str(row.order_id) + '"' |
594 |
+ ' data-note_type="vendor"' |
595 |
+ ' href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
596 |
+ encodeURIComponent(row.order_id) |
597 |
+ '&type=vendor"' |
598 |
+ ' title="' + _("Edit vendor note") + '"' |
599 |
+ '>' |
600 |
+ '<i class="fa-solid fa-pencil" aria-hidden="true"></i> ' |
601 |
+ _("Edit vendor note") |
602 |
+ '</a>' |
603 |
+ '</p>'; |
514 |
} |
604 |
} |
515 |
else { |
605 |
else { |
516 |
result += ' [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
606 |
result += ' <p><a' |
517 |
+ encodeURIComponent(row.order_id) + '&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]' |
607 |
+ ' class="edit_note no-export"' |
518 |
+ '&type=vendor">' + _("Add vendor note") + '</a>]'; |
608 |
+ ' data-ordernumber="' + escape_str(row.order_id) + '"' |
|
|
609 |
+ ' data-note_type="vendor"' |
610 |
+ ' href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=' |
611 |
+ encodeURIComponent(row.order_id) |
612 |
+ '&type=vendor"' |
613 |
+ ' title="' + _("Add vendor note") + '"' |
614 |
+ '>' |
615 |
+ '<i class="fa fa-plus"></i> ' |
616 |
+ _("Add vendor note") |
617 |
+ '</a></p>'; |
519 |
} |
618 |
} |
520 |
|
|
|
521 |
return result; |
619 |
return result; |
522 |
}, |
620 |
}, |
523 |
"orderable": true, |
621 |
"orderable": true, |
Lines 686-691
Link Here
|
686 |
$('.selOrder', row.node()).prop('checked', true); |
784 |
$('.selOrder', row.node()).prop('checked', true); |
687 |
} |
785 |
} |
688 |
}); |
786 |
}); |
|
|
787 |
setupNoteEditorHandlers(); |
689 |
}); |
788 |
}); |
690 |
|
789 |
|
691 |
$("#dataPreview").on("hidden.bs.modal", function(){ |
790 |
$("#dataPreview").on("hidden.bs.modal", function(){ |
Lines 719-724
Link Here
|
719 |
+ "ordernumber=" + ordernumber |
818 |
+ "ordernumber=" + ordernumber |
720 |
window.open(url, 'TransferOrder'); |
819 |
window.open(url, 'TransferOrder'); |
721 |
} |
820 |
} |
|
|
821 |
function setupNoteEditorHandlers() { |
822 |
$(".edit_note").on("click", function(e) { |
823 |
e.preventDefault(); |
824 |
var ordernumber = $(this).data("ordernumber"); |
825 |
var note_type = $(this).data("note_type"); |
826 |
var modalTitle = _("%s (order number %s)").format($(this).attr("title"), ordernumber); |
827 |
var note_text = $( "#" + note_type + "-note-" + ordernumber ).html(); |
828 |
$("#noteEditor .modal-title").text(modalTitle); |
829 |
$("#notes_ordernumber").val( ordernumber ); |
830 |
$("#ordernotes").html( note_text ); |
831 |
$("#type").val( note_type ); |
832 |
$("#noteEditor").modal("show"); |
833 |
$("#ordernotes").focus(); |
834 |
}); |
835 |
$("#noteEditor").on('hidden.bs.modal', function (e) { |
836 |
$("#noteEditorLabel").html(""); |
837 |
$("#noteEditor .modal-title").text(""); |
838 |
$("#ordernotes").html( "" ); |
839 |
$("#notes_ordernumber").val(""); |
840 |
$("#type").val(""); |
841 |
}); |
842 |
} |
843 |
setupNoteEditorHandlers(); |
722 |
</script> |
844 |
</script> |
723 |
[% END %] |
845 |
[% END %] |
724 |
|
846 |
|
725 |
- |
|
|