Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Several improvements to basket display.

Browse source
This commit is contained in:
Jean-André Santoni 2009-07-10 11:59:31 +02:00 committed by Henri-Damien LAURENT
parent 9a3bf98b8e
commit ca6227715f
2 changed files with 45 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
acqui/basket.pl
View file

@ -65,27 +65,6 @@ the supplier this script have to display the basket.
my $query = new CGI;
my $basketno = $query->param('basketno');
my $booksellerid = $query->param('supplierid');
my $sort = $query->param('order') || "aqorders.ordernumber";
my @sort_loop;
if (defined $sort) {
foreach (split /\,/, $sort) {
my %sorthash = (
string => $_,
);
# other possibly valid tables for later: aqbookfund biblio biblioitems
if (
(/^\s*(biblioitems)\.(\w+)\s*$/ and $2 eq 'publishercode') or
(/^\s*(aqorders)\.(\w+)\s*$/ and $2 eq 'ordernumber' )
) {
$sorthash{table} = $1;
$sorthash{field} = $2;
} else {
$sorthash{error} = 1;
}
push @sort_loop, \%sorthash;
}
}
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@ -231,7 +210,7 @@ if ( $op eq 'delete_confirm' ) {
"loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
$basket->{creationdate}, $basket->{authorisedby};
my @results = GetOrders( $basketno, $sort );
my @results = GetOrders( $basketno );
my $count = scalar @results;
my $sub_total; # total of line totals
@ -325,7 +304,6 @@ if ( $op eq 'delete_confirm' ) {
address4 => $bookseller->{'address4'},
entrydate => format_date( $results[0]->{'entrydate'} ),
books_loop => \@books_loop,
sort_loop => \@sort_loop,
count => $count,
gist => $gist ? sprintf( "%.2f", $gist ) : 0,
gist_rate => sprintf( "%.2f", $prefgist * 100 ) . '%',

83
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
View file

@ -1,7 +1,20 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></title>
<title>Koha &rsaquo; Acquisitions &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="delete_confirm" -->Delete <!-- /TMPL_IF -->Basket <!-- TMPL_VAR NAME="basketname" --> (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_UNLESS name="closedate" -->
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
<script type="text/JavaScript">
//<![CDATA[
$(document).ready(function() {
$("#orders").tablesorter({
headers: {
9: { sorter: false },
10: { sorter: false }
}
});
});
//]]>
</script>
<script type="text/javascript">
//<![CDATA[
function confirm_close() {
@ -35,7 +48,7 @@
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Basket <!-- TMPL_IF NAME="basketno" -->(<!-- TMPL_VAR NAME="basketno" -->)<!-- /TMPL_IF --> for <!-- TMPL_VAR NAME="name" --></div>
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="delete_confirm" -->Delete <!-- /TMPL_IF -->Basket <!-- TMPL_VAR NAME="basketname" --> (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --></div>
<div id="doc3" class="yui-t2">
@ -108,7 +121,7 @@
<h3>Basket deleted</h3>
<META HTTP-EQUIV=Refresh CONTENT="0; URL=booksellers.pl">
<!-- TMPL_ELSE -->
<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="delete_confirm" -->Delete<!-- /TMPL_IF -->Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="delete_confirm" -->Delete <!-- /TMPL_IF -->Basket <!-- TMPL_VAR NAME="basketname" --> (<!-- TMPL_VAR NAME="basketno" -->) for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="delete_confirm" -->
<h2>
<span class="yui-button yui-link-button">
@ -125,18 +138,16 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="basketno" --><div id="acqui_basket_summary">
<h2>Basket Details</h2>
<p>Basket number: <!-- TMPL_VAR NAME="basketno" --></p>
<p>Basket name: <!--TMPL_VAR NAME="basketname" --></p>
<p>Internal note: <!-- TMPL_VAR NAME="basketnote" --></p>
<p>Bookseller note: <!-- TMPL_VAR NAME="basketbooksellernote" --></p>
<!-- TMPL_IF NAME="basketnote" --><p>Internal note: <!-- TMPL_VAR NAME="basketnote" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="basketbooksellernote" --><p>Bookseller note: <!-- TMPL_VAR NAME="basketbooksellernote" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="basketcontractno" -->
<p>Contract number: <!-- TMPL_VAR NAME="basketcontractno" --></p>
<p>Contract name: <a href="../admin/aqcontract.pl?op=add_form&contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></p>
<!-- /TMPL_IF -->
<p>Managed by: <!-- TMPL_VAR NAME="authorisedbyname" --></p>
<p>Open on: <!-- TMPL_VAR NAME="creationdate" --></p>
<p>For vendor ID: <!-- TMPL_VAR NAME="booksellerid" --></p>
<p>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
<!-- TMPL_IF NAME="authorisedbyname" --><p>Managed by: <!-- TMPL_VAR NAME="authorisedbyname" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="creationdate" --><p>Open on: <!-- TMPL_VAR NAME="creationdate" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="booksellerid" --><p>For vendor ID: <!-- TMPL_VAR NAME="booksellerid" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="booksellerinvoicenumber" --><p>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p><!-- /TMPL_IF -->
<!-- TMPL_IF name="closedate" -->
<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post">
<p>Closed On: <!-- TMPL_VAR name="closedate" --></p>
@ -164,35 +175,28 @@
<!-- TMPL_UNLESS name="delete_confirm" -->
<div id="acqui_basket_content">
<h2>Order Details</h2>
<!-- TMPL_IF NAME="sort_loop" -->
<!-- TMPL_LOOP NAME="sort_loop" -->
<!-- TMPL_IF name="error" -->
<div class="dialog alert">ERROR: Illegal sort requested by &quot;<!-- TMPL_VAR NAME="string" -->&quot;.
<br />Please use valid sort criteria. <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Return to default results.</a></div>
<!-- TMPL_ELSE -->
<div class="dialog message">Sorted by &quot;<!-- TMPL_VAR NAME="string" -->&quot;.</div>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="books_loop" -->
<table>
<tr>
<th>Order</th>
<th>Title</th>
<th>ISBN</th>
<th><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
<th>RRP</th>
<th>Est.</th>
<th>Qty.</th>
<th>Total</th>
<th>Budget</th>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
<th>Modify</th>
<th>Delete</th>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
<table id="orders">
<thead>
<tr>
<th>Order</th>
<th>Title</th>
<th>ISBN</th>
<th>Publisher</th>
<th>RRP</th>
<th>Est.</th>
<th>Qty.</th>
<th>Total</th>
<th>Budget</th>
<!-- TMPL_IF name="active" -->
<!-- TMPL_UNLESS name="closedate" -->
<th>Modify</th>
<th>Delete</th>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
</tr>
</thead>
<tbody>
<!-- TMPL_LOOP NAME="books_loop" -->
<!-- TMPL_IF NAME="order_received" --><tr class="disabled"><!-- TMPL_ELSE --><!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="ordernumber" -->
@ -223,6 +227,7 @@
<!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
</tbody>
<tr>
<td colspan="4" rowspan="3">
<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />