Bug 11579: Show ordernumber in basket.pl tables
authorJulian Maurice <julian.maurice@biblibre.com>
Fri, 17 Jan 2014 10:46:02 +0000 (11:46 +0100)
committerGalen Charlton <gmc@esilibrary.com>
Wed, 29 Jan 2014 22:35:17 +0000 (22:35 +0000)
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>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

index da78b7b..e774a6e 100644 (file)
             <table id="orders">
                 <thead>
                     <tr>
+                        <th>No.</th>
                         <th>Order</th>
                         <th class="gste">RRP tax exc.</th>
                         <th class="gste">ecost tax exc.</th>
                 <tfoot>
                 [% FOREACH foot_loo IN book_foot_loop %]
                     <tr>
+                        <th></th>
                         <th>Total (GST [% foot_loo.gstgsti %])</th>
                         <th class="gste">&nbsp;</th>
                         <th class="gste">&nbsp;</th>
                     </tr>
                 [% END %]
                 <tr>
+                    <th></th>
                     <th>Total ([% currency %])</th>
                     <th class="gste">&nbsp;</th>
                     <th class="gste">&nbsp;</th>
                 [% 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 %]
                         <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 %]
                                 <br />
                                 [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
             <table id="cancelledorderst">
               <thead>
                 <tr>
+                  <th>No.</th>
                   <th>Order</th>
                   <th class="gste">RRP tax exc.</th>
                   <th class="gste">ecost tax exc.</th>
                 [% FOREACH order IN cancelledorders_loop %]
                   <tr style="color:grey">
                     <td>
+                        [% order.ordernumber %]
+                    </td>
+                    <td>
                       <p>
                         [% IF ( order.order_received ) %] (rcvd)[% END %]
                         [% IF (order.title) %]