Kyle M Hall
d8696702ce
Some library would like to delay the importing of invoices until a time of their choosing. The invoices should be imported into the database as they do now, but the invoice processing should be skipped. Instead, any invoice file with a status of 'new' should have an 'Import' button to process the invoice. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Enable the new syspref EdifactInvoiceImport 4) Run the edi cronjob to import a new invoice file 5) View EDI messages table at /acqui/edifactmsgs.pl 6) Note the invoice files is not processes, and retains the status of 'new' 7) Use the 'import' button to process the invoice 8) Note the invoice is now marked 'received' and the 'import' button is gone 9) Verify the invoice was actually processes Signed-off-by: Debi Stears <DDStears@washoecounty.us> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
155 lines
5 KiB
Text
155 lines
5 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › EDIFACT messages</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<style>
|
|
#EDI_modal { width : 80%; } @media (max-width: 767px) { #EDI_modal { margin: 0; width : auto; } }
|
|
</style>
|
|
</head>
|
|
|
|
<body id="acq_edifactmsgs" class="acq">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'acquisitions-search.inc' %]
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
› <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
|
|
› <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a>
|
|
</div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
|
|
<h1>EDIFACT messages</h1>
|
|
<div id="acqui_edifactmsgs">
|
|
|
|
[% IF ( messages ) %]
|
|
<table id="edi_msgs">
|
|
<thead>
|
|
<tr>
|
|
<th>Type</th>
|
|
<th class="title-string">Transferred</th>
|
|
<th>Status</th>
|
|
<th>Vendor</th>
|
|
<th>Details</th>
|
|
<th>Filename</th>
|
|
<th>Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH msg IN messages %]
|
|
<tr>
|
|
<td>[% msg.message_type | html %]</td>
|
|
<td><span title="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</span></td>
|
|
<td>[% msg.status | html %]</td>
|
|
<td>
|
|
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | uri %]">
|
|
[% msg.vendor.name | html %]
|
|
</a>
|
|
</td>
|
|
<td>
|
|
[% IF msg.message_type == 'QUOTE' || msg.message_type == 'ORDERS' %]
|
|
[% IF msg.basketno %]
|
|
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% msg.basketno.basketno | uri %]">
|
|
Basket: [% msg.basketno.basketno | html %]
|
|
</a>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<!-- Assuming invoices -->
|
|
<a href="/cgi-bin/koha/acqui/invoices.pl?message_id=[% msg.id | uri %]&op=do_search">
|
|
Invoices
|
|
</a>
|
|
[% END %]
|
|
</td>
|
|
<td>[% msg.filename | html %]</td>
|
|
|
|
<td class="actions">
|
|
<a class="btn btn-default btn-xs view_message" target="_blank" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id | html %]"><i class="fa fa-search"></i> View message</a>
|
|
<a class="btn btn-default btn-xs delete_msg" href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=delete&message_id=[% msg.id | html %]"><i class="fa fa-trash"></i> Delete</a>
|
|
[% IF msg.status == 'new' %]
|
|
<a class="btn btn-default btn-xs import_msg" href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=import&message_id=[% msg.id | html %]"><i class="fa fa-cog"></i> Import</a>
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
|
|
</tbody>
|
|
</table>
|
|
|
|
<!-- Modal to display EDIFACT messages -->
|
|
<div class="modal" id="EDI_modal" tabindex="-1" role="dialog" aria-labelledby="EDI_modal_label" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
|
|
<h3 id="EDI_modal_label">EDIFACT message</h3>
|
|
</div>
|
|
<div class="modal-body">
|
|
<div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading </div>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
[% ELSE %]
|
|
<div class="dialog message">There are no EDIFACT messages.</div>
|
|
[% END %]
|
|
|
|
</div> <!-- /#acqui_edifactmsgs -->
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</aside>
|
|
</div>
|
|
</div> <!-- /.row -->
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/acquisitions-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script>
|
|
$(document).ready(function() {
|
|
$('#edi_msgs').dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
'aaSorting': [[1, "desc" ]],
|
|
'sPaginationType': "full",
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] }
|
|
]
|
|
}));
|
|
|
|
var EDIModal = $("#EDI_modal");
|
|
var EDIModalBody = $("#EDI_modal .modal-body");
|
|
|
|
$(".view_message").on("click", function(e){
|
|
e.preventDefault();
|
|
var page = $(this).attr("href");
|
|
EDIModalBody.load(page + " #edimsg");
|
|
EDIModal.modal("show");
|
|
});
|
|
EDIModal.on("click",".closebtn",function(e){
|
|
e.preventDefault();
|
|
EDIModal.modal("hide");
|
|
});
|
|
EDIModal.on("hidden.bs.modal", function(){
|
|
EDIModalBody.html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
|
|
});
|
|
$(".delete_msg").on("click",function(){
|
|
return confirm(_("Are you sure you want to delete this message?"));
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|