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 343-349
sub GetReservesFromItemnumber {
Link Here
|
343 |
my ( $itemnumber, $all_dates ) = @_; |
344 |
my ( $itemnumber, $all_dates ) = @_; |
344 |
my $dbh = C4::Context->dbh; |
345 |
my $dbh = C4::Context->dbh; |
345 |
my $query = " |
346 |
my $query = " |
346 |
SELECT reservedate,borrowernumber,branchcode |
347 |
SELECT * |
347 |
FROM reserves |
348 |
FROM reserves |
348 |
WHERE itemnumber=? |
349 |
WHERE itemnumber=? |
349 |
"; |
350 |
"; |
Lines 352-359
sub GetReservesFromItemnumber {
Link Here
|
352 |
} |
353 |
} |
353 |
my $sth_res = $dbh->prepare($query); |
354 |
my $sth_res = $dbh->prepare($query); |
354 |
$sth_res->execute($itemnumber); |
355 |
$sth_res->execute($itemnumber); |
355 |
my ( $reservedate, $borrowernumber,$branchcode ) = $sth_res->fetchrow_array; |
356 |
|
356 |
return ( $reservedate, $borrowernumber, $branchcode ); |
357 |
my $reserve = $sth_res->fetchrow_hashref(); |
|
|
358 |
|
359 |
return ( $reserve->{'reservedate'}, $reserve->{'borrowernumber'}, $reserve->{'branchcode'}, $reserve ); |
357 |
} |
360 |
} |
358 |
|
361 |
|
359 |
=head2 GetReservesFromBorrowernumber |
362 |
=head2 GetReservesFromBorrowernumber |
Lines 525-533
sub GetMaxPickupDate {
Link Here
|
525 |
$item = C4::Items::GetItem( $reserve->{itemnumber} ); |
528 |
$item = C4::Items::GetItem( $reserve->{itemnumber} ); |
526 |
} |
529 |
} |
527 |
|
530 |
|
528 |
unless ( defined $reserve ) { |
531 |
unless ( defined $reserve && defined $reserve->{'branchcode'} ) { |
529 |
my $reserve = GetReservesFromItemnumber( $item->{itemnumber} ); |
532 |
( undef, undef, undef, $reserve ) = GetReservesFromItemnumber( $item->{itemnumber} ); |
530 |
} |
533 |
} |
|
|
534 |
|
531 |
return unless $reserve->{waitingdate}; |
535 |
return unless $reserve->{waitingdate}; |
532 |
|
536 |
|
533 |
my $borrower = C4::Members::GetMember( 'borrowernumber' => $reserve->{borrowernumber} ); |
537 |
my $borrower = C4::Members::GetMember( 'borrowernumber' => $reserve->{borrowernumber} ); |
Lines 548-553
sub GetMaxPickupDate {
Link Here
|
548 |
|
552 |
|
549 |
$date->add( days => $holdspickupdelay ); |
553 |
$date->add( days => $holdspickupdelay ); |
550 |
|
554 |
|
|
|
555 |
my $calendar = C4::Calendar->new( branchcode => $reserve->{'branchcode'} ); |
556 |
my $is_holiday = $calendar->isHoliday( $date->day(), $date->month(), $date->year() ); |
557 |
|
558 |
while ( $is_holiday ) { |
559 |
$date->add( days => 1 ); |
560 |
$is_holiday = $calendar->isHoliday( $date->day(), $date->month(), $date->year() ); |
561 |
} |
562 |
|
551 |
return $date; |
563 |
return $date; |
552 |
} |
564 |
} |
553 |
|
565 |
|
554 |
- |
|
|