Lines 724-730
sub GetReservesForBranch {
Link Here
|
724 |
my $dbh = C4::Context->dbh; |
724 |
my $dbh = C4::Context->dbh; |
725 |
|
725 |
|
726 |
my $query = " |
726 |
my $query = " |
727 |
SELECT reserve_id,borrowernumber,reservedate,itemnumber,waitingdate |
727 |
SELECT reserve_id,borrowernumber,reservedate,itemnumber,waitingdate,branchcode |
728 |
FROM reserves |
728 |
FROM reserves |
729 |
WHERE priority='0' |
729 |
WHERE priority='0' |
730 |
AND found='W' |
730 |
AND found='W' |
Lines 940-951
sub CancelExpiredReserves {
Link Here
|
940 |
$sth = $dbh->prepare( $query ); |
940 |
$sth = $dbh->prepare( $query ); |
941 |
$sth->execute( $max_pickup_delay ); |
941 |
$sth->execute( $max_pickup_delay ); |
942 |
|
942 |
|
|
|
943 |
my $today = DateTime->now( time_zone => C4::Context->tz() ); |
944 |
|
943 |
while (my $res = $sth->fetchrow_hashref ) { |
945 |
while (my $res = $sth->fetchrow_hashref ) { |
944 |
if ( $charge ) { |
946 |
my $expiration = _reserve_last_pickup_date( $res ); |
945 |
manualinvoice($res->{'borrowernumber'}, $res->{'itemnumber'}, 'Hold waiting too long', 'F', $charge); |
947 |
if ( $today > $expiration ) { |
|
|
948 |
if ( $charge ) { |
949 |
manualinvoice($res->{'borrowernumber'}, $res->{'itemnumber'}, 'Hold waiting too long', 'F', $charge); |
950 |
} |
951 |
CancelReserve({ reserve_id => $res->{'reserve_id'} }); |
946 |
} |
952 |
} |
947 |
|
|
|
948 |
CancelReserve({ reserve_id => $res->{'reserve_id'} }); |
949 |
} |
953 |
} |
950 |
} |
954 |
} |
951 |
|
955 |
|
952 |
- |
|
|