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

app/Console/Commands/syncHumanResourceIntegration.php

@@ -68,7 +68,7 @@ class syncHumanResourceIntegration extends Command
 						'role_id' => 24,
 						'created_by' => 'integration'
 					],
-				);
+				); 				
 			}
 			echo "\n------------------------------------------\n";
 			$currentResponse = MasterFunctionsHelper::curlReq(str_replace('1', $i, $url));

rest-client.http

@@ -1,4 +1,4 @@
-@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9hZHctYXBpLm9zcHJvLmlkXC9hcGlcL2xvZ2luIiwiaWF0IjoxNjc2OTc2Mjc1LCJleHAiOjE2Nzc1ODEwNzUsIm5iZiI6MTY3Njk3NjI3NSwianRpIjoiQ1dMUFZOend6cHdZd0dDZyIsInN1YiI6MSwicHJ2IjoiMjNiZDVjODk0OWY2MDBhZGIzOWU3MDFjNDAwODcyZGI3YTU5NzZmNyJ9.w0ZXoDAch3Hu8ziKBQTSTF5QH5SbaOhFsA__DHJp66A
+@token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9sb2NhbGhvc3Q6ODQ0NFwvYXBpXC9sb2dpbiIsImlhdCI6MTY3NzQ3NzIzMSwiZXhwIjoxNjc4MDgyMDMxLCJuYmYiOjE2Nzc0NzcyMzEsImp0aSI6ImR5WWhRY3ZIbUJEcmFKMG0iLCJzdWIiOjEsInBydiI6IjIzYmQ1Yzg5NDlmNjAwYWRiMzllNzAxYzQwMDg3MmRiN2E1OTc2ZjcifQ.9zT6CBbQholzIdQ9ZBDoxMvrR-PKvIYkGzdNB6bim0Y
 
 @hostname = https://adw-api.ospro.id/api
 # @hostname = https://ospro-api.ospro.id/api
@@ -897,7 +897,7 @@ content-type: application/json
 {
     "clock_in_lat": -6.16678379060529, 
     "clock_in_lng": 106.9175039866567,
-    "clock_time": "2023-02-10T14:48:17+07:00", 
+    "clock_time": "2023-02-16T14:48:17+07:00", 
     "type": "in", 
     "user_id": 1247
 }
@@ -962,8 +962,7 @@ Authorization: Bearer {{token}}
 content-type: application/json
 
 {
-	"project_id" : [1, 2, 3]
-	
+	"project_id" : [75, 76, 78]
 }
 
 ######
@@ -1068,9 +1067,47 @@ content-type: application/json
 # }
 
 
+<<<<<<< HEAD
+GET /stock_master?name=SEARCH
+
+######
+GET {{hostname}}/request-material/get-material-integration
+Authorization: Bearer {{token}}
+content-type: application/json
+
+
+######
+POST {{hostname}}/presence/reportk3
+Authorization: Bearer {{token}}
+content-type: application/json
+
+{
+    "time" : "2023-02-16T14:48:17+07:00", // untuk report date, time_clockin/out
+    "user_id": 1247,
+    "clock_in_out": {
+        "clock_in_lat": -6.16678379060529, 
+        "clock_in_lng": 106.9175039866567, 
+        "type": "in"
+    },
+    "report_k3": {
+        "proyek_id": "", 
+        "description": "",
+        "detail": [{
+            "checklist_id": 1,
+            "checklist_name": ""
+        },
+        {
+            "checklist_id": 2,
+            "checklist_name": ""
+        }]
+
+    }
+}
+=======
 ### get image
 # GET {{hostname}}/image/106/presensi
 GET {{hostname}}/image/1634/report_activity
 Authorization: Bearer {{token}}
 content-type: application/json
 
+>>>>>>> e18d0c3c5b06faa60a69b484259ec0102546422f