From 25cdf1cac8c66c55a7c2a354c1be51de261da5b5 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 25 Dec 2019 16:26:59 +0100
Subject: Voucher: Added calculation start time

---
 includes/model/ShiftEntry_model.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index 5dd11421..ea025604 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -1,5 +1,6 @@
 <?php
 
+use Carbon\Carbon;
 use Engelsystem\Database\DB;
 use Engelsystem\Models\User\User;
 
@@ -201,10 +202,11 @@ function ShiftEntries_upcoming_for_user($userId)
 /**
  * Returns shifts completed by the given user.
  *
- * @param int $userId
+ * @param int         $userId
+ * @param Carbon|null $sinceTime
  * @return array
  */
-function ShiftEntries_finished_by_user($userId)
+function ShiftEntries_finished_by_user($userId, Carbon $sinceTime = null)
 {
     return DB::select('
           SELECT *
@@ -214,6 +216,7 @@ function ShiftEntries_finished_by_user($userId)
           WHERE `ShiftEntry`.`UID` = ?
           AND `Shifts`.`end` < ?
           AND `ShiftEntry`.`freeloaded` = 0
+          ' . ($sinceTime ? 'AND Shifts.start >= ' . $sinceTime->getTimestamp() : '') . '
           ORDER BY `Shifts`.`end` desc
       ',
         [
-- 
cgit v1.2.3-54-g00ecf