Attachment 142217 Details for Bug 31837 – Bug 31837: Add page-section class to tables on basket.tt

[patch] Bug 31837: Add page-section class to tables on basket.tt

Bug-31837-Add-page-section-class-to-tables-on-bask.patch (text/plain), 33.23 KB, created by Lucas Gass (lukeg) on 2022-10-19 23:10:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2022-10-19 23:10:35 UTC

Size: 33.23 KB

patch

obsolete

>From 6bb289fbd8b1056a05d60b38a910a9d41bafaa11 Mon Sep 17 00:00:00 2001
>From: Lucas Gass <lucas@bywatersolutions.com>
>Date: Wed, 19 Oct 2022 23:07:07 +0000
>Subject: [PATCH] Bug 31837: Add page-section class to tables on basket.tt
>
>This patch adds the page-section class to the orders and cancelled orders tables.
>
>To test:
>1. Have a vendor, basket, and create an order.
>2. Go look at the table on basket.tt and make sure the orders table looks good.
>3. Cancel some orders and look at the cancelled order table, make sure it also looks good.
>
>Note: I made some indentation changes. I also did NOT add a new wrapper to the cancelled orders table, it already had one so I just added the page-section div to the existing div.
>---
> .../prog/en/modules/acqui/basket.tt | 370 +++++++++---------
> 1 file changed, 186 insertions(+), 184 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 6a8013a06f..7d84c10e51 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -433,41 +433,70 @@
> <div id="acqui_basket_content">
> [% IF ( books_loop ) %]
> <h2>Orders</h2>
>- <table id="orders">
>- <thead>
>- <tr>
>- <th>No.</th>
>- <th>[% tp('noun', 'Order') | html %]</th>
>- <th>RRP tax exc.</th>
>- <th>Actual cost tax exc.</th>
>- <th>Budgeted cost tax exc.</th>
>- <th>RRP tax inc.</th>
>- <th>Actual cost tax inc.</th>
>- <th>Budgeted cost tax inc.</th>
>- <th>Replacement price</th>
>- <th>Qty.</th>
>- <th>Total tax exc. ([% currency | html %])</th>
>- <th>Total tax inc. ([% currency | html %])</th>
>- <th>GST %</th>
>- <th>GST</th>
>- <th>Fund</th>
>- <th>Estimated delivery date</th>
>- [% IF Koha.Preference('EDIFACT') && ediaccount %]
>- <th>Supplier report</th>
>- [% END %]
>- [% IF ( active ) %]
>- [% UNLESS ( closedate ) %]
>- <th class="NoSort">Modify</th>
>- <th class="NoSort">Cancel order</th>
>+ <div class="page-section">
>+ <table id="orders">
>+ <thead>
>+ <tr>
>+ <th>No.</th>
>+ <th>[% tp('noun', 'Order') | html %]</th>
>+ <th>RRP tax exc.</th>
>+ <th>Actual cost tax exc.</th>
>+ <th>Budgeted cost tax exc.</th>
>+ <th>RRP tax inc.</th>
>+ <th>Actual cost tax inc.</th>
>+ <th>Budgeted cost tax inc.</th>
>+ <th>Replacement price</th>
>+ <th>Qty.</th>
>+ <th>Total tax exc. ([% currency | html %])</th>
>+ <th>Total tax inc. ([% currency | html %])</th>
>+ <th>GST %</th>
>+ <th>GST</th>
>+ <th>Fund</th>
>+ <th>Estimated delivery date</th>
>+ [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+ <th>Supplier report</th>
> [% END %]
>- [% END %]
>- </tr>
>- </thead>
>- <tfoot>
>- [% FOREACH foot_loo IN book_foot_loop %]
>+ [% IF ( active ) %]
>+ [% UNLESS ( closedate ) %]
>+ <th class="NoSort">Modify</th>
>+ <th class="NoSort">Cancel order</th>
>+ [% END %]
>+ [% END %]
>+ </tr>
>+ </thead>
>+ <tfoot>
>+ [% FOREACH foot_loo IN book_foot_loop %]
>+ <tr>
>+ <th></th>
>+ <th>Total (GST [% foot_loo.tax_rate * 100 | html %])</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ <th>[% foot_loo.quantity | html %]</th>
>+ <th>[% foot_loo.total_tax_excluded | $Price %]</th>
>+ <th>[% foot_loo.total_tax_included | $Price %]</th>
>+ <th>&nbsp;</th>
>+ <th>[% foot_loo.tax_value | $Price %]</th>
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+ <th>&nbsp;</th>
>+ [% END %]
>+ [% IF ( active ) %]
>+ [% UNLESS ( closedate ) %]
>+ <th>&nbsp;</th>
>+ <th>&nbsp;</th>
>+ [% END %]
>+ [% END %]
>+ </tr>
>+ [% END %]
> <tr>
> <th></th>
>- <th>Total (GST [% foot_loo.tax_rate * 100 | html %])</th>
>+ <th>Total ([% currency | html %])</th>
> <th>&nbsp;</th>
> <th>&nbsp;</th>
> <th>&nbsp;</th>
>@@ -475,11 +504,11 @@
> <th>&nbsp;</th>
> <th>&nbsp;</th>
> <th>&nbsp;</th>
>- <th>[% foot_loo.quantity | html %]</th>
>- <th>[% foot_loo.total_tax_excluded | $Price %]</th>
>- <th>[% foot_loo.total_tax_included | $Price %]</th>
>+ <th>[% total_quantity | html %]</th>
>+ <th>[% total_tax_excluded | $Price %]</th>
>+ <th>[% total_tax_included | $Price %]</th>
> <th>&nbsp;</th>
>- <th>[% foot_loo.tax_value | $Price %]</th>
>+ <th>[% total_tax_value | $Price %]</th>
> <th>&nbsp;</th>
> <th>&nbsp;</th>
> [% IF Koha.Preference('EDIFACT') && ediaccount %]
>@@ -492,169 +521,142 @@
> [% END %]
> [% END %]
> </tr>
>- [% END %]
>- <tr>
>- <th></th>
>- <th>Total ([% currency | html %])</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- <th>[% total_quantity | html %]</th>
>- <th>[% total_tax_excluded | $Price %]</th>
>- <th>[% total_tax_included | $Price %]</th>
>- <th>&nbsp;</th>
>- <th>[% total_tax_value | $Price %]</th>
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- [% IF Koha.Preference('EDIFACT') && ediaccount %]
>- <th>&nbsp;</th>
>- [% END %]
>- [% IF ( active ) %]
>- [% UNLESS ( closedate ) %]
>- <th>&nbsp;</th>
>- <th>&nbsp;</th>
>- [% END %]
>- [% END %]
>- </tr>
>- </tfoot>
>- <tbody>
>- [% FOREACH books_loo IN books_loop %]
>- [% IF ( books_loo.order_received ) %]
>- <tr class="disabled">
>- [% ELSE %]
>- <tr>
>- [% END %]
>- <td>
>- [% books_loo.ordernumber | html %]
>- </td>
>- <td>
>- 
>- [% IF ( books_loo.order_received ) %] (received)[% END %]
>- [% IF books_loo.title %]
>- [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %]
>- [% ELSE %]
>- Deleted bibliographic record, can't find title 
>- [%- END %]
>- 
>- [%- IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END -%]
>- [%- IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END -%]
>- [%- IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END -%]
>- [%- IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html -%]
>- [%- ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END -%]
>- [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
>- [%- IF ( books_loo.suggestionid ) %]
>- 
>- Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %],Â [% books_loo.firstnamesuggestedby | html %] [% END %]
>- (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
>- [% END %]
>- 
>- [% IF ( books_loo.order_internalnote ) %]
>- Internal note: [% books_loo.order_internalnote | html %] <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"> Edit internal note</a>
>- [% ELSE %]
>- <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"> Add internal note</a>
>- [% END %]
>- [% IF ( books_loo.order_vendornote ) %]
>- Vendor note: [% books_loo.order_vendornote | html %] <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"> Edit vendor note</a>
>- [% ELSE %]
>- <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"> Add vendor note</a>
>- [% END %]
>- [% IF (books_loo.transferred_from) %]
>- [% basket = books_loo.transferred_from.basket %]
>- [% bookseller = books_loo.transferred_from.bookseller %]
>- [% timestamp = books_loo.transferred_from.timestamp %]
>- Transferred from basket:
>- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
>- (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
>- on 
>- [% timestamp | $KohaDates %]
>- 
>- 
>- [% END %]
>- [% SET claims = books_loo.order_object.claims %]
>- [% IF claims.count %]
>- 
>- This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %]
>- 
>- [% END %]
>- </td>
>- [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
>- [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
>- <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] </td>
>- <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td>
>- <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
>- <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
>- <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_included | $Price %]</td>
>- <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
>- <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
>- <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
>- <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
>- <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
>- <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
>- <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
>- <td>[% books_loo.budget_name | html %]</td>
>- <td data-order="[% books_loo.estimated_delivery_date | html %]" class="actions">
>- [% books_loo.estimated_delivery_date | $KohaDates %]
>- [% IF CAN_user_acquisition_order_manage %]
>- <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | $KohaDates %]">
>- Edit
>- </a>
>- </td>
>- [% IF Koha.Preference('EDIFACT') && ediaccount %]
>- <td>[% books_loo.suppliers_report | html %]</td>
>+ </tfoot>
>+ <tbody>
>+ [% FOREACH books_loo IN books_loop %]
>+ [% IF ( books_loo.order_received ) %]
>+ <tr class="disabled">
>+ [% ELSE %]
>+ <tr>
> [% END %]
>- [% END %]
>- [% IF ( active ) %]
>- [% UNLESS ( closedate ) %]
> <td>
>- <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
>- [% UNLESS (books_loo.order_received) %]
>- 
>- <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
>- [% END %]
>+ [% books_loo.ordernumber | html %]
> </td>
> <td>
>- [% IF ( books_loo.orderstatus != "complete") %]
>- [% IF ( books_loo.left_holds_on_order ) %]
>- Can't cancel order 
>- [% ELSE %]
>- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a> 
>- [% END %]
>- [% IF ( books_loo.can_del_bib ) %]
>- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a> 
>- [% ELSE %]
>- Can't cancel order and delete catalog record 
>- [% END %]
>- [% IF ( books_loo.left_item ) %]
>- [% books_loo.items | html %] item(s) left 
>- [% END %]
>- [% IF ( books_loo.left_biblio ) %]
>- [% books_loo.biblios | html %] order(s) left 
>- [% END %]
>- [% IF ( books_loo.left_subscription ) %]
>- [% books_loo.subscriptions | html %] subscription(s) left 
>+ 
>+ [% IF ( books_loo.order_received ) %] (received)[% END %]
>+ [% IF books_loo.title %]
>+ [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %]
>+ [% ELSE %]
>+ Deleted bibliographic record, can't find title 
>+ [%- END %]
>+ 
>+ [%- IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END -%]
>+ [%- IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END -%]
>+ [%- IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END -%]
>+ [%- IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html -%]
>+ [%- ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END -%]
>+ [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
>+ [%- IF ( books_loo.suggestionid ) %]
>+ 
>+ Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %],Â [% books_loo.firstnamesuggestedby | html %] [% END %]
>+ (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestionid | html %]</a>)
>+ [% END %]
>+ 
>+ [% IF ( books_loo.order_internalnote ) %]
>+ Internal note: [% books_loo.order_internalnote | html %] <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"> Edit internal note</a>
>+ [% ELSE %]
>+ <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"> Add internal note</a>
>+ [% END %]
>+ [% IF ( books_loo.order_vendornote ) %]
>+ Vendor note: [% books_loo.order_vendornote | html %] <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"> Edit vendor note</a>
>+ [% ELSE %]
>+ <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"> Add vendor note</a>
>+ [% END %]
>+ [% IF (books_loo.transferred_from) %]
>+ [% basket = books_loo.transferred_from.basket %]
>+ [% bookseller = books_loo.transferred_from.bookseller %]
>+ [% timestamp = books_loo.transferred_from.timestamp %]
>+ Transferred from basket:
>+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
>+ (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
>+ on 
>+ [% timestamp | $KohaDates %]
>+ 
>+ 
> [% END %]
>- [% IF ( books_loo.left_holds ) %]
>- [% books_loo.holds | html %] hold(s) left
>+ [% SET claims = books_loo.order_object.claims %]
>+ [% IF claims.count %]
>+ 
>+ This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %]
>+ 
> [% END %]
>- [% END %]
> </td>
>+ [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
>+ [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
>+ <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] </td>
>+ <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td>
>+ <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
>+ <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
>+ <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_included | $Price %]</td>
>+ <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
>+ <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
>+ <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
>+ <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
>+ <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
>+ <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
>+ <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
>+ <td>[% books_loo.budget_name | html %]</td>
>+ <td data-order="[% books_loo.estimated_delivery_date | html %]" class="actions">
>+ [% books_loo.estimated_delivery_date | $KohaDates %]
>+ [% IF CAN_user_acquisition_order_manage %]
>+ <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | $KohaDates %]">
>+ Edit
>+ </a>
>+ </td>
>+ [% IF Koha.Preference('EDIFACT') && ediaccount %]
>+ <td>[% books_loo.suppliers_report | html %]</td>
> [% END %]
> [% END %]
>- </tr>
>- [% END %]
>- </tbody>
>- </table>
>+ [% IF ( active ) %]
>+ [% UNLESS ( closedate ) %]
>+ <td>
>+ <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Modify</a>
>+ [% UNLESS (books_loo.order_received) %]
>+ 
>+ <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF ( books_loo.orderstatus != "complete") %]
>+ [% IF ( books_loo.left_holds_on_order ) %]
>+ Can't cancel order 
>+ [% ELSE %]
>+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a> 
>+ [% END %]
>+ [% IF ( books_loo.can_del_bib ) %]
>+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a> 
>+ [% ELSE %]
>+ Can't cancel order and delete catalog record 
>+ [% END %]
>+ [% IF ( books_loo.left_item ) %]
>+ [% books_loo.items | html %] item(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_biblio ) %]
>+ [% books_loo.biblios | html %] order(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_subscription ) %]
>+ [% books_loo.subscriptions | html %] subscription(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_holds ) %]
>+ [% books_loo.holds | html %] hold(s) left
>+ [% END %]
>+ [% END %]
>+ </td>
>+ [% END %]
>+ [% END %]
>+ </tr>
>+ [% END %]
>+ </tbody>
>+ </table>
>+ </div>
> [% END %]
> [% IF ( listincgst ) %]** Vendor's listings already include tax.
> [% END %]
> </div> 
> [% IF (cancelledorders_loop) %]
>- <div id="cancelledorders">
> <h2>Cancelled orders</h2>
>+ <div id="cancelledorders" class="page-section">
> <table id="cancelledorderst">
> <thead>
> <tr>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31837: 142217 | 142232 | 142459 | 142460 | 142473 | 142474