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

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

Return to bug 10226