Browse Source

Merge pull request 'staging' (#301) from staging into master

Reviewed-on: ordo/adw-backend#301
pull/1/head
ibnu 9 months ago
parent
commit
29f6469276
  1. 2
      app/Http/Controllers/UserToActivityController.php

2
app/Http/Controllers/UserToActivityController.php

@ -202,7 +202,7 @@ class UserToActivityController extends Controller
->where('ahta.user_id', $payload['user_id']) ->where('ahta.user_id', $payload['user_id'])
->where('ma.start_date', '<=', $payload['start_date']) ->where('ma.start_date', '<=', $payload['start_date'])
->where('ma.end_date', '>=', $payload['end_date']) ->where('ma.end_date', '>=', $payload['end_date'])
->where('ma.proyek', '>=', $payload['proyek_id']) ->where('ma.proyek', $payload['proyek_id'])
->get(); ->get();
if ($payload['status'] != "") { if ($payload['status'] != "") {

Loading…
Cancel
Save