Owen Leonard
1c8c906119
This patch updates acquisitions templates so that fieldsets with the
"action" class are placed outside the form's main fieldset. A couple of
minor changes have been made to related CSS.
To test, apply the patch and rebuild the staff interface CSS. Go to
acquisitions and check the following pages to confirm that changes to
form structure look correct:
- Open the "Late orders" page from the left-hand sidebar menu and check
the form in the sidebar.
- Open the "Orders search" form in the search header and submit the form
without specifying any search criteria. This should bring up a blank
orders search form.
- Open the "Invoices" page from the left-hand sidebar menu. Check the
form in the sidebar.
- Perform an invoice search which will return results.
- View one of the invoices returned by your search.
- On the invoice detail age, the "Save" button associated with the
invoice details at the top should look correct.
- There should be a box below that with the heading "Adjustments" and
a link to add an adjustment.
- When you click "Add an adjustment," a form should be displayed with
the correct controls at the bottom. Clicking "Cancel" should hide
the form.
- Click the "Manage invoice files" link, and check the form on that
page.
- Locate a vendor and view its details.
- Check the "Uncertain prices" page, linked from the menu in the
left-hand sidebar.
- Open the "Baskets" page from the left-hand sidebar. Click the "Add
to basket" button for one of the existing baskets.
- Click "From existing orders (copy)". Check that this form looks
correct.
- Open the "Basket groups" page from the left-hand sidebar menu.
- Click "New basket group" and check that form.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
433 lines
20 KiB
Text
433 lines
20 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% USE Branches %]
|
|
[% USE TablesSettings %]
|
|
[% USE Price %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Late orders › Acquisitions › Koha</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_lateorders" class="acq">
|
|
[% WRAPPER 'header.inc' %]
|
|
[% INCLUDE 'acquisitions-search.inc' %]
|
|
[% END %]
|
|
|
|
|
|
[% WRAPPER 'sub-header.inc' %]
|
|
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
|
|
<ol>
|
|
<li>
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
</li>
|
|
<li>
|
|
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
|
|
</li>
|
|
<li>
|
|
<a href="#" aria-current="page">Late orders</a>
|
|
</li>
|
|
</ol>
|
|
</nav>
|
|
[% END %]
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
<h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1>
|
|
<div id="acqui_lateorders" class="page-section">
|
|
|
|
[% 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.size %]
|
|
<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="[% bookseller_filter.id | 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 %]
|
|
[% SET total = 0 %]
|
|
[% SET total_quantity = 0 %]
|
|
[% IF bookseller_filter %]
|
|
<p><a id="CheckAll" href="#"><i class="fa fa-check"></i> Check all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Uncheck all</a></p>
|
|
[% END %]
|
|
<table id="late_orders">
|
|
<thead>
|
|
<tr>
|
|
<th class="NoSort"></th>
|
|
<th>Order line</th>
|
|
<th>Order date</th>
|
|
<th>Estimated delivery date</th>
|
|
<th>Vendor</th>
|
|
<th class="anti-the">Information</th>
|
|
<th>Quantity</th>
|
|
<th>Total cost</th>
|
|
<th>Basket</th>
|
|
<th>Basket group</th>
|
|
<th>Library</th>
|
|
<th>Budget</th>
|
|
<th>Fund</th>
|
|
<th>Claims count</th>
|
|
<th>Claimed date</th>
|
|
<th>Internal note</th>
|
|
<th>Vendor note</th>
|
|
<th>ISBN</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH lateorder IN lateorders %]
|
|
<tr>
|
|
<td>
|
|
<input type="checkbox" value="[% lateorder.ordernumber | html %]" data-booksellerid="[% lateorder.basket.booksellerid | html %]" name="ordernumber">
|
|
</td>
|
|
<td>
|
|
[% lateorder.ordernumber | $raw %]
|
|
</td>
|
|
<td data-order="[% lateorder.basket.closedate | html %]">
|
|
[% lateorder.basket.closedate | $KohaDates %] ([% lateorder.basket.late_since_days | html %] days)
|
|
</td>
|
|
[% IF lateorder.get_column('estimated_delivery_date') %]
|
|
[% SET estimated_delivery_date = lateorder.get_column('estimated_delivery_date') %]
|
|
[% ELSIF lateorder.get_column('calculated_estimated_delivery_date') %]
|
|
[% SET estimated_delivery_date = lateorder.get_column('calculated_estimated_delivery_date') %]
|
|
[% END %]
|
|
<td data-order="[% estimated_delivery_date | html %]">
|
|
<p class="delivery_date">
|
|
<span>[% estimated_delivery_date | $KohaDates %]</span>
|
|
[% IF CAN_user_acquisition_order_manage %]
|
|
<a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-delivery_date="[% estimated_delivery_date | html %]" id="delivery_date_[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date">
|
|
<i class="fa fa-pencil"></i> Edit
|
|
</a>
|
|
[% END %]
|
|
</p>
|
|
</td>
|
|
<td>
|
|
[% lateorder.basket.bookseller.name | html %]
|
|
([% lateorder.basket.bookseller.id | html %])
|
|
</td>
|
|
<td>
|
|
<span class="title">[% INCLUDE 'biblio-title.inc' biblio=lateorder.biblio link=1 %]</span>
|
|
[% IF ( lateorder.biblio.author ) %]<br/><em>Author:</em> [% lateorder.biblio.author | html %][% END %]
|
|
[% IF ( lateorder.biblio.biblioitem.publishercode ) %]
|
|
<br/><em>Published by:</em> [% lateorder.biblio.biblioitem.publishercode | html %]
|
|
[% IF ( lateorder.biblio.biblioitem.publicationyear ) %]
|
|
<em> in </em>[% lateorder.biblio.biblioitem.publicationyear | html %]
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% lateorder.quantity | html %]
|
|
[% SET total_quantity = total_quantity + lateorder.quantity %]
|
|
</td>
|
|
<td>
|
|
[% SET subtotal = (lateorder.quantity - lateorder.quantityreceived) * lateorder.rrp %]
|
|
[% SET total = total + subtotal %]
|
|
[% lateorder.rrp | html %]x[% lateorder.quantity - lateorder.quantityreceived | html %] = [% subtotal | $Price %]
|
|
</td>
|
|
<td>
|
|
[% IF ( CAN_user_acquisition_order_manage ) %]
|
|
<a href="basket.pl?basketno=[% lateorder.basketno | uri %]" title="basket">[% lateorder.basket.basketname | html %] ([% lateorder.basketno | html %])</a>
|
|
[% ELSE %]
|
|
[% lateorder.basket.basketname | html %] ([% lateorder.basketno | html %])
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF ( lateorder.basket.basketgroupid ) %]
|
|
[% IF ( CAN_user_acquisition_group_manage ) %]
|
|
<a href="basketgroup.pl?op=add&booksellerid=[% lateorder.basket.booksellerid | uri %]&basketgroupid=[% lateorder.basket.basketgroupid | uri %]" title="basketgroup">[% lateorder.basket.basket_group.name | html %] ([% lateorder.basket.basketgroupid | html %])</a>
|
|
[% ELSE %]
|
|
[% lateorder.basket.basket_group.name | html %] ([% lateorder.basket.basketgroupid | html %])</a>
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>[% Branches.GetName( lateorder.basket.authorizer.branchcode ) | html %]
|
|
</td>
|
|
<td>[% lateorder.fund.budget.budget_period_description | html %]</td>
|
|
<td>[% lateorder.fund.budget_name | html %]</td>
|
|
<td>[% lateorder.claims.count | html %]</td>
|
|
<td data-order="[% lateorder.claims.last.claimed_on | html %]">
|
|
[% FOR claim IN lateorder.claims %]
|
|
[% claim.claimed_on | $KohaDates %]
|
|
[% UNLESS loop.last %]<br/>[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF lateorder.order_internalnote %]
|
|
<p class="ordernote">
|
|
<span id="internal-note-[% lateorder.ordernumber | html %]">[% lateorder.order_internalnote | html %]</span>
|
|
<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=internal" title="Edit internal note">
|
|
<i class="fa fa-pencil"></i> Edit internal note
|
|
</a>
|
|
</p>
|
|
[% ELSE %]
|
|
<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=internal" title="Add internal note">
|
|
<i class="fa fa-plus"></i> Add internal note
|
|
</a>
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF lateorder.order_vendornote %]
|
|
<p class="ordernote">
|
|
<span id="vendor-note-[% lateorder.ordernumber | html %]">[% lateorder.order_vendornote | html %]</span>
|
|
<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=vendor" title="Edit vendor note">
|
|
<i class="fa fa-pencil"></i> Edit vendor note
|
|
</a>
|
|
</p>
|
|
[% ELSE %]
|
|
<a class="edit_note noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% lateorder.ordernumber | html %]&type=vendor" title="Add vendor note">
|
|
<i class="fa fa-plus"></i> Add vendor note
|
|
</a>
|
|
[% END %]
|
|
</td>
|
|
<td>[% lateorder.biblio.biblioitem.isbn | $raw %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
<tr>
|
|
<th colspan="6">Total</th>
|
|
<th>[% total_quantity | html %]</th>
|
|
<th>[% total | $Price %]</th>
|
|
<th colspan="10"> </th>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
|
|
<fieldset class="action">
|
|
<div class="btn-group">
|
|
<a id="exportbutton" class="btn btn-default" href="/cgi-bin/koha/acqui/lateorders-export.pl"><i class="fa fa-download"></i> Export as CSV</a>
|
|
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
|
|
<ul class="dropdown-menu" id="export-csv-menu">
|
|
<li><a href="#">Default</a></li>
|
|
[% IF csv_profiles.count %]
|
|
[% FOR csv IN csv_profiles %]
|
|
<li><a href="#" data-value="[% csv.export_format_id | html %]">[% csv.profile | html %]</a></li>
|
|
[% END %]
|
|
[% END %]
|
|
</ul>
|
|
</div>
|
|
|
|
<input type="submit" class="btn btn-default" value="Claim order" />
|
|
</fieldset>
|
|
</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="flatpickr" data-date_to="to"/>
|
|
<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="flatpickr" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
|
|
<li><label for="booksellerid">Vendor:</label>
|
|
<select id="booksellerid" tabindex="" name="booksellerid">
|
|
<option value=""></option>
|
|
[% FOREACH bookseller IN booksellers %]
|
|
[% IF bookseller.id == bookseller_filter.id %]
|
|
<option value="[% bookseller.id | html %]" selected="selected">[% bookseller.name | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% bookseller.id | html %]">[% bookseller.name | html %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
|
|
</form>
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div>
|
|
|
|
<!-- Modal for editing vendor and internal notes -->
|
|
<div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel">
|
|
<div class="modal-dialog" role="document">
|
|
<form id="modify_order_notes" action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
|
<h4 class="modal-title" id="noteEditorLabel">Order note</h4>
|
|
</div>
|
|
<div class="modal-body">
|
|
<textarea id="ordernotes" name="ordernotes" rows="3" cols="30" class="focus">[% ordernotes | html %]</textarea>
|
|
<input type="hidden" id="notes_ordernumber" name="ordernumber" value="" />
|
|
<input type="hidden" name="op" value="save" />
|
|
<input type="hidden" id="type" name="type" value="" />
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="submit" class="btn btn-default">Save</button>
|
|
<button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Modal for editing estimated delivery date -->
|
|
<div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel">
|
|
<div class="modal-dialog" role="document">
|
|
<form id="modify_estimated_delivery_date" action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
|
<h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
|
|
</div>
|
|
<div class="modal-body">
|
|
<input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | html %]"/>
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
<input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
|
|
<input type="hidden" name="op" value="save" />
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="submit" class="btn btn-default">Save</button>
|
|
<button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/acquisitions-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% INCLUDE 'columns_settings.inc' %]
|
|
[% 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 table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'lateorders', 'late_orders', 'json' ) | $raw %];
|
|
late_orderst = KohaTable("late_orders", {
|
|
"sorting": [[ 1, "asc" ]],
|
|
"sPaginationType": "full",
|
|
"bAutoWidth": false,
|
|
"fnDrawCallback": function() {
|
|
if ( typeof late_orderst != 'undefined' ) {
|
|
check_uncheck();
|
|
$('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
|
|
};
|
|
}
|
|
}, table_settings );
|
|
$('input:checkbox[name=ordernumber]').bind('click', check_uncheck);
|
|
$('#CheckAll').click(function(e){
|
|
e.preventDefault();
|
|
$("#late_orders input:checkbox").prop("checked", true);
|
|
});
|
|
$('#CheckNone').click(function(e){
|
|
e.preventDefault();
|
|
$("#late_orders input:checkbox").prop("checked", false);
|
|
});
|
|
|
|
// Generates a dynamic link for exporting the selection's data as CSV
|
|
$("#exportbutton, #export-csv-menu a").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;
|
|
}
|
|
|
|
var url = $('#exportbutton').attr('href') + '?';
|
|
// Building the url from currently checked boxes
|
|
for (var i = 0; i < selected.length; i++) {
|
|
url += '&ordernumber=' + selected[i].value;
|
|
}
|
|
if($(this).attr("data-value")) {
|
|
url += '&csv_profile=' + $(this).attr("data-value");
|
|
}
|
|
// And redirecting to the CSV page
|
|
location.href = url;
|
|
return false;
|
|
});
|
|
|
|
$(".edit_note").on("click", function(e) {
|
|
e.preventDefault();
|
|
var ordernumber = $(this).data("ordernumber");
|
|
var note_type = $(this).data("note_type");
|
|
var modalTitle = _("%s (order number %s)").format($(this).attr("title"), ordernumber);
|
|
var note_text = $( "#" + note_type + "-note-" + ordernumber ).html();
|
|
$("#noteEditor .modal-title").text(modalTitle);
|
|
$("#notes_ordernumber").val( ordernumber );
|
|
$("#ordernotes").html( note_text );
|
|
$("#type").val( note_type );
|
|
$("#noteEditor").modal("show");
|
|
$("#ordernotes").focus();
|
|
});
|
|
|
|
$("#noteEditor").on('hidden.bs.modal', function (e) {
|
|
$("#noteEditorLabel").html("");
|
|
$("#noteEditor .modal-title").text("");
|
|
$("#ordernotes").html( "" );
|
|
$("#notes_ordernumber").val("");
|
|
$("#type").val("");
|
|
});
|
|
|
|
$(".edit_delivery_date").on("click", function(e) {
|
|
e.preventDefault();
|
|
var ordernumber = $(this).data("ordernumber");
|
|
var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
|
|
var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date");
|
|
const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr;
|
|
estimated_delivery_date.setDate( delivery_date );
|
|
$("#dateEditor .modal-title").text(modalTitle);
|
|
$("#date_ordernumber").val(ordernumber);
|
|
$("#dateEditor").modal("show");
|
|
});
|
|
|
|
$("#dateEditor").on('hidden.bs.modal', function (e) {
|
|
$("#dateEditorLabel").html("");
|
|
$("#dateEditor .modal-title").text("");
|
|
$("#estimated_delivery_date").html( "" );
|
|
$("#date_ordernumber").val("");
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|