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

(-)a/C4/Reserves.pm (-7 / +18 lines)
Lines 30-35 use C4::Members; Link Here
30
use C4::Items;
30
use C4::Items;
31
use C4::Circulation;
31
use C4::Circulation;
32
use C4::Accounts;
32
use C4::Accounts;
33
use C4::Calendar;
33
34
34
# for _koha_notify_reserve
35
# for _koha_notify_reserve
35
use C4::Members::Messaging;
36
use C4::Members::Messaging;
Lines 352-358 sub GetReservesFromBiblionumber { Link Here
352
353
353
=head2 GetReservesFromItemnumber
354
=head2 GetReservesFromItemnumber
354
355
355
 ( $reservedate, $borrowernumber, $branchcode, $reserve_id ) = GetReservesFromItemnumber($itemnumber);
356
    ( $reservedate, $borrowernumber, $branchcode, $reserve_id, $reserve ) = GetReservesFromItemnumber($itemnumber);
356
357
357
TODO :: Description here
358
TODO :: Description here
358
359
Lines 362-368 sub GetReservesFromItemnumber { Link Here
362
    my ( $itemnumber, $all_dates ) = @_;
363
    my ( $itemnumber, $all_dates ) = @_;
363
    my $dbh   = C4::Context->dbh;
364
    my $dbh   = C4::Context->dbh;
364
    my $query = "
365
    my $query = "
365
    SELECT reservedate,borrowernumber,branchcode,reserve_id
366
    SELECT *
366
    FROM   reserves
367
    FROM   reserves
367
    WHERE  itemnumber=?
368
    WHERE  itemnumber=?
368
    ";
369
    ";
Lines 371-378 sub GetReservesFromItemnumber { Link Here
371
    }
372
    }
372
    my $sth_res = $dbh->prepare($query);
373
    my $sth_res = $dbh->prepare($query);
373
    $sth_res->execute($itemnumber);
374
    $sth_res->execute($itemnumber);
374
    my ( $reservedate, $borrowernumber, $branchcode, $reserve_id ) = $sth_res->fetchrow_array;
375
375
    return ( $reservedate, $borrowernumber, $branchcode, $reserve_id );
376
    my $reserve = $sth_res->fetchrow_hashref();
377
378
    return ( $reserve->{'reservedate'}, $reserve->{'borrowernumber'}, $reserve->{'branchcode'}, $reserve->{'reserve_id'}, $reserve );
376
}
379
}
377
380
378
=head2 GetReservesFromBorrowernumber
381
=head2 GetReservesFromBorrowernumber
Lines 555-563 sub GetMaxPickupDate { Link Here
555
        $item = C4::Items::GetItem( $reserve->{itemnumber} );
558
        $item = C4::Items::GetItem( $reserve->{itemnumber} );
556
    }
559
    }
557
560
558
    unless ( defined $reserve ) {
561
    unless ( defined $reserve && defined $reserve->{'branchcode'} ) {
559
        my $reserve = GetReservesFromItemnumber( $item->{itemnumber} );
562
        ( undef, undef, undef, undef, $reserve ) = GetReservesFromItemnumber( $item->{itemnumber} );
560
    }
563
    }
564
561
    return unless $reserve->{waitingdate};
565
    return unless $reserve->{waitingdate};
562
566
563
    my $borrower = C4::Members::GetMember( 'borrowernumber' => $reserve->{borrowernumber} );
567
    my $borrower = C4::Members::GetMember( 'borrowernumber' => $reserve->{borrowernumber} );
Lines 578-583 sub GetMaxPickupDate { Link Here
578
582
579
    $date->add( days => $holdspickupdelay );
583
    $date->add( days => $holdspickupdelay );
580
584
585
    my $calendar = C4::Calendar->new( branchcode => $reserve->{'branchcode'} );
586
    my $is_holiday = $calendar->isHoliday( $date->day(), $date->month(), $date->year() );
587
588
    while ( $is_holiday ) {
589
        $date->add( days => 1 );
590
        $is_holiday = $calendar->isHoliday( $date->day(), $date->month(), $date->year() );
591
    }
592
581
    return $date;
593
    return $date;
582
}
594
}
583
595
584
- 

Return to bug 8367