From f4224a7361ddfb8a62cb0235f24e5cc2a6808b9c Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 29 Jun 2020 09:54:58 +0100 Subject: [PATCH] Bug 25850: (QA follow-up) Match logic in is_holiday --- Koha/Calendar.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm index f2bc834c34..0b5ac1862d 100644 --- a/Koha/Calendar.pm +++ b/Koha/Calendar.pm @@ -246,11 +246,18 @@ sub get_push_amt { unless exists $self->{days_mode}; my $dow = $base_date->day_of_week; + # Representation fix + # DateTime object dow (1-7) where Monday is 1 + # Arrays are 0-based where 0 = Sunday, not 7. + if ( $dow == 7 ) { + $dow = 0; + } + return ( # We're using Dayweek useDaysMode option $self->{days_mode} eq 'Dayweek' && # It's not a permanently closed day - !$self->{weekly_closed_days}->[$dow % 7] + !$self->{weekly_closed_days}->[$dow] ) ? 7 : 1; } -- 2.20.1