=cut
sub CancelExpiredReserves {
- return unless C4::Context->preference("ExpireReservesMaxPickUpDelay");
my $today = dt_from_string();
my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');
$expirationdate->add(days => $max_pickup_delay);
if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
- $expirationdate = $calendar->days_forward( dt_from_string($self->waitingdate), $max_pickup_delay );
+ $expirationdate = $calendar->days_forward( dt_from_string(), $max_pickup_delay );
}
# If patron's requested expiration date is prior to the
use t::lib::Mocks;
use t::lib::TestBuilder;
-use Test::More tests => 6;
+use Test::More tests => 5;
use_ok('C4::Reserves');
CancelExpiredReserves();
my $r2 = Koha::Holds->find($reserve2->{reserve_id});
-ok($r2, 'Without ExpireReservesMaxPickUpDelay, reserve 2 should not be canceled.');
-
-t::lib::Mocks::mock_preference('ExpireReservesMaxPickUpDelay', 1);
-CancelExpiredReserves();
-$r2 = Koha::Holds->find($reserve2->{reserve_id});
-is($r2, undef,'With ExpireReservesMaxPickUpDelay, reserve 2 should be canceled.');
+is($r2, undef,'reserve 2 should be canceled.');
# Reserve expired on holiday
my $reserve3 = $builder->build({