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

Bug 11579: Show ordernumber in basket.pl tables

Browse source 
Test plan:
Verify the ordernumber is correctly displayed on the basket page
(acqui/basket.pl?basketno=X)

Signed-off-by: silvere <silvere.hanguehard@enc.sorbonne.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a tiny typo in the HTML: </th> > </td>.
Passes all tests and QA script.
Tested that the ordernumber is now displayed and table sorting
works for the smaller and more detailed table.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Julian Maurice 2014-01-17 11:46:02 +01:00 committed by Galen Charlton
parent bab96c3f22
commit 7a8bbccf9c
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,6 +404,7 @@
<table id="orders"> <table id="orders">
<thead> <thead>
<tr> <tr>
<th>No.</th>
<th>Order</th> <th>Order</th>
<th class="gste">RRP tax exc.</th> <th class="gste">RRP tax exc.</th>
<th class="gste">ecost tax exc.</th> <th class="gste">ecost tax exc.</th>
@ -426,6 +427,7 @@
<tfoot> <tfoot>
[% FOREACH foot_loo IN book_foot_loop %] [% FOREACH foot_loo IN book_foot_loop %]
<tr> <tr>
<th></th>
<th>Total (GST [% foot_loo.gstgsti %])</th> <th>Total (GST [% foot_loo.gstgsti %])</th>
<th class="gste">&nbsp;</th> <th class="gste">&nbsp;</th>
<th class="gste">&nbsp;</th> <th class="gste">&nbsp;</th>
@ -446,6 +448,7 @@
</tr> </tr>
[% END %] [% END %]
<tr> <tr>
<th></th>
<th>Total ([% currency %])</th> <th>Total ([% currency %])</th>
<th class="gste">&nbsp;</th> <th class="gste">&nbsp;</th>
<th class="gste">&nbsp;</th> <th class="gste">&nbsp;</th>
@ -469,7 +472,11 @@
[% FOREACH books_loo IN books_loop %] [% FOREACH books_loo IN books_loop %]
[% IF ( books_loo.order_received ) %]<tr class="disabled">[% ELSE %][% IF ( books_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %] [% IF ( books_loo.order_received ) %]<tr class="disabled">[% ELSE %][% IF ( books_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %]
<td> <td>
<p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %] [% books_loo.ordernumber %]
</td>
<td>
<p>
[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %] <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
<br /> <br />
[% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %] [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
@ -562,6 +569,7 @@
<table id="cancelledorderst"> <table id="cancelledorderst">
<thead> <thead>
<tr> <tr>
<th>No.</th>
<th>Order</th> <th>Order</th>
<th class="gste">RRP tax exc.</th> <th class="gste">RRP tax exc.</th>
<th class="gste">ecost tax exc.</th> <th class="gste">ecost tax exc.</th>
@ -578,6 +586,9 @@
<tbody> <tbody>
[% FOREACH order IN cancelledorders_loop %] [% FOREACH order IN cancelledorders_loop %]
<tr style="color:grey"> <tr style="color:grey">
<td>
[% order.ordernumber %]
</td>
<td> <td>
<p> <p>
[% IF ( order.order_received ) %] (rcvd)[% END %] [% IF ( order.order_received ) %] (rcvd)[% END %]