View | Details | Raw Unified | Return to bug 6280
Collapse All | Expand All

(-)a/C4/Members.pm (-6 / +13 lines)
Lines 1032-1044 The keys include C<biblioitems> fields except marc and marcxml. Link Here
1032
1032
1033
#'
1033
#'
1034
sub GetPendingIssues {
1034
sub GetPendingIssues {
1035
    my (@borrowernumbers) = @_;
1035
    my @borrowernumbers = @_;
1036
1037
    unless (@borrowernumbers ) { # return a ref_to_array
1038
        return \@borrowernumbers; # to not cause surprise to caller
1039
    }
1036
1040
1037
    # Borrowers part of the query
1041
    # Borrowers part of the query
1038
    my $bquery = '';
1042
    my $bquery = '';
1039
    for (my $i = 0; $i < @borrowernumbers; $i++) {
1043
    for (my $i = 0; $i < @borrowernumbers; $i++) {
1040
        $bquery .= " borrowernumber = ?";
1044
        $bquery .= ' borrowernumber = ?';
1041
        $bquery .= " OR" if ($i < (scalar(@borrowernumbers) - 1));
1045
        if ($i < $#borrowernumbers ) {
1046
            $bquery .= ' OR';
1047
        }
1042
    }
1048
    }
1043
1049
1044
    # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance
1050
    # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance
Lines 1079-1087 sub GetPendingIssues { Link Here
1079
    $sth->execute(@borrowernumbers);
1085
    $sth->execute(@borrowernumbers);
1080
    my $data = $sth->fetchall_arrayref({});
1086
    my $data = $sth->fetchall_arrayref({});
1081
    my $today = C4::Dates->new->output('iso');
1087
    my $today = C4::Dates->new->output('iso');
1082
    foreach (@$data) {
1088
    foreach (@{$data}) {
1083
        $_->{date_due} or next;
1089
        if ($_->{date_due}  and $_->{date_due} lt $today) {
1084
        ($_->{date_due} lt $today) and $_->{overdue} = 1;
1090
            $_->{overdue} = 1;
1091
        }
1085
    }
1092
    }
1086
    return $data;
1093
    return $data;
1087
}
1094
}
(-)a/circ/circulation.pl (-2 / +6 lines)
Lines 463-470 if ($borrower) { Link Here
463
    #push @borrowernumbers, $borrower->{'borrowernumber'};
463
    #push @borrowernumbers, $borrower->{'borrowernumber'};
464
464
465
    # get each issue of the borrower & separate them in todayissues & previous issues
465
    # get each issue of the borrower & separate them in todayissues & previous issues
466
    my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
466
    my $issueslist = GetPendingIssues($borrower->{'borrowernumber'});
467
    my ($relissueslist) = GetPendingIssues(@relborrowernumbers);
467
    my $relissueslist = [];
468
    if ( @relborrowernumbers ) {
469
        $relissueslist = GetPendingIssues(@relborrowernumbers);
470
    }
468
471
469
    build_issue_data($issueslist, 0);
472
    build_issue_data($issueslist, 0);
470
    build_issue_data($relissueslist, 1);
473
    build_issue_data($relissueslist, 1);
Lines 477-482 if ($borrower) { Link Here
477
    else {
480
    else {
478
        @todaysissues   = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
481
        @todaysissues   = sort { $b->{'timestamp'} cmp $a->{'timestamp'} } @todaysissues;
479
    }
482
    }
483
480
    if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
484
    if ( C4::Context->preference( "previousIssuesDefaultSortOrder" ) eq 'asc' ){
481
        @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
485
        @previousissues = sort { $a->{'date_due'} cmp $b->{'date_due'} } @previousissues;
482
    }
486
    }
(-)a/members/moremember.pl (-4 / +6 lines)
Lines 236-244 if ( C4::Context->preference('OPACPrivacy') ) { Link Here
236
#
236
#
237
my @borrowernumbers = GetMemberRelatives($borrowernumber);
237
my @borrowernumbers = GetMemberRelatives($borrowernumber);
238
my $issue       = GetPendingIssues($borrowernumber);
238
my $issue       = GetPendingIssues($borrowernumber);
239
my $relissue    = GetPendingIssues(@borrowernumbers);
239
my $relissue    = [];
240
my $issuecount = scalar(@$issue);
240
if ( @borrowernumbers ) {
241
my $relissuecount  = scalar(@$relissue);
241
    $relissue    = GetPendingIssues(@borrowernumbers);
242
}
243
my $issuecount     = @{$issue};
244
my $relissuecount  = @{$relissue};
242
my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
245
my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
243
my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
246
my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
244
my @issuedata;
247
my @issuedata;
245
- 

Return to bug 6280