From 476d1daeb76306faf3ecd70f2afc8e29e98b9553 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Fri, 25 Nov 2016 13:58:43 +0100
Subject: fixes #280 shift entries finished by user returns no freeloaded
 shifts

---
 includes/model/ShiftEntry_model.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'includes/model/ShiftEntry_model.php')

diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index 99f67028..dca7e1c1 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -115,6 +115,7 @@ function ShiftEntries_finished_by_user($user) {
       JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id`
       WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . "
       AND `Shifts`.`end` < " . sql_escape(time()) . "
+      AND `ShiftEntry`.`freeloaded` = 0
       ORDER BY `Shifts`.`end`
       ");
 }
-- 
cgit v1.2.3-54-g00ecf