Merge pull request 'Fix work area restriction' (#153) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#153

app/Console/Commands/syncHumanResourceIntegration.php

@@ -39,9 +39,9 @@ class syncHumanResourceIntegration extends Command
      */
     public function handle()
     {
-		// $url = config('api.adw').'/employees?page=1';
+		$url = config('api.adw').'/employees?page=1';
-		// echo "Requesting to " . $url;
+		echo "Requesting to " . $url;
-		$response = null;
+		$response = MasterFunctionsHelper::curlReq($url);
 
 		if(!$response)
 			return;

app/Http/Controllers/DashboardBoDController.php

@@ -41,17 +41,17 @@ class DashboardBoDController extends Controller
 
 	private function getInvoiceIntegration($search)
 	{
-		// if(empty($search))
+		if(empty($search))
-		// 	return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
+			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-		//
+
-		// $url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
+		$url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
-		// $token = config('api.adw_token');
+		$token = config('api.adw_token');
-		// $response = $this->curlReq($url, $token);
+		$response = $this->curlReq($url, $token);
-		//
+
-		// if(@$response->data->project_no == "")
+		if(@$response->data->project_no == "")
-		// 	return null;
-		//
 			return null;
+
+		return $response;
 	}
 
 	// to do

app/Http/Controllers/PresenceController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\HumanResource;
 use Log;
 use Illuminate\Http\Request;
 use App\Models\Presence;
@@ -24,7 +25,10 @@ class PresenceController extends Controller
         if(count($checkLocation) > 0 && $checkLocation[0]['boundary']){  
             $statusBoundary = true; 
         }
-
+        $statusRestriction = HumanResource::select('status_boundary')->where('id', $request->user_id)->first();
+        if ($statusRestriction->status_boundary) {
+            $statusBoundary = true;
+        }
         // not assign
         if(!$checkLocation[0]['status_assign'] && $checkLocation[0]['boundary'] == false){
             $data=array(
@@ -134,7 +138,10 @@ class PresenceController extends Controller
         if(count($checkLocation) > 0 && $checkLocation[0]['boundary']){  
             $statusBoundary = true; 
         }
-
+        $statusRestriction = HumanResource::select('status_boundary')->where('id', $request->user_id)->first();
+        if ($statusRestriction->status_boundary) {
+            $statusBoundary = true;
+        }
         // not assign
         if(!$checkLocation[0]['status_assign'] && $checkLocation[0]['boundary'] == false){
             $data=array(

app/Http/Controllers/ProjectController.php

@@ -422,12 +422,12 @@ class ProjectController extends Controller
 	}
 
   public function getInvoiceIntegration(Request $request) {
-		// $search = urlencode($request->search);
+		$search = urlencode($request->search);
-		// if(empty($search))
+		if(empty($search))
-		// 	return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
+			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-		// $url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
+		$url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
 
-		$response = null;
+		$response = MasterFunctionsHelper::curlReq($url);
 
 		// return response()->json(['status'=>'success', 'data'=> $response, 'code'=>200], 200);
 		return response()->json(['status'=>'success', 'data'=> '', 'code'=>200], 200);

app/Http/Controllers/RequestMaterialController.php

@@ -170,7 +170,7 @@ class RequestMaterialController extends Controller
 	}
 
 	public function getMaterialIntegration(Request $request) {
-		$search = null;
+		$search = urlencode($request->name);
 		if(empty($search))
 			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
 		$url = str_replace("SEARCH", $search, config('api.adw').'/stock_master?name=SEARCH');

app/Http/Controllers/UserToProyekController.php

@@ -185,7 +185,7 @@ class UserToProyekController extends Controller
 	}
 
 	public function getEmployeeIntegration(Request $request) {
-		$search = null;
+		$search = urlencode($request->name);
 		if(empty($search))
 			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
 		$url = str_replace("SEARCH", $search, config('api.adw').'/employees?emp_name=SEARCH');

config/api.php

@@ -2,6 +2,6 @@
     return [
         'nominatim' => env('API_NOMINATIM', 'https://nominatim.oslogdev.com'),
         'adw' => env('API_ADW', 'http://ospro-api.adyawinsa.com:9083/api'),
-        'adw_token' => env('API_ADW_TOKEN', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIxMjAyIiwiZXhwIjoxNjkxODMwNDkzfQ.DvBQIOZsdFndWsliPCZT65Y6G5Xx4vWBKz8Rhe7rvRA')
+        'adw_token' => env('API_ADW_TOKEN', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIxMjAyIiwiZXhwIjoxNzI0Mzk1NTExfQ.z9_Q7vjZbcbr8Mook4EmlOuOByNP12_DEDSabf0zanU')
     ];
 ?>