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

(-)a/C4/Circulation.pm (-3 / +62 lines)
Lines 63-68 use Koha::SearchEngine::Indexer; Link Here
63
use Koha::Exceptions::Checkout;
63
use Koha::Exceptions::Checkout;
64
use Koha::Plugins;
64
use Koha::Plugins;
65
use Koha::Recalls;
65
use Koha::Recalls;
66
use Koha::Library::Hours;
66
use Carp qw( carp );
67
use Carp qw( carp );
67
use List::MoreUtils qw( any );
68
use List::MoreUtils qw( any );
68
use Scalar::Util qw( looks_like_number );
69
use Scalar::Util qw( looks_like_number );
Lines 3729-3739 sub CalcDateDue { Link Here
3729
        }
3730
        }
3730
    );
3731
    );
3731
3732
3733
    my $considerlibraryhours = C4::Context->preference('ConsiderLibraryHoursWhenIssuing');
3734
    # starter vars so don't do calculations directly to $datedue
3735
    my $potential_datedue = $datedue->clone;
3736
    my $library_close = $datedue->clone;
3737
    my $dayofweek = $datedue->local_day_of_week - 1;
3738
    my $todayhours = Koha::Library::Hours->find({ branchcode => $branch, day => $dayofweek });
3739
    my @close = undef;
3740
    my $tomorrowhours = Koha::Library::Hours->find({ branchcode => $branch, day => $dayofweek+1 }); # get open hours of next day
3741
    my @open = undef;
3742
    if ( $todayhours->close_time and $tomorrowhours->open_time ) {
3743
        @close = split( ":", $todayhours->close_time );
3744
        $library_close = $library_close->set( hour => $close[0], minute => $close[1] );
3745
        $potential_datedue = $potential_datedue->add( hours => $loanlength->{$length_key} ); # datedue without consideration for open hours
3746
        @open = split( ":", $tomorrowhours->open_time );
3747
    }
3748
3732
    # calculate the datedue as normal
3749
    # calculate the datedue as normal
3733
    if ( $daysmode eq 'Days' )
3750
    if ( $daysmode eq 'Days' )
3734
    {    # ignoring calendar
3751
    {    # ignoring calendar
3735
        if ( $loanlength->{lengthunit} eq 'hours' ) {
3752
        if ( $loanlength->{lengthunit} eq 'hours' ) {
3736
            $datedue->add( hours => $loanlength->{$length_key} );
3753
            if ( $potential_datedue > $library_close and $todayhours->close_time and $tomorrowhours->open_time ) {
3754
                if ( $considerlibraryhours eq 'close' ) {
3755
                    # datedue will be after the library closes on that day
3756
                    # shorten loan period to end when library closes
3757
                    $datedue->set( hour => $close[0], minute => $close[1] );
3758
                } elsif ( $considerlibraryhours eq 'open' ) {
3759
                    # datedue will be after the library closes on that day
3760
                    # extend loan period to when library opens following day
3761
                    $datedue->add( days => 1 )->set( hour => $open[0], minute => $open[1] );
3762
                } else {
3763
                    # ignore library open hours
3764
                    $datedue->add( hours => $loanlength->{$length_key} );
3765
                }
3766
            } else {
3767
                # due time doesn't conflict with library open hours, don't need to check
3768
                $datedue->add( hours => $loanlength->{$length_key} );
3769
            }
3737
        } else {    # days
3770
        } else {    # days
3738
            $datedue->add( days => $loanlength->{$length_key} );
3771
            $datedue->add( days => $loanlength->{$length_key} );
3739
            $datedue->set_hour(23);
3772
            $datedue->set_hour(23);
Lines 3741-3757 sub CalcDateDue { Link Here
3741
        }
3774
        }
3742
    } else {
3775
    } else {
3743
        my $dur;
3776
        my $dur;
3777
        my $sethours;
3744
        if ($loanlength->{lengthunit} eq 'hours') {
3778
        if ($loanlength->{lengthunit} eq 'hours') {
3745
            $dur = DateTime::Duration->new( hours => $loanlength->{$length_key});
3779
            if ( $potential_datedue > $library_close and $todayhours->close_time and $tomorrowhours->open_time ) {
3780
                if ( $considerlibraryhours eq 'close' ) {
3781
                    # datedue will be after the library closes on that day
3782
                    # shorten loan period to end when library closes
3783
                    $dur = $potential_datedue->delta_ms( $library_close );
3784
                    $sethours = $considerlibraryhours;
3785
                } elsif ( $considerlibraryhours eq 'open' ) {
3786
                    # datedue will be after the library closes on that day
3787
                    # extend loan period to when library opens following day
3788
                    my $library_open = $datedue->clone->set( hour => $open[0], minute => $open[1] );
3789
                    $dur = $potential_datedue->delta_ms( $library_open )->add( days => 1 );
3790
                    $sethours = $considerlibraryhours;
3791
                } else {
3792
                    # ignore library open hours
3793
                    $dur = DateTime::Duration->new( hours => $loanlength->{$length_key} );
3794
                }
3795
            } else {
3796
                # due time doesn't conflict with library open hours, don't need to check
3797
                $dur = DateTime::Duration->new( hours => $loanlength->{$length_key} );
3798
            }
3746
        }
3799
        }
3747
        else { # days
3800
        else { # days
3748
            $dur = DateTime::Duration->new( days => $loanlength->{$length_key});
3801
            $dur = DateTime::Duration->new( days => $loanlength->{$length_key} );
3749
        }
3802
        }
3750
        my $calendar = Koha::Calendar->new( branchcode => $branch, days_mode => $daysmode );
3803
        my $calendar = Koha::Calendar->new( branchcode => $branch, days_mode => $daysmode );
3751
        $datedue = $calendar->addDuration( $datedue, $dur, $loanlength->{lengthunit} );
3804
        $datedue = $calendar->addDuration( $datedue, $dur, $loanlength->{lengthunit} );
3752
        if ($loanlength->{lengthunit} eq 'days') {
3805
        if ($loanlength->{lengthunit} eq 'days') {
3753
            $datedue->set_hour(23);
3806
            $datedue->set_hour(23);
3754
            $datedue->set_minute(59);
3807
            $datedue->set_minute(59);
3808
        } else {
3809
            if ( $sethours and $sethours eq 'close' ) {
3810
                $datedue->set( hour => $close[0], minute => $close[1] );
3811
            } elsif ( $sethours and $sethours eq 'open' ) {
3812
                $datedue->set( hour => $open[0], minute => $open[1] );
3813
            }
3755
        }
3814
        }
3756
    }
3815
    }
3757
3816
(-)a/t/db_dependent/Circulation/CalcDateDue.t (-3 / +81 lines)
Lines 2-15 Link Here
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::Hour;
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 340-344 my $renewed_date = $start_date->clone->add( days => 7 ); Link Here
340
$date = C4::Circulation::CalcDateDue( $start_date, $itemtype, $branchcode, $borrower, 1 );
341
$date = C4::Circulation::CalcDateDue( $start_date, $itemtype, $branchcode, $borrower, 1 );
341
is( $date->ymd, $renewed_date->ymd, 'Renewal period of "" should trigger fallover to issuelength for renewal' );
342
is( $date->ymd, $renewed_date->ymd, 'Renewal period of "" should trigger fallover to issuelength for renewal' );
342
343
344
# Testing hourly loans consider library open hours
345
346
my $library1 = $builder->build( { source => 'Branch' } );
347
Koha::CirculationRules->set_rules(
348
    {
349
        categorycode => $categorycode,
350
        itemtype     => $itemtype,
351
        branchcode   => $library1->{branchcode},
352
        rules        => {
353
            issuelength   => 3, # loan period is 3 hours
354
            lengthunit    => 'hours',
355
        }
356
    }
357
);
358
359
my $open = DateTime->now->subtract( hours => 4 )->hms;
360
my $close = DateTime->now->add( hours => 2 )->hms;
361
my $now = DateTime->now;
362
363
foreach (0..6) {
364
    # library opened 4 hours ago and closes in 2 hours.
365
    Koha::Library::Hour->new({ day => $_, branchcode => $library1->{branchcode}, open_time => $open, close_time => $close })->store;
366
}
367
368
# ignore calendar
369
t::lib::Mocks::mock_preference('useDaysMode', 'Days');
370
t::lib::Mocks::mock_preference('ConsiderLibraryHoursWhenIssuing', 'close');
371
# shorten loan period
372
373
$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
374
my $expected_duetime = DateTime->now->add( hours => 2 );
375
is( $date, $expected_duetime, "Loan period was shortened because ConsiderLibraryHoursWhenIssuing is set to close time" );
376
377
t::lib::Mocks::mock_preference('ConsiderLibraryHoursWhenIssuing', 'open');
378
# extend loan period
379
380
$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
381
$expected_duetime = DateTime->now->add( days => 1 )->subtract( hours => 4 );
382
is( $date, $expected_duetime, "Loan period was extended because ConsiderLibraryHoursWhenIssuing is set to open time" );
383
384
my $holiday_tomorrow = DateTime->now->add( days => 1 );
385
386
# consider calendar
387
my $library1_calendar = C4::Calendar->new( branchcode => $library1->{branchcode} );
388
$library1_calendar->insert_single_holiday(
389
    day             => $holiday_tomorrow->day,
390
    month           => $holiday_tomorrow->month,
391
    year            => $holiday_tomorrow->year,
392
    title           => 'testholiday',
393
    description     => 'testholiday'
394
);
395
Koha::CirculationRules->set_rules(
396
    {
397
        categorycode => $categorycode,
398
        itemtype     => $itemtype,
399
        branchcode   => $library1->{branchcode},
400
        rules        => {
401
            issuelength   => 13, # loan period must cross over into tomorrow
402
            lengthunit    => 'hours',
403
        }
404
    }
405
);
406
407
t::lib::Mocks::mock_preference('useDaysMode', 'Calendar');
408
t::lib::Mocks::mock_preference('ConsiderLibraryHoursWhenIssuing', 'close');
409
# shorten loan period
410
411
$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
412
$expected_duetime = DateTime->now->add( days => 2, hours => 2 );
413
is( $date, $expected_duetime, "Loan period was shortened (but considers the holiday) because ConsiderLibraryHoursWhenIssuing is set to close time" );
414
415
t::lib::Mocks::mock_preference('ConsiderLibraryHoursWhenIssuing', 'open');
416
# extend loan period
417
418
$date = C4::Circulation::CalcDateDue( $now, $itemtype, $library1->{branchcode}, $borrower );
419
$expected_duetime = DateTime->now->add( days => 2 )->subtract( hours => 4 );
420
is( $date, $expected_duetime, "Loan period was extended (but considers the holiday) because ConsiderLibraryHoursWhenIssuing is set to open time" );
421
343
$cache->clear_from_cache($key);
422
$cache->clear_from_cache($key);
344
$schema->storage->txn_rollback;
423
$schema->storage->txn_rollback;
345
- 

Return to bug 6796