Merge branch 'master' of http://git.swisslink.com.my/SwissLink/allo

app/Http/Controllers/Api/FormController.php

@@ -92,9 +92,9 @@ class FormController extends BaseController
 
 	public function get_data_form(Request $request){
 
-		$dateS = Carbon::createFromFormat('Y-m-d', '2020-01-01');
+		$dateS = Carbon::createFromFormat('Y-m-d', '2017-01-01');
         $start = $dateS->copy()->startOfDay();
-        $dateE = Carbon::createFromFormat('Y-m-d', '2020-07-16');
+        $dateE = Carbon::createFromFormat('Y-m-d', '2020-12-31');
         $end = $dateE->copy()->endOfDay();
 
         $result = array();
@@ -104,11 +104,9 @@ class FormController extends BaseController
 
         // $data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->where('type_service','New')->whereBetween('created_at', array($start, $end))->get();
 		// $data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->withTrashed()->get();
-		// $data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->whereBetween('created_at', array($start, $end))->get();
-		$data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->whereHas('Subscriber',function ($q) {
-			$q->where('name','Ahmad Kadafi')->get();
-		});
+		$data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->whereBetween('created_at', array($start, $end))->get();
 
+        if(count($data) > 0) {
 			foreach($data as $f) {	
 
 				$name = ''; $contact_no = '';
@@ -198,6 +196,7 @@ class FormController extends BaseController
 				}	
 
 			}
+		}
 
 		// return json_encode(count($result));
 		return json_encode($result);