diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-25 17:33:31 +0200 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2018-10-30 21:13:56 +0100 |
| commit | 7f61dc95be4ac543986c7df2459532fd8f81368d (patch) | |
| tree | 930497c659bbaa3e073313a261f3458348fd423d /includes/model/UserWorkLog_model.php | |
| parent | 63d1292bf80d88be40eec7695c1a59f29e6609c5 (diff) | |
EventConfig: Merge event configuration from database to global config
Diffstat (limited to 'includes/model/UserWorkLog_model.php')
| -rw-r--r-- | includes/model/UserWorkLog_model.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php index ff39ba8f..dd4b2574 100644 --- a/includes/model/UserWorkLog_model.php +++ b/includes/model/UserWorkLog_model.php @@ -1,5 +1,6 @@ <?php +use Carbon\Carbon; use Engelsystem\Database\Db; /** @@ -128,10 +129,13 @@ function UserWorkLog_create($userWorkLog) function UserWorkLog_new($user) { $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', time())); - $event_config = EventConfig(); - if (!empty($event_config['buildup_start_date'])) { - $work_date = parse_date('Y-m-d H:i', date('Y-m-d 00:00', $event_config['buildup_start_date'])); + + /** @var Carbon $buildup */ + $buildup = $buildup = config('buildup_start'); + if (!empty($buildup)) { + $work_date = $buildup->format('Y-m-d H:i'); } + return [ 'user_id' => $user['UID'], 'work_timestamp' => $work_date, |