return unless C4::Context->preference("ExpireReservesMaxPickUpDelay");

    return $start_dt unless $num_days > 0;

    # If patron's requested expiration date is prior to the

    # calculated one, we keep the patron's one.

    my $cmp = $requested_expiration ? DateTime->compare($requested_expiration, $expirationdate) : 0;

    $values->{expirationdate} = $cmp == -1 ? $requested_expiration->ymd : $expirationdate->ymd;

use C4::Context;

use Koha::Holds;

use Koha::DateUtils;

use Koha::Calendar;

my $waiting_holds = Koha::Holds->search({ found => 'W', priority => 0 });

while ( my $hold = $waiting_holds->next ) {

    my $requested_expiration;

    if ($hold->expirationdate) {

        $requested_expiration = dt_from_string($hold->expirationdate);

    }

    if ( my $waitingdate = dt_from_string($hold->waitingdate) ) {

        my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");

        my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');

        my $calendar = Koha::Calendar->new( branchcode => $hold->branchcode );

        my $expirationdate = $waitingdate->clone;

        $expirationdate->add(days => $max_pickup_delay);

        if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {

            $expirationdate = $calendar->days_forward( dt_from_string($hold->waitingdate), $max_pickup_delay );

        }

        my $cmp = $requested_expiration ? DateTime->compare($requested_expiration, $expirationdate) : 0;

        $hold->expirationdate($cmp == -1 ? $requested_expiration->ymd : $expirationdate->ymd)->store;

    }

}

#!/usr/bin/perl

# This file is part of Koha.

#

# Koha is free software; you can redistribute it and/or modify it

# under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 3 of the License, or

# (at your option) any later version.

#

# Koha is distributed in the hope that it will be useful, but

# WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use Test::More tests => 5;

use t::lib::TestBuilder;

use DateTime;

use Koha::Caches;

use Koha::DateUtils;

use_ok('Koha::Calendar');

my $schema  = Koha::Database->new->schema;

$schema->storage->txn_begin;

my $today = dt_from_string();

my $holiday_dt = $today->clone;

$holiday_dt->add(days => 15);

Koha::Caches->get_instance()->flush_all();

my $builder = t::lib::TestBuilder->new();

my $holiday = $builder->build({

    source => 'SpecialHoliday',

    value => {

        branchcode => 'LIB1',

        day => $holiday_dt->day,

        month => $holiday_dt->month,

        year => $holiday_dt->year,

        title => 'My holiday',

        isexception => 0

    },

});

my $calendar = Koha::Calendar->new( branchcode => 'LIB1');

my $forwarded_dt = $calendar->days_forward($today, 10);

my $expected = $today->clone;

$expected->add(days => 10);

is($forwarded_dt->ymd, $expected->ymd, 'With no holiday on the perioddays_forward should add 10 days');

$forwarded_dt = $calendar->days_forward($today, 20);

$expected->add(days => 11);

is($forwarded_dt->ymd, $expected->ymd, 'With holiday on the perioddays_forward should add 20 days + 1 day for holiday');

$forwarded_dt = $calendar->days_forward($today, 0);

is($forwarded_dt->ymd, $today->ymd, '0 day should return start dt');

$forwarded_dt = $calendar->days_forward($today, -2);

is($forwarded_dt->ymd, $today->ymd, 'negative day should return start dt');

$schema->storage->txn_rollback();