X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=acqui%2Fbooksellers.pl;h=24677ec458b1c3ecf7af90df2ea42f2e1426a102;hb=9b47b82a77a18e677d2dae30b73dcae0d9abba5b;hp=ba22532a3e65a8f9841fd4777b276f7e50ab01f7;hpb=d7ec5d8aaa210e1ea4c0b8d1b191dba8f92f9979;p=koha.git diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index ba22532a3e..24677ec458 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -77,15 +77,24 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( #parameters my $supplier = $query->param('supplier'); +my $id = $query->param('id') || $query->param('supplierid'); +my @suppliers; -my @suppliers = GetBookSeller($supplier); +if ($id) { + push @suppliers, GetBookSellerFromId($id); +} else { + @suppliers = GetBookSeller($supplier); +} my $count = scalar @suppliers; - +if ($count == 1){ + $template->param( supplier_name => $suppliers[0]->{'name'}, + id => $suppliers[0]->{'id'} + ); +} # check if we have to "close" a basket before building page -my $op = $query->param('op'); -my $basket = $query->param('basketno'); -if ( $op eq 'close' ) { - CloseBasket($basket); +if ($query->param('op') eq 'close') { + my $basket = $query->param('basketno'); + $basket =~ /^\d+$/ and CloseBasket($basket); } #build result page @@ -114,7 +123,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { $inner_line{surname} = $orders->[$i2]{'firstname'}; $inner_line{firstname} = $orders->[$i2]{'surname'}; $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} ); - $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} ); + $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} ); push @loop_basket, \%inner_line; } $line{loop_basket} = \@loop_basket; @@ -122,7 +131,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { } $template->param( loop_suppliers => \@loop_suppliers, - supplier => $supplier, + supplier => ($id || $supplier), count => $count, );