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

(-)a/C4/HoldsQueue.pm (-5 / +5 lines)
Lines 30-36 use C4::Circulation; Link Here
30
use C4::Members;
30
use C4::Members;
31
use C4::Biblio;
31
use C4::Biblio;
32
use C4::Dates qw/format_date/;
32
use C4::Dates qw/format_date/;
33
use C4::Calendar;
33
use Koha::Calendar;
34
use Koha::Database;
34
use Koha::Database;
35
use Koha::DateUtils;
35
use Koha::DateUtils;
36
36
Lines 81-89 sub TransportCostMatrix { Link Here
81
        };
81
        };
82
82
83
        if ( C4::Context->preference("HoldsQueueSkipClosed") ) {
83
        if ( C4::Context->preference("HoldsQueueSkipClosed") ) {
84
            $calendars->{$from} ||= C4::Calendar->new( branchcode => $from );
84
            $calendars->{$from} ||= Koha::Calendar->new( branchcode => $from );
85
            $transport_cost_matrix{$to}{$from}{disable_transfer} ||=
85
            $transport_cost_matrix{$to}{$from}{disable_transfer} ||=
86
              $calendars->{$from}->isHoliday( $today->day(), $today->month(), $today->year() );
86
              $calendars->{$from}->is_holiday( $today );
87
        }
87
        }
88
88
89
    }
89
    }
Lines 614-621 sub load_branches_to_pull_from { Link Here
614
    my $today = dt_from_string();
614
    my $today = dt_from_string();
615
    if ( C4::Context->preference('HoldsQueueSkipClosed') ) {
615
    if ( C4::Context->preference('HoldsQueueSkipClosed') ) {
616
        @branches_to_use = grep {
616
        @branches_to_use = grep {
617
            !C4::Calendar->new( branchcode => $_ )
617
            !Koha::Calendar->new( branchcode => $_ )
618
              ->isHoliday( $today->day(), $today->month(), $today->year() )
618
              ->is_holiday( $today )
619
        } @branches_to_use;
619
        } @branches_to_use;
620
    }
620
    }
621
621
(-)a/t/db_dependent/HoldsQueue.t (-1 / +1 lines)
Lines 11-16 use Modern::Perl; Link Here
11
use Test::More tests => 23;
11
use Test::More tests => 23;
12
use Data::Dumper;
12
use Data::Dumper;
13
13
14
use C4::Calendar;
14
use C4::Context;
15
use C4::Context;
15
use C4::Branch;
16
use C4::Branch;
16
use C4::ItemType;
17
use C4::ItemType;
17
- 

Return to bug 12803