From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 29 Jun 2020 08:54:58 +0000 (+0100)
Subject: Bug 25850: (QA follow-up) Match logic in is_holiday
X-Git-Url: http://git.equinoxoli.org/?p=koha-equinox.git;a=commitdiff_plain;h=afd88e1d21a5cb5f2198c058144065b64098c124

Bug 25850: (QA follow-up) Match logic in is_holiday

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---

diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm
index f2bc834..0b5ac18 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;
 }