gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 6796: day_of_week representation fix 

The code here was flawed, DateTime returns a 1-7 indexed array with the
first day being Monday, Koha expects an 0-6 indexed array with the first
day being Sunday.

Sponsored-by: PTFS Europe
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Martin Renvoize 2024-02-12 15:48:06 +00:00 committed by Katrin Fischer
parent 688a551e70
commit 8017463d34
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
C4/Circulation.pm
View File

@ -3893,11 +3893,20 @@ sub CalcDateDue {
# starter vars so don't do calculations directly to $datedue
my $potential_datedue = $datedue->clone;
my $library_close = $datedue->clone;
my $dayofweek = $datedue->day_of_week - 1;
my $tomorrow_dayofweek = $dayofweek + 1;
my $dayofweek = $datedue->day_of_week;
# Representation fix
# DateTime object dow (1-7) where Monday is 1
# Arrays are 0-based where 0 = Sunday, not 7.
if ( $dayofweek == 7 ) {
$dayofweek = 0;
}
my $tomorrow_dayofweek = $dayofweek + 1;
if ( $tomorrow_dayofweek == 7 ) {
$tomorrow_dayofweek = 0;
}
# If it's Sunday and tomorrow would be == 7, make tomorrow 0 (Days are stored as 0-6)
if ( $tomorrow_dayofweek > 6 ) { $tomorrow_dayofweek = 0; }
my $todayhours = Koha::Library::Hours->find( { library_id => $branch, day => $dayofweek } );
my @close = undef;
my $tomorrowhours = Koha::Library::Hours->find( { library_id => $branch, day => $tomorrow_dayofweek } )