Bug 8251 - Patrons get incorrectly debarred

[koha.git] / Koha / Calendar.pm

diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm
index 1e7299c..dc132cd 100644 (file)
--- a/Koha/Calendar.pm
+++ b/Koha/Calendar.pm
@@ -168,17 +168,37 @@ sub days_between {
     my $self     = shift;
     my $start_dt = shift;
     my $end_dt   = shift;
-    $start_dt->truncate( to => 'hours' );
-    $end_dt->truncate( to => 'hours' );
+
+    my $datestart_temp = $start_dt->clone();
+    my $dateend_temp = $end_dt->clone();
 
     # start and end should not be closed days
-    my $duration = $end_dt - $start_dt;
+    $datestart_temp->truncate( to => 'day' );
+    $dateend_temp->truncate( to => 'day' );
+    my $duration = $dateend_temp - $datestart_temp;
+    while ( DateTime->compare( $datestart_temp, $dateend_temp ) == -1 ) {
+        $datestart_temp->add( days => 1 );
+        if ( $self->is_holiday($datestart_temp) ) {
+            $duration->subtract( days => 1 );
+        }
+    }
+    return $duration;
+
+}
+
+sub hours_between {
+    my ($self, $start_dt, $end_dt) = @_;
+    my $duration = $end_dt->delta_ms($start_dt);
     $start_dt->truncate( to => 'days' );
     $end_dt->truncate( to => 'days' );
+    # NB this is a kludge in that it assumes all days are 24 hours
+    # However for hourly loans the logic should be expanded to
+    # take into account open/close times then it would be a duration
+    # of library open hours
     while ( DateTime->compare( $start_dt, $end_dt ) == -1 ) {
         $start_dt->add( days => 1 );
         if ( $self->is_holiday($start_dt) ) {
-            $duration->subtract( days => 1 );
+            $duration->subtract( hours => 24 );
         }
     }
     return $duration;