From cbe2b2139c74539b367565e10a118e74aa1d46e3 Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 17 Sep 2004 12:32:29 +0000 Subject: [PATCH] 1- don't loose bookseller id when closing a basket 2- add possibility to view a closed basket (but not modify it) --- acqui/basket.pl | 2 +- .../intranet-tmpl/default/en/acqui/basket.tmpl | 16 ++++++++++++---- .../intranet-tmpl/default/en/acqui/order.tmpl | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index bce4d50d54..37d1a16222 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -99,11 +99,11 @@ for (my $i=0;$i<$count;$i++){ my $prefgist =C4::Context->preference("gist"); $gist=sprintf("%.2f",$sub_total*$prefgist); $grand_total=$sub_total+$gist; - $template->param(basketno => $basketno, creationdate => $basket->{creationdate}, authorisedby => $basket->{authorisedby}, authorisedbyname => $basket->{authorisedbyname}, + closedate => format_date($basket->{closedate}), booksellerid=> $booksellers[0]->{'id'}, name => $booksellers[0]->{'name'}, entrydate => format_date($results[0]->{'entrydate'}), diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl index 99c6dbe076..2f690116dd 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl @@ -2,15 +2,21 @@

New shopping Basket for ">


-
-

Basket info

+ +
+

Basket info

- " class="button acquisition">Close -
+ + Closed on + + &supplier=" class="button acquisition">Close + +
+

Order

@@ -61,6 +67,7 @@

Basket empty

+

Add order line

@@ -77,5 +84,6 @@

+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl index d867d564a8..45b4603aba 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl @@ -44,6 +44,7 @@ closed on + " class="button acquisition">View " class="button acquisition">modify -- 2.39.5