From 605588d0c6ccc9e5ad326acd8fb250ae81d8eae9 Mon Sep 17 00:00:00 2001 From: Lucas Gass 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. Signed-off-by: David Nind Signed-off-by: Katrin Fischer --- .../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 @@
[% IF ( books_loop ) %]

Orders

- - - - - - - - - - - - - - - - - - - - [% IF Koha.Preference('EDIFACT') && ediaccount %] - - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] - - +
+
No.[% tp('noun', 'Order') | html %]RRP tax exc.Actual cost tax exc.Budgeted cost tax exc.RRP tax inc.Actual cost tax inc.Budgeted cost tax inc.Replacement priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFundEstimated delivery dateSupplier reportModifyCancel order
+ + + + + + + + + + + + + + + + + + + [% IF Koha.Preference('EDIFACT') && ediaccount %] + [% END %] - [% END %] - - - - [% FOREACH foot_loo IN book_foot_loop %] + [% IF ( active ) %] + [% UNLESS ( closedate ) %] + + + [% END %] + [% END %] + + + + [% FOREACH foot_loo IN book_foot_loop %] + + + + + + + + + + + + + + + + + + [% IF Koha.Preference('EDIFACT') && ediaccount %] + + [% END %] + [% IF ( active ) %] + [% UNLESS ( closedate ) %] + + + [% END %] + [% END %] + + [% END %] - + @@ -475,11 +504,11 @@ - - - + + + - + [% IF Koha.Preference('EDIFACT') && ediaccount %] @@ -492,169 +521,142 @@ [% END %] [% END %] - [% END %] - - - - - - - - - - - - - - - - - - [% IF Koha.Preference('EDIFACT') && ediaccount %] - - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] - - - [% END %] - [% END %] - - - - [% FOREACH books_loo IN books_loop %] - [% IF ( books_loo.order_received ) %] - - [% ELSE %] - - [% END %] - - - [% 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 %] - - - - - - - - - - - - - - - [% IF Koha.Preference('EDIFACT') && ediaccount %] - + + + [% FOREACH books_loo IN books_loop %] + [% IF ( books_loo.order_received ) %] + + [% ELSE %] + [% END %] - [% END %] - [% IF ( active ) %] - [% UNLESS ( closedate ) %] + [% 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 %] + + + + + + + + + + + + + + + [% IF Koha.Preference('EDIFACT') && ediaccount %] + [% END %] [% END %] - - [% END %] - -
No.[% tp('noun', 'Order') | html %]RRP tax exc.Actual cost tax exc.Budgeted cost tax exc.RRP tax inc.Actual cost tax inc.Budgeted cost tax inc.Replacement priceQty.Total tax exc. ([% currency | html %])Total tax inc. ([% currency | html %])GST %GSTFundEstimated delivery dateSupplier report
ModifyCancel order
Total (GST [% foot_loo.tax_rate * 100 | html %])       [% foot_loo.quantity | html %][% foot_loo.total_tax_excluded | $Price %][% foot_loo.total_tax_included | $Price %] [% foot_loo.tax_value | $Price %]     
Total (GST [% foot_loo.tax_rate * 100 | html %])Total ([% currency | html %])           [% foot_loo.quantity | html %][% foot_loo.total_tax_excluded | $Price %][% foot_loo.total_tax_included | $Price %][% total_quantity | html %][% total_tax_excluded | $Price %][% total_tax_included | $Price %]  [% foot_loo.tax_value | $Price %][% total_tax_value | $Price %]    
Total ([% currency | html %])       [% total_quantity | html %][% total_tax_excluded | $Price %][% total_tax_included | $Price %] [% total_tax_value | $Price %]     
- [% books_loo.ordernumber | html %] - -

- [% 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 %] - (suggestion #[% books_loo.suggestionid | html %]) - [% END %] -

- [% IF ( books_loo.order_internalnote ) %] -

Internal note: [% books_loo.order_internalnote | html %] Edit internal note

- [% ELSE %] - Add internal note - [% END %] - [% IF ( books_loo.order_vendornote ) %] -

Vendor note: [% books_loo.order_vendornote | html %] Edit vendor note

- [% ELSE %] - Add vendor note - [% 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: - [% basket.basketname | html %] - ([% bookseller.name | html %]) - 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 %] - 		[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] [% books_loo.unitprice_tax_excluded | $Price %][% books_loo.ecost_tax_excluded | $Price %][% books_loo.rrp_tax_included | $Price %][% books_loo.unitprice_tax_included | $Price %][% books_loo.ecost_tax_included | $Price %][% books_loo.replacementprice | $Price %][% books_loo.quantity | html %][% books_loo.total_tax_excluded | $Price %][% books_loo.total_tax_included | $Price %][% books_loo.tax_rate * 100 | html %][% books_loo.tax_value | $Price %][% books_loo.budget_name | html %] - [% books_loo.estimated_delivery_date | $KohaDates %] - [% IF CAN_user_acquisition_order_manage %] - - Edit - - [% books_loo.suppliers_report | html %]
- Modify - [% UNLESS (books_loo.order_received) %] -
- Transfer - [% END %] + [% books_loo.ordernumber | html %] 		- [% IF ( books_loo.orderstatus != "complete") %] - [% IF ( books_loo.left_holds_on_order ) %] - Can't cancel order
- [% ELSE %] - Cancel order
- [% END %] - [% IF ( books_loo.can_del_bib ) %] - Cancel order and delete catalog record
- [% 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 %] + (suggestion #[% books_loo.suggestionid | html %]) + [% END %] +

+ [% IF ( books_loo.order_internalnote ) %] +

Internal note: [% books_loo.order_internalnote | html %] Edit internal note

+ [% ELSE %] + Add internal note + [% END %] + [% IF ( books_loo.order_vendornote ) %] +

Vendor note: [% books_loo.order_vendornote | html %] Edit vendor note

+ [% ELSE %] + Add vendor note + [% 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: + [% basket.basketname | html %] + ([% bookseller.name | html %]) + 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 %] 		[% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] [% books_loo.unitprice_tax_excluded | $Price %][% books_loo.ecost_tax_excluded | $Price %][% books_loo.rrp_tax_included | $Price %][% books_loo.unitprice_tax_included | $Price %][% books_loo.ecost_tax_included | $Price %][% books_loo.replacementprice | $Price %][% books_loo.quantity | html %][% books_loo.total_tax_excluded | $Price %][% books_loo.total_tax_included | $Price %][% books_loo.tax_rate * 100 | html %][% books_loo.tax_value | $Price %][% books_loo.budget_name | html %] + [% books_loo.estimated_delivery_date | $KohaDates %] + [% IF CAN_user_acquisition_order_manage %] + + Edit + + [% books_loo.suppliers_report | html %]
+ [% IF ( active ) %] + [% UNLESS ( closedate ) %] + + Modify + [% UNLESS (books_loo.order_received) %] +
+ Transfer + [% END %] + + + [% IF ( books_loo.orderstatus != "complete") %] + [% IF ( books_loo.left_holds_on_order ) %] + Can't cancel order
+ [% ELSE %] + Cancel order
+ [% END %] + [% IF ( books_loo.can_del_bib ) %] + Cancel order and delete catalog record
+ [% 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 %] + + [% END %] + [% END %] + + [% END %] + + +
[% END %] [% IF ( listincgst ) %]** Vendor's listings already include tax. [% END %] [% IF (cancelledorders_loop) %] -

Cancelled orders

+
-- 2.30.2