From e42e92b42e4eb50326db76bfd125d45c87fb5e84 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Wed, 31 Mar 2010 09:14:57 +0200 Subject: [PATCH] (BUG #4355) Basket.pl: withdrawal of the "can not close the basket" button Basket.pl: withdrawal of the "can not close the basket"button. only Uncerain prices button is displayed. And removing the "??" in the price columns, replaced by "uncertain" in rrp column Signed-off-by: Galen Charlton --- acqui/basket.pl | 6 ++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 60c2a64121..1e27d8f1b1 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -257,10 +257,8 @@ if ( $op eq 'delete_confirm' ) { $line{line_total} = sprintf( "%.2f", $line_total ); $line{odd} = $i % 2; if ($line{uncertainprice}) { - $template->param( unclosable => 1 ); - for my $key (qw/ecost line_total rrp/) { - $line{$key} .= '??'; - } + $template->param( uncertainprices => 1 ); + $line{rrp} .= ' (Uncertain)'; } if ($line{'title'}){ my $volume = $results[$i]->{'volume'}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index e518f6dfc2..18631d161f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -78,8 +78,9 @@ // YUI Toolbar Functions function yuiToolbar() { - new YAHOO.widget.Button("uncertpricesbutton"); new YAHOO.widget.Button("closebutton", {disabled:true}); + + new YAHOO.widget.Button("uncertpricesbutton"); new YAHOO.widget.Button("closebutton"); @@ -94,6 +95,7 @@
  • Delete this basket
  • +
  • &owner=1" class="button" id="uncertpricesbutton">Uncertain prices
  • ?op=close&basketno=&booksellerid=" class="button" id="closebutton">Close this basket
  • -- 2.20.1