Attachment #164513 for bug #6796

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




use Koha::Exceptions::Checkout;
use Koha::Plugins;
use Koha::Recalls;
use Koha::Library::Hours;
use Carp qw( carp );
use List::MoreUtils qw( any );
use Scalar::Util qw( looks_like_number blessed );

        }
    );

    my $considerlibraryhours = C4::Context->preference('ConsiderLibraryHoursInCirculation');

    # starter vars so don't do calculations directly to $datedue
    my $potential_datedue = $datedue->clone;
    my $library_close = $datedue->clone;
    my $dayofweek = $datedue->local_day_of_week - 1;
    my $todayhours = Koha::Library::Hours->find({ library_id => $branch, day => $dayofweek });
    my @close = undef;
    my $tomorrowhours = Koha::Library::Hours->find({ library_id => $branch, day => $dayofweek+1 }); # get open hours of next day
    my @open = undef;
    if ( $todayhours->close_time and $tomorrowhours->open_time ) {
        @close = split( ":", $todayhours->close_time );
        $library_close = $library_close->set( hour => $close[0], minute => $close[1] );
        $potential_datedue = $potential_datedue->add( hours => $loanlength->{$length_key} ); # datedue without consideration for open hours
        @open = split( ":", $tomorrowhours->open_time );
    }

    # calculate the datedue as normal
    if ( $daysmode eq 'Days' )
    {    # ignoring calendar
        if ( $loanlength->{lengthunit} eq 'hours' ) {
            if ( $potential_datedue > $library_close and $todayhours->close_time and $tomorrowhours->open_time ) {
                if ( $considerlibraryhours eq 'close' ) {
                    # datedue will be after the library closes on that day
                    # shorten loan period to end when library closes
                    $datedue->set( hour => $close[0], minute => $close[1] );
                } elsif ( $considerlibraryhours eq 'open' ) {
                    # datedue will be after the library closes on that day
                    # extend loan period to when library opens following day
                    $datedue->add( days => 1 )->set( hour => $open[0], minute => $open[1] );
                } else {
                    # ignore library open hours
                    $datedue->add( hours => $loanlength->{$length_key} );
                }
            } else {
                # due time doesn't conflict with library open hours, don't need to check
                $datedue->add( hours => $loanlength->{$length_key} );
            }
        } else {    # days
            $datedue->add( days => $loanlength->{$length_key} );
            $datedue->set_hour(23);

        }
    } else {
        my $dur;
        my $sethours;
        if ($loanlength->{lengthunit} eq 'hours') {
            if ( $potential_datedue > $library_close and $todayhours->close_time and $tomorrowhours->open_time ) {
                if ( $considerlibraryhours eq 'close' ) {
                    # datedue will be after the library closes on that day
                    # shorten loan period to end when library closes
                    $dur = $potential_datedue->delta_ms( $library_close );
                    $sethours = $considerlibraryhours;
                } elsif ( $considerlibraryhours eq 'open' ) {
                    # datedue will be after the library closes on that day
                    # extend loan period to when library opens following day
                    my $library_open = $datedue->clone->set( hour => $open[0], minute => $open[1] );
                    $dur = $potential_datedue->delta_ms( $library_open )->add( days => 1 );
                    $sethours = $considerlibraryhours;
                } else {
                    # ignore library open hours
                    $dur = DateTime::Duration->new( hours => $loanlength->{$length_key} );
                }
            } else {
                # due time doesn't conflict with library open hours, don't need to check
                $dur = DateTime::Duration->new( hours => $loanlength->{$length_key} );
            }
        }
        else { # days
            $dur = DateTime::Duration->new( days => $loanlength->{$length_key} );
        }
        my $calendar = Koha::Calendar->new( branchcode => $branch, days_mode => $daysmode );
        $datedue = $calendar->addDuration( $datedue, $dur, $loanlength->{lengthunit} );
        if ($loanlength->{lengthunit} eq 'days') {
            $datedue->set_hour(23);
            $datedue->set_minute(59);
        } else {
            if ( $sethours and $sethours eq 'close' ) {
                $datedue->set( hour => $close[0], minute => $close[1] );
            } elsif ( $sethours and $sethours eq 'open' ) {
                $datedue->set( hour => $open[0], minute => $open[1] );
            }
        }
    }






use Modern::Perl;

use Test::More tests => 23;
use Test::MockModule;
use DBI;
use DateTime;
use t::lib::Mocks;
use t::lib::TestBuilder;
use C4::Calendar qw( new insert_single_holiday delete_holiday insert_week_day_holiday );
use Koha::DateUtils qw( dt_from_string );
use Koha::Library::Hours;
use Koha::CirculationRules;

use_ok('C4::Circulation', qw( CalcDateDue ));

$schema->storage->txn_begin;
my $builder = t::lib::TestBuilder->new;

t::lib::Mocks::mock_preference( 'ConsiderLibraryHoursInCirculation', 'ignore' );
my $library = $builder->build_object({ class => 'Koha::Libraries' })->store;
my $dateexpiry = '2013-01-01';
my $patron_category = $builder->build_object({ class => 'Koha::Patron::Categories', value => { category_type => 'B' } })->store;

$date = C4::Circulation::CalcDateDue( $start_date, $itemtype, $branchcode, $borrower, 1 );
is( $date->ymd, $renewed_date->ymd, 'Renewal period of "" should trigger fallover to issuelength for renewal' );

# Testing hourly loans consider library open hours

my $library1 = $builder->build( { source => 'Branch' } );
Koha::CirculationRules->set_rules(
    {
        categorycode => $categorycode,
        itemtype     => $itemtype,
        branchcode   => $library1->{branchcode},
        rules        => {
            issuelength   => 3, # loan period is 3 hours
            lengthunit    => 'hours',
        }
    }
);

my $open = DateTime->now->subtract( hours => 4 )->hms;
my $close = DateTime->now->add( hours => 2 )->hms;
my $now = DateTime->now;

foreach (0..6) {
    # library opened 4 hours ago and closes in 2 hours.
    Koha::Library::Hour->new({ day => $_, library_id => $library1->{branchcode}, open_time => $open, close_time => $close })->store;
}

# ignore calendar
t::lib::Mocks::mock_preference('useDaysMode', 'Days');
t::lib::Mocks::mock_preference('ConsiderLibraryHoursInCirculation', 'close');
# shorten loan period

$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
my $expected_duetime = DateTime->now->add( hours => 2 );
is( $date, $expected_duetime, "Loan period was shortened because ConsiderLibraryHoursInCirculation is set to close time" );

t::lib::Mocks::mock_preference('ConsiderLibraryHoursWhenIssuing', 'open');
# extend loan period

$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
$expected_duetime = DateTime->now->add( days => 1 )->subtract( hours => 4 );
is( $date, $expected_duetime, "Loan period was extended because ConsiderLibraryHoursInCirculation is set to open time" );

my $holiday_tomorrow = DateTime->now->add( days => 1 );

# consider calendar
my $library1_calendar = C4::Calendar->new( branchcode => $library1->{branchcode} );
$library1_calendar->insert_single_holiday(
    day             => $holiday_tomorrow->day,
    month           => $holiday_tomorrow->month,
    year            => $holiday_tomorrow->year,
    title           => 'testholiday',
    description     => 'testholiday'
);
Koha::CirculationRules->set_rules(
    {
        categorycode => $categorycode,
        itemtype     => $itemtype,
        branchcode   => $library1->{branchcode},
        rules        => {
            issuelength   => 13, # loan period must cross over into tomorrow
            lengthunit    => 'hours',
        }
    }
);

t::lib::Mocks::mock_preference('useDaysMode', 'Calendar');
t::lib::Mocks::mock_preference('ConsiderLibraryHoursInCirculation', 'close');
# shorten loan period

$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
$expected_duetime = DateTime->now->add( days => 2, hours => 2 );
is( $date, $expected_duetime, "Loan period was shortened (but considers the holiday) because ConsiderLibraryHoursInCirculation is set to close time" );

t::lib::Mocks::mock_preference( 'ConsiderLibraryHoursInCirculation', 'open' );
# extend loan period

$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
$expected_duetime = DateTime->now->add( days => 2 )->subtract( hours => 4 );
is( $date, $expected_duetime, "Loan period was extended (but considers the holiday) because ConsiderLibraryHoursInCirculation is set to open time" );

$cache->clear_from_cache($key);
$schema->storage->txn_rollback;
- 

Return to bug 6796

Lines 62-67 use Koha::SearchEngine::Indexer; Link Here

(-)a/C4/Circulation.pm (-3 / +63 lines)
62	use Koha::Exceptions::Checkout;	62	use Koha::Exceptions::Checkout;
63	use Koha::Plugins;	63	use Koha::Plugins;
64	use Koha::Recalls;	64	use Koha::Recalls;
		65	use Koha::Library::Hours;
65	use Carp qw( carp );	66	use Carp qw( carp );
66	use List::MoreUtils qw( any );	67	use List::MoreUtils qw( any );
67	use Scalar::Util qw( looks_like_number blessed );	68	use Scalar::Util qw( looks_like_number blessed );
Lines 3887-3897 sub CalcDateDue { Link Here
3887	}	3888	}
3888	);	3889	);
3889		3890
		3891	my $considerlibraryhours = C4::Context->preference('ConsiderLibraryHoursInCirculation');
		3892
		3893	# starter vars so don't do calculations directly to $datedue
		3894	my $potential_datedue = $datedue->clone;
		3895	my $library_close = $datedue->clone;
		3896	my $dayofweek = $datedue->local_day_of_week - 1;
		3897	my $todayhours = Koha::Library::Hours->find({ library_id => $branch, day => $dayofweek });
		3898	my @close = undef;
		3899	my $tomorrowhours = Koha::Library::Hours->find({ library_id => $branch, day => $dayofweek+1 }); # get open hours of next day
		3900	my @open = undef;
		3901	if ( $todayhours->close_time and $tomorrowhours->open_time ) {
		3902	@close = split( ":", $todayhours->close_time );
		3903	$library_close = $library_close->set( hour => $close[0], minute => $close[1] );
		3904	$potential_datedue = $potential_datedue->add( hours => $loanlength->{$length_key} ); # datedue without consideration for open hours
		3905	@open = split( ":", $tomorrowhours->open_time );
		3906	}
		3907
3890	# calculate the datedue as normal	3908	# calculate the datedue as normal
3891	if ( $daysmode eq 'Days' )	3909	if ( $daysmode eq 'Days' )
3892	{ # ignoring calendar	3910	{ # ignoring calendar
3893	if ( $loanlength->{lengthunit} eq 'hours' ) {	3911	if ( $loanlength->{lengthunit} eq 'hours' ) {
3894	$datedue->add( hours => $loanlength->{$length_key} );	3912	if ( $potential_datedue > $library_close and $todayhours->close_time and $tomorrowhours->open_time ) {
		3913	if ( $considerlibraryhours eq 'close' ) {
		3914	# datedue will be after the library closes on that day
		3915	# shorten loan period to end when library closes
		3916	$datedue->set( hour => $close[0], minute => $close[1] );
		3917	} elsif ( $considerlibraryhours eq 'open' ) {
		3918	# datedue will be after the library closes on that day
		3919	# extend loan period to when library opens following day
		3920	$datedue->add( days => 1 )->set( hour => $open[0], minute => $open[1] );
		3921	} else {
		3922	# ignore library open hours
		3923	$datedue->add( hours => $loanlength->{$length_key} );
		3924	}
		3925	} else {
		3926	# due time doesn't conflict with library open hours, don't need to check
		3927	$datedue->add( hours => $loanlength->{$length_key} );
		3928	}
3895	} else { # days	3929	} else { # days
3896	$datedue->add( days => $loanlength->{$length_key} );	3930	$datedue->add( days => $loanlength->{$length_key} );
3897	$datedue->set_hour(23);	3931	$datedue->set_hour(23);
Lines 3899-3915 sub CalcDateDue { Link Here
3899	}	3933	}
3900	} else {	3934	} else {
3901	my $dur;	3935	my $dur;
		3936	my $sethours;
3902	if ($loanlength->{lengthunit} eq 'hours') {	3937	if ($loanlength->{lengthunit} eq 'hours') {
3903	$dur = DateTime::Duration->new( hours => $loanlength->{$length_key});	3938	if ( $potential_datedue > $library_close and $todayhours->close_time and $tomorrowhours->open_time ) {
		3939	if ( $considerlibraryhours eq 'close' ) {
		3940	# datedue will be after the library closes on that day
		3941	# shorten loan period to end when library closes
		3942	$dur = $potential_datedue->delta_ms( $library_close );
		3943	$sethours = $considerlibraryhours;
		3944	} elsif ( $considerlibraryhours eq 'open' ) {
		3945	# datedue will be after the library closes on that day
		3946	# extend loan period to when library opens following day
		3947	my $library_open = $datedue->clone->set( hour => $open[0], minute => $open[1] );
		3948	$dur = $potential_datedue->delta_ms( $library_open )->add( days => 1 );
		3949	$sethours = $considerlibraryhours;
		3950	} else {
		3951	# ignore library open hours
		3952	$dur = DateTime::Duration->new( hours => $loanlength->{$length_key} );
		3953	}
		3954	} else {
		3955	# due time doesn't conflict with library open hours, don't need to check
		3956	$dur = DateTime::Duration->new( hours => $loanlength->{$length_key} );
		3957	}
3904	}	3958	}
3905	else { # days	3959	else { # days
3906	$dur = DateTime::Duration->new( days => $loanlength->{$length_key});	3960	$dur = DateTime::Duration->new( days => $loanlength->{$length_key} );
3907	}	3961	}
3908	my $calendar = Koha::Calendar->new( branchcode => $branch, days_mode => $daysmode );	3962	my $calendar = Koha::Calendar->new( branchcode => $branch, days_mode => $daysmode );
3909	$datedue = $calendar->addDuration( $datedue, $dur, $loanlength->{lengthunit} );	3963	$datedue = $calendar->addDuration( $datedue, $dur, $loanlength->{lengthunit} );
3910	if ($loanlength->{lengthunit} eq 'days') {	3964	if ($loanlength->{lengthunit} eq 'days') {
3911	$datedue->set_hour(23);	3965	$datedue->set_hour(23);
3912	$datedue->set_minute(59);	3966	$datedue->set_minute(59);
		3967	} else {
		3968	if ( $sethours and $sethours eq 'close' ) {
		3969	$datedue->set( hour => $close[0], minute => $close[1] );
		3970	} elsif ( $sethours and $sethours eq 'open' ) {
		3971	$datedue->set( hour => $open[0], minute => $open[1] );
		3972	}
3913	}	3973	}
3914	}	3974	}
3915		3975

Lines 2-15 Link Here

(-)a/t/db_dependent/Circulation/CalcDateDue.t (-4 / +82 lines)
2		2
3	use Modern::Perl;	3	use Modern::Perl;
4		4
5	use Test::More tests => 19;	5	use Test::More tests => 23;
6	use Test::MockModule;	6	use Test::MockModule;
7	use DBI;	7	use DBI;
8	use DateTime;	8	use DateTime;
9	use t::lib::Mocks;	9	use t::lib::Mocks;
10	use t::lib::TestBuilder;	10	use t::lib::TestBuilder;
11	use C4::Calendar qw( new insert_single_holiday delete_holiday insert_week_day_holiday );	11	use C4::Calendar qw( new insert_single_holiday delete_holiday insert_week_day_holiday );
12		12	use Koha::DateUtils qw( dt_from_string );
		13	use Koha::Library::Hours;
13	use Koha::CirculationRules;	14	use Koha::CirculationRules;
14		15
15	use_ok('C4::Circulation', qw( CalcDateDue ));	16	use_ok('C4::Circulation', qw( CalcDateDue ));
Lines 18-24 my $schema = Koha::Database->new->schema; Link Here
18	$schema->storage->txn_begin;	19	$schema->storage->txn_begin;
19	my $builder = t::lib::TestBuilder->new;	20	my $builder = t::lib::TestBuilder->new;
20		21
21		22	t::lib::Mocks::mock_preference( 'ConsiderLibraryHoursInCirculation', 'ignore' );
22	my $library = $builder->build_object({ class => 'Koha::Libraries' })->store;	23	my $library = $builder->build_object({ class => 'Koha::Libraries' })->store;
23	my $dateexpiry = '2013-01-01';	24	my $dateexpiry = '2013-01-01';
24	my $patron_category = $builder->build_object({ class => 'Koha::Patron::Categories', value => { category_type => 'B' } })->store;	25	my $patron_category = $builder->build_object({ class => 'Koha::Patron::Categories', value => { category_type => 'B' } })->store;
Lines 356-360 my $renewed_date = $start_date->clone->add( days => 7 ); Link Here
356	$date = C4::Circulation::CalcDateDue( $start_date, $itemtype, $branchcode, $borrower, 1 );	357	$date = C4::Circulation::CalcDateDue( $start_date, $itemtype, $branchcode, $borrower, 1 );
357	is( $date->ymd, $renewed_date->ymd, 'Renewal period of "" should trigger fallover to issuelength for renewal' );	358	is( $date->ymd, $renewed_date->ymd, 'Renewal period of "" should trigger fallover to issuelength for renewal' );
358		359
		360	# Testing hourly loans consider library open hours
		361
		362	my $library1 = $builder->build( { source => 'Branch' } );
		363	Koha::CirculationRules->set_rules(
		364	{
		365	categorycode => $categorycode,
		366	itemtype => $itemtype,
		367	branchcode => $library1->{branchcode},
		368	rules => {
		369	issuelength => 3, # loan period is 3 hours
		370	lengthunit => 'hours',
		371	}
		372	}
		373	);
		374
		375	my $open = DateTime->now->subtract( hours => 4 )->hms;
		376	my $close = DateTime->now->add( hours => 2 )->hms;
		377	my $now = DateTime->now;
		378
		379	foreach (0..6) {
		380	# library opened 4 hours ago and closes in 2 hours.
		381	Koha::Library::Hour->new({ day => $_, library_id => $library1->{branchcode}, open_time => $open, close_time => $close })->store;
		382	}
		383
		384	# ignore calendar
		385	t::lib::Mocks::mock_preference('useDaysMode', 'Days');
		386	t::lib::Mocks::mock_preference('ConsiderLibraryHoursInCirculation', 'close');
		387	# shorten loan period
		388
		389	$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
		390	my $expected_duetime = DateTime->now->add( hours => 2 );
		391	is( $date, $expected_duetime, "Loan period was shortened because ConsiderLibraryHoursInCirculation is set to close time" );
		392
		393	t::lib::Mocks::mock_preference('ConsiderLibraryHoursWhenIssuing', 'open');
		394	# extend loan period
		395
		396	$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
		397	$expected_duetime = DateTime->now->add( days => 1 )->subtract( hours => 4 );
		398	is( $date, $expected_duetime, "Loan period was extended because ConsiderLibraryHoursInCirculation is set to open time" );
		399
		400	my $holiday_tomorrow = DateTime->now->add( days => 1 );
		401
		402	# consider calendar
		403	my $library1_calendar = C4::Calendar->new( branchcode => $library1->{branchcode} );
		404	$library1_calendar->insert_single_holiday(
		405	day => $holiday_tomorrow->day,
		406	month => $holiday_tomorrow->month,
		407	year => $holiday_tomorrow->year,
		408	title => 'testholiday',
		409	description => 'testholiday'
		410	);
		411	Koha::CirculationRules->set_rules(
		412	{
		413	categorycode => $categorycode,
		414	itemtype => $itemtype,
		415	branchcode => $library1->{branchcode},
		416	rules => {
		417	issuelength => 13, # loan period must cross over into tomorrow
		418	lengthunit => 'hours',
		419	}
		420	}
		421	);
		422
		423	t::lib::Mocks::mock_preference('useDaysMode', 'Calendar');
424	t::lib::Mocks::mock_preference('ConsiderLibraryHoursInCirculation', 'close');
425	# shorten loan period
426
427	$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
428	$expected_duetime = DateTime->now->add( days => 2, hours => 2 );
429	is( $date, $expected_duetime, "Loan period was shortened (but considers the holiday) because ConsiderLibraryHoursInCirculation is set to close time" );
430
431	t::lib::Mocks::mock_preference( 'ConsiderLibraryHoursInCirculation', 'open' );
432	# extend loan period
433
434	$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
435	$expected_duetime = DateTime->now->add( days => 2 )->subtract( hours => 4 );
436	is( $date, $expected_duetime, "Loan period was extended (but considers the holiday) because ConsiderLibraryHoursInCirculation is set to open time" );
437
359	$cache->clear_from_cache($key);	438	$cache->clear_from_cache($key);
360	$schema->storage->txn_rollback;	439	$schema->storage->txn_rollback;
361	-