Merge pull request 'staging upload 23-05-12' (#45) from staging into master

Reviewed-on: ordo/adw-backend#45

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 = MasterFunctionsHelper::curlReq($url);
+		$response = null;
 
 		if(!$response)
 			return;

app/Http/Controllers/DashboardBoDController.php

@@ -37,17 +37,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;
+		return null;
 	}
 
 	// to do

app/Http/Controllers/ProjectController.php

@@ -389,12 +389,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 = MasterFunctionsHelper::curlReq($url);
+		$response = null;
 
 
 		return response()->json(['status'=>'success', 'data'=> $response, 'code'=>200], 200);

app/Http/Controllers/RequestMaterialController.php

@@ -170,7 +170,7 @@ class RequestMaterialController extends Controller
 	}
 
 	public function getMaterialIntegration(Request $request) {
-		$search = urlencode($request->name);
+		$search = null;
 		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 = urlencode($request->name);
+		$search = null;
 		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');