58c652a0fc
This patch make inactive vendors really inactive.
That means an inactive vendor would not be able to add a basket / add an order.
Revised test plan
=================
1/ In the acquisition module create 2 vendors: 1 active and 1 inactive.
2/ On the acqui/booksellers.pl, acqui/uncertainprice.pl,
admin/aqcontract.pl and acqui/supplier.pl (pages which include the
acq toolbar), you should be able to, for both the 'active' as well
as the inactive vendor :
(a) add new basket
(b) add order items to the basket
Remark: This is *wrong*. You should be able to do so only for active
vendor.
3/ Apply the patch
4/ Go to the links in step #2 above and select the inactive vendor
you should no longer be able to:
(a) add new basket
(b) add order items to the basket
Remark: This is the *correct* behaviour
5/ No change should be noted for vendor marked "active", and should
be able to undertake operations 4 (a), 4 (b) and 4 (c).
Remark: This is the *correct* behaviour.
6/ run koha qa tests tool
Bug 12054: (follow-up) Inactive vendors should be inactive
Don't display "add order""block and buttons if the vendor is inactive.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
195 lines
10 KiB
Text
195 lines
10 KiB
Text
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Search for vendor [% supplier %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<style type="text/css">
|
|
#vendors td{
|
|
vertical-align: top;
|
|
}
|
|
</style>
|
|
<link rel="stylesheet" href="[% themelang %]/css/datatables.css" />
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
$("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
'sDom': 't',
|
|
'bPaginate': false,
|
|
'bFilter': false,
|
|
'bInfo': false,
|
|
"aaSorting": [[ 1, "asc" ]],
|
|
"aoColumnDefs": [
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] },
|
|
{ "sType": "title-numeric", "aTargets" : [ "title-numeric" ] },
|
|
{ 'aTargets': [-1], 'bSortable': false }
|
|
]
|
|
}));
|
|
$("#supplierlist").change(function() {
|
|
var id = $(this).find("option:selected").val();
|
|
window.location.href = "#" + id;
|
|
});
|
|
$(".modal").on("show", function(){
|
|
var basket = $(this).data("basketno");
|
|
var legend = _("Add order to basket %s").format(basket);
|
|
$(this).find("legend").html(legend);
|
|
});
|
|
});
|
|
//]]>
|
|
</script>
|
|
|
|
</head>
|
|
<body id="acq_booksellers" 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> › Search for vendor <em>[% supplier %]</em> </div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% INCLUDE 'acquisitions-toolbar.inc' %]
|
|
[% UNLESS ( count == 1 ) %]
|
|
<h1>You searched on <b>vendor [% supplier %],</b> [% count %] results found</h1>
|
|
[% END %]
|
|
[% IF ( loop_suppliers.size ) %]
|
|
[% UNLESS (count == 1) %]
|
|
<p>Choose a vendor in the list to jump directly to the right place.
|
|
<select id="supplierlist">
|
|
[% FOREACH supplier1 IN loop_suppliers %]
|
|
<option value="[% supplier1.booksellerid %]">[% supplier1.name %]</option>
|
|
[% END %]
|
|
</select>
|
|
</p>
|
|
[% END %]
|
|
[% IF ( allbaskets ) %]
|
|
<p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]">Show active baskets only</a></p>
|
|
[% ELSE %]
|
|
<p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]&allbaskets=1">Show all baskets</a></p>
|
|
[% END %]
|
|
<div id="acqui_order_supplierlist">
|
|
[% FOREACH supplier IN loop_suppliers %]
|
|
<div class="supplier">
|
|
<span class="suppliername">
|
|
[% IF (supplier.name) %]
|
|
<a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
|
|
[% ELSE %]
|
|
<a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">NO NAME</a>
|
|
[% END %]
|
|
</span>
|
|
<span class="action">
|
|
[% IF ( CAN_user_acquisition_order_manage ) %]
|
|
[% IF ( supplier.active ) %]
|
|
<a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&op=add_form"><i class="icon-plus"></i> New basket</a>
|
|
[% ELSE %]
|
|
(inactive)
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( supplier.loop_basket.size ) %]
|
|
<a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
|
|
[% END %]
|
|
</span>
|
|
<div class="baskets">
|
|
[% IF ( supplier.loop_basket.size ) %]
|
|
<table class="baskets">
|
|
<thead>
|
|
<tr>
|
|
<th>No.</th>
|
|
<th>Name</th>
|
|
<th class="title-numeric">Item count</th>
|
|
<th class="title-numeric">Biblio count</th>
|
|
<th>Items expected</th>
|
|
<th>Created by</th>
|
|
<th class="title-string">Date</th>
|
|
<th>Basket group</th>
|
|
<th class="title-string">Closed</th>
|
|
<th> </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH basket IN supplier.loop_basket %]
|
|
[% IF ( basket.uncertainprices ) %]
|
|
<tr class="problem">
|
|
[% ELSE %]
|
|
<tr>
|
|
[% END %]
|
|
<td>[% basket.basketno %]</td>
|
|
<td>[% basket.basketname %]</td>
|
|
<td>
|
|
<span title="[% basket.total_items %]">[% basket.total_items %]
|
|
[% IF basket.total_items_cancelled %]
|
|
([% basket.total_items_cancelled %] cancelled)
|
|
[% END %]
|
|
</span>
|
|
</td>
|
|
<td>
|
|
<span title="[% basket.total_biblios %]">[% basket.total_biblios %]
|
|
[% IF basket.total_biblios_cancelled %]
|
|
([% basket.total_biblios_cancelled %] cancelled)
|
|
[% END %]
|
|
</span>
|
|
</td>
|
|
<td>[% basket.expected_items %]</td>
|
|
<td>
|
|
[% basket.authorisedby_firstname %]
|
|
[% basket.authorisedby_surname %]
|
|
</td>
|
|
<td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
|
|
<td>
|
|
[% IF basket.basketgroup %]
|
|
[% basketgroup = basket.basketgroup %]
|
|
[% IF basketgroup.closed %]
|
|
[% basketgroup.name %] (closed)
|
|
[% ELSE %]
|
|
<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid %]&basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% IF ( basket.closedate ) %]
|
|
<span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
|
|
[% ELSE %]
|
|
<span title="9999-99-99"></span>
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
|
|
|
|
[% IF not basket.closedate and supplier.active %]
|
|
| <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
|
|
<!-- Modal -->
|
|
<div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
|
|
<div class="modal-body">
|
|
[% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
|
|
</div>
|
|
<div class="modal-footer">
|
|
<a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %][%# FOREACH basket IN supplier.loop_basket %]
|
|
</tbody>
|
|
</table>
|
|
|
|
[% ELSE %]
|
|
<p>No pending baskets</p>
|
|
[% END %][%# IF ( supplier.loop_basket.size ) %]
|
|
</div>
|
|
</div>
|
|
[% END %][%# FOREACH supplier IN loop_suppliers %]
|
|
</div>
|
|
[% END %][%# IF ( loop_suppliers.size ) %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% IF ( booksellerid ) %]
|
|
[% INCLUDE 'vendor-menu.inc' %]
|
|
[% END %]
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|