while(my $row = $sth->fetchrow_hashref){
$row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));
$row->{'startdate'} = format_date($row->{'startdate'});
- push @datas, $row if ($expired || (not $expired && not HasSubscriptionExpired($row->{subscriptionid})) );
+ $row->{expired} = HasSubscriptionExpired($row->{subscriptionid});
+ push @datas, $row if (
+ $expired
+ or (
+ not $expired
+ and (
+ not $row->{expired}
+ and not $row->{closed}
+ )
+ )
+ );
}
-
+
if($output eq 'screen'){
$template->param(datas => \@datas,
do_it => 1);
while(my $row = $sth->fetchrow_hashref){
push(@booksellers,$row)
}
-
- ## We generate branchlist
- my $branches=GetBranches();
- my @branchloop;
- foreach (sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches) {
- my $thisbranch = ''; # FIXME: populate $thisbranch to preselect one
- my %row = (branchcode => $_,
- selected => ($thisbranch eq $_ ? 1 : 0),
- branchname => $branches->{$_}->{'branchname'},
- );
- push @branchloop, \%row;
- }
-
+
my $CGIextChoice=CGI::scrolling_list(
-name => 'MIME',
-id => 'MIME',
CGIextChoice => $CGIextChoice,
CGIsepChoice => $CGIsepChoice,
booksellers => \@booksellers,
- branches => \@branchloop);
+ branches => GetBranchesLoop(C4::Context->userenv->{'branch'}));
}
output_html_with_http_headers $input, $cookie, $template->output;