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

(-)a/C4/Reserves.pm (-14 / +28 lines)
Lines 38-43 use C4::Branch qw( GetBranchDetail ); Link Here
38
use C4::Dates qw( format_date_in_iso );
38
use C4::Dates qw( format_date_in_iso );
39
39
40
use Koha::DateUtils;
40
use Koha::DateUtils;
41
use Koha::Database;
41
42
42
use List::MoreUtils qw( firstidx );
43
use List::MoreUtils qw( firstidx );
43
44
Lines 380-398 The routine does not look at future reserves (read: item level holds), but DOES Link Here
380
=cut
381
=cut
381
382
382
sub GetReservesFromItemnumber {
383
sub GetReservesFromItemnumber {
383
    my ( $itemnumber ) = @_;
384
    my ($itemnumber) = @_;
384
    my $dbh   = C4::Context->dbh;
385
385
    my $query = "
386
    my $schema = Koha::Database->new()->schema();
386
    SELECT reservedate,borrowernumber,branchcode,reserve_id,waitingdate
387
387
    FROM   reserves
388
    my $r = $schema->resultset('Reserve')->search(
388
    WHERE  itemnumber=? AND ( reservedate <= CAST(now() AS date) OR
389
        {
389
           waitingdate IS NOT NULL )
390
            itemnumber => $itemnumber,
390
    ORDER BY priority
391
            suspend    => 0,
391
    ";
392
            -or        => [
392
    my $sth_res = $dbh->prepare($query);
393
                reservedate => \'<= CAST( NOW() AS DATE )',
393
    $sth_res->execute($itemnumber);
394
                waitingdate => { '!=', undef }
394
    my ( $reservedate, $borrowernumber,$branchcode, $reserve_id, $wait ) = $sth_res->fetchrow_array;
395
            ]
395
    return ( $reservedate, $borrowernumber, $branchcode, $reserve_id, $wait );
396
        },
397
        {
398
            order_by => 'priority',
399
        }
400
    )->first();
401
402
    return unless $r;
403
404
    return (
405
        $r->reservedate(),
406
        $r->get_column('borrowernumber'),
407
        $r->get_column('branchcode'),
408
        $r->reserve_id(),
409
        $r->waitingdate(),
410
    );
396
}
411
}
397
412
398
=head2 GetReservesFromBorrowernumber
413
=head2 GetReservesFromBorrowernumber
399
- 

Return to bug 10226