f3011690fc
Edit: Fixing 'clas' typo in addorderiso2709.tt
Edit: Adding actions class to td
Edit: Fixing js error
Edit: circ/reserveratios.tt updated so that the plus icon doesn't show
if there is no link
Edit: fixing logic in circ/reserveratios.tt
Edit: merge conflicts
Edit: updating buttons to bootstrap 3, which i believe fixes the problem
in comment 16
To test:
1) Go to Acqui -> find a vendor -> view a basket
2) Click add to basket -> fill in 'for an existing record' and hit search
3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons
4) Click Order
5) Click add item when you are redirected to the New order page (no need to fill in any details)
6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons
7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch)
8) Confirm that 'Order' shows as a button with appropriate icon
9) Go back to your basket and click add to basket -> from an external source
10) fill in any fields and click search to bring up results
11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row
12) Go back to your basket and click add to basket -> from a staged file
13) 'Add orders' should now show as a button with appropriate icon
14) Go back to your basket and click add to basket -> from titles with highest hold ratios
15) 'X to order' should now show as a button with appropriate icon
Sponsored-by: Catalyst IT
Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
137 lines
6.5 KiB
Text
137 lines
6.5 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% USE Branches %]
|
|
[% USE Koha %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Serials [% biblionumber | html %]</title>
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_newordersubscription" 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/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> › Add order from a subscription</div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
<h2>Serials subscriptions</h2>
|
|
[% IF (done_searched) %]
|
|
<label for="show_only_renewed">
|
|
<input type="checkbox" style="vertical-align: middle;" id="show_only_renewed" />
|
|
Show only renewed
|
|
</label>
|
|
[% IF (subs_loop) %]
|
|
<table id="srlt">
|
|
<thead>
|
|
<tr>
|
|
<th>ISSN</th>
|
|
<th class="anti-the">Title</th>
|
|
<th> Notes </th>
|
|
<th>Vendor</th>
|
|
<th>Library</th>
|
|
<th>Call number</th>
|
|
<th class="title-string">Expiration date</th>
|
|
<th class="NoSort"></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH sub IN subs_loop %]
|
|
<tr data-reneweddate="[% sub.reneweddate | html %]" >
|
|
<td>[% sub.issn | html %]</td>
|
|
<td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %]
|
|
---
|
|
[% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a>
|
|
</td>
|
|
<td>[% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %]
|
|
[% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF (sub.vendorname) %][% sub.vendorname | html %][% END %]
|
|
</td>
|
|
<td>
|
|
[% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %]
|
|
</td>
|
|
<td>
|
|
[% IF (sub.callnumber) %][% sub.callnumber | html %][% END %]
|
|
</td>
|
|
<td>
|
|
[% IF (sub.enddate) %]
|
|
<span title="[% sub.enddate | html %]">[% sub.enddate | $KohaDates %]</span>
|
|
[% ELSE %]
|
|
<span title="0000-00-00"></span>
|
|
[% END %]
|
|
</td>
|
|
<td class="actions">
|
|
[% IF (sub.alreadyOnOrder) %]
|
|
Outstanding order
|
|
[% END %]
|
|
[% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
|
|
<a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&biblionumber=[% sub.biblionumber | uri %]&from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
|
|
<i class="fa fa-plus"></i> Order
|
|
</a>
|
|
[% ELSE %]
|
|
<a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSE %]
|
|
<p>Sorry, there is no result for your search.</p>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<p>Use the search form on the left to find subscriptions.</p>
|
|
[% END %]
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
[% INCLUDE 'subscriptions-search.inc' %]
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div> <!-- /.row -->
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/acquisitions-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script>
|
|
function updateRowsVisibility(show_only_renewed) {
|
|
if ( show_only_renewed ) {
|
|
$("#srlt [data-reneweddate='']").hide();
|
|
} else {
|
|
$("#srlt > tbody > tr").show();
|
|
}
|
|
}
|
|
|
|
$(document).ready(function() {
|
|
$("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
|
|
{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] }
|
|
],
|
|
"sPaginationType": "four_button"
|
|
}));
|
|
|
|
$("#show_only_renewed").click(function(){
|
|
updateRowsVisibility( $(this).is(":checked") );
|
|
});
|
|
$("#show_only_renewed").prop('checked', false);
|
|
updateRowsVisibility(false);
|
|
|
|
$("#advsearch_form").show();
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|