From edf5f72f1b021b0d8557d29cec34d95a89b5b94b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 9 Nov 2022 16:14:39 +0000 Subject: [PATCH] Bug 31823: Add page-section to uncertain prices page (acq) This patch adds a "page-section" wrapping div to the uncertain prices page in Acquisitions Note: This patch contains indentation changes. To test, apply the patch and go to Acquisitions. - Locate a vendor and view its details - In the left-hand sidebar, click "Uncertain prices." - The page should have two sections: Details about the vendor, and a list of orders with uncertain prices. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/acqui/uncertainprice.tt | 202 +++++++++--------- 1 file changed, 104 insertions(+), 98 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index bd544f4396..eb60667e7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -54,108 +54,114 @@ [% ELSE %] [% IF ( booksellername ) %]

Orders with uncertain prices for vendor [% booksellername | html %]

-

Contact information

-

Address: - [% booksellerpostal | html %] - [% bookselleraddress1 | html %] - [% bookselleraddress2 | html %] - [% bookselleraddress3 | html %] - [% bookselleraddress4 | html %] -

-

Phone: - [% booksellerphone | html %] / Fax: -

- [% FOREACH contact IN contacts %] -
Contact:
-
[% contact.name | html %] - [% contact.position | html %] - [% contact.phone | html %] - [% contact.altphone | html %] - [% contact.email | html %] - [% contact.notes | html %] -
+ +
+

Contact information

+

Address: + [% booksellerpostal | html %] + [% bookselleraddress1 | html %] + [% bookselleraddress2 | html %] + [% bookselleraddress3 | html %] + [% bookselleraddress4 | html %] +

+

Phone: + [% booksellerphone | html %] / Fax: +

+ [% FOREACH contact IN contacts %] +
Contact:
+
[% contact.name | html %] + [% contact.position | html %] + [% contact.phone | html %] + [% contact.altphone | html %] + [% contact.email | html %] + [% contact.notes | html %] +
+ [% END %] +
+ [% IF ( booksellernotes ) %] +

Notes: + [% booksellernotes | html %]

[% END %] -
- [% IF ( booksellernotes ) %] -

Notes: - [% booksellernotes | html %]

- [% END %] + [% END %]

Orders with uncertain prices

-
- - - - -
-
- - - - - - - - - - - - - - - - [% FOREACH uncertainpriceorder IN uncertainpriceorders %] - - - - - - - - - - [% END %] - -
Basket[% tp('noun', 'Order') | html %]ByUncertainPriceQuantityEdit
- [% uncertainpriceorder.basketname | html %] - - [% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %] - [% IF ( uncertainpriceorder.author ) %] by [% uncertainpriceorder.author | html %][% END %] - [% IF ( uncertainpriceorder.publishercode ) %] -
Publisher: [% uncertainpriceorder.publishercode | html %] - [%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear | html %] - [%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate | html %] - [% END %] - [% END %] - [% IF ( uncertainpriceorder.isbn ) %]
[% uncertainpriceorder.isbn | html %][% END %] -
-
- [% uncertainpriceorder.firstname | html %] [% uncertainpriceorder.surname | html %] - - - - - - [% IF basket.effective_create_items == 'ordering' %] - [% uncertainpriceorder.quantity | html %] - - [% ELSE %] - - [% END %] - - Edit -
-
-
+ +
+
+ + + + +
+
+ + + + + + + + + + + + + + + + [% FOREACH uncertainpriceorder IN uncertainpriceorders %] + + + + + + + + + + [% END %] + +
Basket[% tp('noun', 'Order') | html %]ByUncertainPriceQuantityEdit
+ [% uncertainpriceorder.basketname | html %] + + [% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %] + [% IF ( uncertainpriceorder.author ) %] by [% uncertainpriceorder.author | html %][% END %] + [% IF ( uncertainpriceorder.publishercode ) %] +
Publisher: [% uncertainpriceorder.publishercode | html %] + [%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear | html %] + [%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate | html %] + [% END %] + [% END %] + [% IF ( uncertainpriceorder.isbn ) %]
[% uncertainpriceorder.isbn | html %][% END %] +
+
+ [% uncertainpriceorder.firstname | html %] [% uncertainpriceorder.surname | html %] + + + + + + [% IF basket.effective_create_items == 'ordering' %] + [% uncertainpriceorder.quantity | html %] + + [% ELSE %] + + [% END %] + + Edit +
+
+
+
[% END %] -- 2.39.5