Owen Leonard
52028d9932
The CSS for <div class="error"> is obsolete and should not be used. This patch removes the definition from the main CSS file and corrects instances of its use in the templates to the standard <div class="dialog alert">. To test: - In Acquisitions -> Late orders, locate an order from a vendor which doesn't have an email address. Selecting that order and clicking "Claim" should trigger an error dialog, "This vendor has no email." It should be styled correctly. - With AcqCreateItem set to "when placing an order," add to an existing order using the "From a new (empty) record" option. Add two items with identical barcodes and submit the form. A error should show at the top of the page. - With AcqCreateItem set to "when receiving an order," receive an order and add two items with identical barcodes. Submitting the form should trigger an error message at the top of the page. With the remaining cases I don't know how to trigger the errors in question, so a visual check of the changes may be required: - Administration -> Funds -> "You are not authorized to modify this fund" - Administration -> Search engine configuration (/admin/searchengine/elasticsearch/mappgings.pl) -> Various modification errors. - With the AutoEmailOpacUser preference set to "send," adding a patron without an email address can trigger an error, "This member has no email." - With plugins enabled, and installed, there are error messages displayed under various circumstances. Signed-off-by: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
260 lines
11 KiB
Text
260 lines
11 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% USE Branches %]
|
|
[% USE ColumnsSettings %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › Late orders</title>
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_lateorders" 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="lateorders.pl">Late orders</a></div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
<h1>[% IF ( Supplier ) %][% Supplier | html %] : [% END %]Late orders</h1>
|
|
<div id="acqui_lateorders">
|
|
|
|
[% IF error_claim %]
|
|
[% IF ( error_claim == "no_email" ) %]
|
|
<div class="dialog alert">This vendor has no email</div>
|
|
[% ELSIF ( error_claim == "no_order_selected" ) %]
|
|
<div class="dialog alert">No order selected</div>
|
|
[% ELSE %]
|
|
<div class="dialog alert">[% error_claim | html %]</div>
|
|
[% END %]
|
|
[% END %]
|
|
[% IF info_claim %]
|
|
<div class="dialog message">Email has been sent.</div>
|
|
[% END %]
|
|
[% IF ( lateorders ) %]
|
|
<form action="lateorders.pl" name="claim" method="post">
|
|
<input type="hidden" name="op" value="send_alert" />
|
|
<input type="hidden" name="delay" value="[% delay | html %]" />
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
|
[% IF ( letters ) %]
|
|
<p><label for="letter_code">Claim using notice: </label><select name="letter_code" id="letter_code">
|
|
[% FOREACH letter IN letters %]
|
|
<option value="[% letter.code | html %]">[% letter.name | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</p>
|
|
[% END %]
|
|
<table id="late_orders">
|
|
<thead>
|
|
<tr>
|
|
[% IF Supplier %]
|
|
<th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
|
|
[% ELSE %]
|
|
<th></th>
|
|
[% END %]
|
|
<th class="title-string">Order date</th>
|
|
<th class="title-string">Estimated delivery date</th>
|
|
<th>Vendor</th>
|
|
<th class="anti-the">Information</th>
|
|
<th>Total cost</th>
|
|
<th>Basket</th>
|
|
<th>Basket group</th>
|
|
<th>Library</th>
|
|
<th>Fund</th>
|
|
<th>Claims count</th>
|
|
<th class="title-string">Claimed date</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH lateorder IN lateorders %]
|
|
<tr>
|
|
<td>
|
|
<input type="checkbox" value="[% lateorder.ordernumber | html %]" data-booksellerid="[% lateorder.supplierid | html %]" name="ordernumber">
|
|
</td>
|
|
<td>
|
|
<span title="[% lateorder.orderdate | html %]">[% lateorder.orderdate | $KohaDates %] ([% lateorder.latesince | html %] days)</span>
|
|
</td>
|
|
<td>
|
|
[% IF ( lateorder.estimateddeliverydate ) %]
|
|
<span title="[% lateorder.estimateddeliverydate | html %]">[% lateorder.estimateddeliverydate | $KohaDates | html %]</span>
|
|
[% ELSE %]
|
|
<span title="0000-00-00"></span>
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% lateorder.supplier | html %]
|
|
([% lateorder.supplierid | html %])
|
|
</td>
|
|
<td>
|
|
<b>[% lateorder.title | html %]</b>
|
|
[% IF ( lateorder.author ) %]<br/><i>Author:</i> [% lateorder.author | html %][% END %]
|
|
[% IF ( lateorder.publisher ) %]
|
|
<br/><i>Published by:</i> [% lateorder.publisher | html %]
|
|
[% IF ( lateorder.publicationyear ) %]
|
|
<i> in </i>[% lateorder.publicationyear | html %]
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% lateorder.unitpricesupplier | html %]x[% lateorder.quantity | html %] =
|
|
[% lateorder.subtotal | html %]
|
|
</td>
|
|
<td>
|
|
[% IF ( CAN_user_acquisition_order_manage ) %]
|
|
<a href="basket.pl?basketno=[% lateorder.basketno | uri %]" title="basket">[% lateorder.basketname | html %] ([% lateorder.basketno | html %])</a>
|
|
[% ELSE %]
|
|
[% lateorder.basketname | html %] ([% lateorder.basketno | html %])
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF ( lateorder.basketgroupid ) %]
|
|
[% IF ( CAN_user_acquisition_group_manage ) %]
|
|
<a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid | uri %]&basketgroupid=[% lateorder.basketgroupid | uri %]" title="basketgroup">[% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a>
|
|
[% ELSE %]
|
|
[% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a>
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>[% Branches.GetName( lateorder.branch ) | html %]
|
|
</td>
|
|
<td>[% lateorder.budget | html %]
|
|
</td>
|
|
<td>[% lateorder.claims_count | html %]</td>
|
|
<td>
|
|
[% IF ( lateorder.claimed_date ) %]
|
|
<span title="[% lateorder.claimed_date | html %]">[% lateorder.claimed_date | $KohaDates %]</span>
|
|
[% ELSE %]
|
|
<span title="0000-00-00"></span>
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
<tr>
|
|
<th colspan="5">Total</th>
|
|
<th>[% total | html %]</th>
|
|
<th colspan="6"> </th>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
<div class="spacer"></div>
|
|
|
|
<p style="display:block;">
|
|
<input type="button" value="Export as CSV" id="ExportSelected" />
|
|
[% UNLESS lateorder.budget_lock %]
|
|
<input type="submit" value="Claim order" />
|
|
[% END %]
|
|
</p>
|
|
</form>
|
|
[% ELSE %]<p>There are no late orders.</p>
|
|
[% END %]
|
|
</div> <!-- /#acqui_lateorders -->
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
<form action="lateorders.pl" method="get">
|
|
<fieldset class="brief">
|
|
<h4>Filter results:</h4>
|
|
[% FOREACH ERROR_LOO IN ERROR_LOOP %]
|
|
[% IF ( ERROR_LOO.delay_digits ) %]<p class="error">The number of days ([% ERROR_LOO.bad_delay | html %]) must be a number between 0 and 999.</p>[% END %]
|
|
[% END %]
|
|
<ol>
|
|
<li><label for="delay">Order date:</label><input size="3" maxlength="3" id="delay" type="text" name="delay" value="[% delay | html %]" /> days ago</li>
|
|
<li><label for="from">Estimated delivery date from: </label>
|
|
<input type="text" size="10" id="from" name="estimateddeliverydatefrom" value="[% estimateddeliverydatefrom | html %]" class="datepickerfrom" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
<li><label for="to">To: </label>
|
|
<input type="text" size="10" id="to" name="estimateddeliverydateto" value="[% estimateddeliverydateto | html %]" class="datepickerto" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
|
|
<li><label for="booksellerid">Vendor:</label>
|
|
<select id="booksellerid" size="1" tabindex="" name="booksellerid">
|
|
<option value=""></option>
|
|
[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
|
|
[% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id | html %]" selected="selected">[% SUPPLIER_LOO.name | html %]</option>
|
|
[% ELSE %]<option value="[% SUPPLIER_LOO.id | html %]">[% SUPPLIER_LOO.name | html %]</option>[% END %]
|
|
[% END %]
|
|
</select>
|
|
</ol>
|
|
<fieldset class="action"><input type="submit" value="Filter" /></fieldset>
|
|
</fieldset>
|
|
</form>
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/acquisitions-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% INCLUDE 'columns_settings.inc' %]
|
|
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script>
|
|
var late_orderst;
|
|
function check_uncheck() {
|
|
var all_nodes = $(late_orderst.fnGetNodes());
|
|
if ( $(all_nodes).find("input:checkbox[name=ordernumber]:checked").length > 0) {
|
|
var booksellerid = $(all_nodes).find("input:checkbox[name=ordernumber]:checked:first").attr("data-booksellerid");
|
|
$(all_nodes).find("input:checkbox[name=ordernumber][data-booksellerid!="+booksellerid+"]").prop('disabled', true);
|
|
} else {
|
|
$("input:checkbox[name=ordernumber]").prop('disabled', false);
|
|
}
|
|
}
|
|
|
|
$(document).ready(function() {
|
|
|
|
var columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ) | $raw %];
|
|
late_orderst = KohaTable("late_orders", {
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
|
|
{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] }
|
|
],
|
|
"sPaginationType": "four_button",
|
|
"bAutoWidth": false,
|
|
"fnDrawCallback": function() {
|
|
if ( typeof late_orderst != 'undefined' ) {
|
|
check_uncheck();
|
|
$('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
|
|
};
|
|
}
|
|
}, columns_settings );
|
|
$('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
|
|
$('#CheckAll').click(function(){ $(late_orderst.fnGetNodes()).find("td").checkCheckboxes();});
|
|
$('#CheckNone').click(function(){ $(late_orderst.fnGetNodes()).find("td").unCheckCheckboxes();});
|
|
|
|
// Generates a dynamic link for exporting the selection's data as CSV
|
|
$("#ExportSelected").click(function() {
|
|
var all_nodes = $(late_orderst.fnGetNodes());
|
|
var selected = $(all_nodes).find("input[name='ordernumber']:checked");
|
|
|
|
if (selected.length == 0) {
|
|
alert(_("Please select at least one item to export."));
|
|
return false;
|
|
}
|
|
|
|
// Building the url from currently checked boxes
|
|
var url = '/cgi-bin/koha/acqui/lateorders-export.pl?op=export';
|
|
for (var i = 0; i < selected.length; i++) {
|
|
url += '&ordernumber=' + selected[i].value;
|
|
}
|
|
// And redirecting to the CSV page
|
|
location.href = url;
|
|
return false;
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|