Merge branch 'master' of https://git.oslog.id/ordo/adw-backend

app/Http/Controllers/PresenceController.php

@@ -127,13 +127,6 @@ class PresenceController extends Controller
             'user_id' => 'required'
         ]);
         
-        $dataFormK3 = array(
-                        "user_id"       => $request->user_id,
-                        "proyek_id"     => $request->report_k3['proyek_id'],
-                        "report_date"   => $request->time,
-                        "description"   => $request->report_k3['description']
-                      );
-        
         $checkLocation = $this->checkLocation($request);
         $statusBoundary = false;
         $date = date_create($request->time);
@@ -201,6 +194,13 @@ class PresenceController extends Controller
         $onlyDate = date_format($date,"Y-m-d"); 
         $clock_in_loc = $this->getLoc($request->clock_in_out['clock_in_lat'], $request->clock_in_out['clock_in_lng'])->display_name;
 
+        $dataFormK3 = array(
+            "user_id"       => $request->user_id,
+            "proyek_id"     => $request->report_k3['proyek_id'],
+            "report_date"   => $request->time,
+            "description"   => $request->report_k3['description']
+        );
+
         $dataFormPresence = array(
             'user_id'           => $request->user_id,
             'clock_in'          => $request->time,