gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acqui - fix to use GetBookSellerFromId(supplierid) instead of partial name based lookup 

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Joe Atzberger 2008-03-07 01:09:43 -06:00 committed by Joshua Ferraro
parent 79c37dc8ed
commit 3f17ad4adc
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
acqui/booksellers.pl
View File

@ -77,8 +77,14 @@ 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'},
@ -86,10 +92,9 @@ if ($count == 1){
);
}
# 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
@ -118,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;
@ -126,7 +131,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
}
$template->param(
loop_suppliers => \@loop_suppliers,
supplier => $supplier,
supplier => ($id || $supplier),
count => $count,
);

2
acqui/updatesupplier.pl
View File

@ -92,7 +92,7 @@ if($data{'name'}) {
$data{id}=AddBookseller(\%data);
}
#redirect to booksellers.pl
print $input->redirect("booksellers.pl?supplier=".$data{id});
print $input->redirect("booksellers.pl?id=".$data{id});
} else {
print $input->redirect("supplier.pl?op=enter"); # fail silently.
}

4
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
View File

@ -25,8 +25,8 @@
<!-- TMPL_IF NAME="id" -->
<li><a id="neworder" href="/cgi-bin/koha/acqui/basket.pl?supplierid=<!-- TMPL_VAR NAME="id" -->">New Order</a></li>
<li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">Edit Supplier</a></li>
<li><a id="manageorders" href="/cgi-bin/koha/acqui/booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">Manage Orders</a></li>
<li><a id="manageorders" href="/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->">Manage Orders</a></li>
<li><a id="receive" href="/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">Receive Parcel</a></li>
<!-- /TMPL_IF -->
</ul>
</div>
</div>