@@ -, +, @@ --- acqui/booksellers.pl | 11 + .../prog/en/modules/acqui/booksellers.tt | 237 ++++++++++++--------- 2 files changed, 145 insertions(+), 103 deletions(-) --- a/acqui/booksellers.pl +++ a/acqui/booksellers.pl @@ -155,11 +155,22 @@ for my $vendor (@suppliers) { }; } + +my $sessionID = $query->cookie('CGISESSID'); +my $session = C4::Auth::get_session($sessionID); +my $view = $query->param('view'); +if ( $view ) { + $session->param('bookseller_default_view', $view); +} else { + $view = $session->param('bookseller_default_view'); +} + $template->param( loop_suppliers => $loop_suppliers, supplier => ( $booksellerid || $supplier ), count => $supplier_count, has_budgets => $has_budgets, + view => $view, ); $template->{VARS}->{'allbaskets'} = $allbaskets; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -126,124 +126,155 @@ $(document).ready(function() { [% END %]
bookseller | -No. | -Name | -Item count | -Biblio count | -Items expected | -Created by | -Date | -Basket group | -Closed | -- |
---|
- [% supplier.name %] - ([% supplier.booksellerid %]) - [% PROCESS action supplier = supplier %] - | -- [% IF allbaskets %] - No basket. - [% ELSE %] - No active basket. - [% END %] - | -+ | bookseller | +No. | +Name | +Item count | +Biblio count | +Items expected | +Created by | +Date | +Basket group | +Closed | +|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+ [% supplier.name %] + ([% supplier.booksellerid %]) + [% PROCESS action supplier = supplier %] + | ++ [% IF allbaskets %] + No basket. + [% ELSE %] + No active basket. + [% END %] + | ++ | - [% supplier.name %] - ([% supplier.booksellerid %]) - [% PROCESS action supplier = supplier %] - | -[% basket.basketno %] | -[% basket.basketname %] | -- [% basket.total_items %] - [% IF basket.total_items_cancelled %] - ([% basket.total_items_cancelled %] cancelled) - [% END %] - | -- [% basket.total_biblios %] - [% IF basket.total_biblios_cancelled %] - ([% basket.total_biblios_cancelled %] cancelled) - [% END %] - | -[% basket.expected_items %] | -- [% basket.authorisedby_firstname %] [% basket.authorisedby_surname %] - | -[% basket.creationdate | $KohaDates %] | -- [% IF basket.basketgroup %] - [% basketgroup = basket.basketgroup %] - [% IF basketgroup.closed %] - [% basketgroup.name %] (closed) - [% ELSE %] - [% basketgroup.name %] - [% END %] - [% END %] - | -- [% IF ( basket.closedate ) %] - [% basket.closedate | $KohaDates %] - [% ELSE %] - - [% END %] - | -- View + [% FOREACH basket IN supplier.loop_basket %] + [% IF ( basket.uncertainprices ) %] + | ||||||||
+ [% supplier.name %] + ([% supplier.booksellerid %]) + [% PROCESS action supplier = supplier %] + | +[% basket.basketno %] | +[% basket.basketname %] | ++ [% basket.total_items %] + [% IF basket.total_items_cancelled %] + ([% basket.total_items_cancelled %] cancelled) + [% END %] + | ++ [% basket.total_biblios %] + [% IF basket.total_biblios_cancelled %] + ([% basket.total_biblios_cancelled %] cancelled) + [% END %] + | +[% basket.expected_items %] | ++ [% basket.authorisedby_firstname %] [% basket.authorisedby_surname %] + | +[% basket.creationdate | $KohaDates %] | ++ [% IF basket.basketgroup %] + [% basketgroup = basket.basketgroup %] + [% IF basketgroup.closed %] + [% basketgroup.name %] (closed) + [% ELSE %] + [% basketgroup.name %] + [% END %] + [% END %] + | ++ [% IF ( basket.closedate ) %] + [% basket.closedate | $KohaDates %] + [% ELSE %] + + [% END %] + | ++ View - [% UNLESS ( basket.closedate ) %] - | Add to basket - - | +
No pending baskets
[% END %][%# IF ( loop_suppliers.size ) %] -