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

app/Http/Controllers/Api/FormController.php

@@ -92,7 +92,7 @@ class FormController extends BaseController
 
 	public function get_data_form(Request $request){
 
-		$dateS = Carbon::createFromFormat('Y-m-d', '2017-01-01');
+		$dateS = Carbon::createFromFormat('Y-m-d', '2020-01-01');
         $start = $dateS->copy()->startOfDay();
         $dateE = Carbon::createFromFormat('Y-m-d', '2020-12-31');
         $end = $dateE->copy()->endOfDay();
@@ -103,8 +103,8 @@ class FormController extends BaseController
         // $data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->where('type_service', '!=', 'Rectification')->whereBetween('created_at', array($start, $end))->get();
 
         // $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')->withTrashed()->get();
+		$data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->whereBetween('created_at', array($start, $end))->get();
 
         if(count($data) > 0) {
 			foreach($data as $f) {	
@@ -169,24 +169,24 @@ class FormController extends BaseController
 					}
 					
 					array_push($result,array(
-						// 'type_application' => $f->type_application,
-						// "type_service" => $f->type_service,
+						 'type_application' => $f->type_application,
+						 "type_service" => $f->type_service,
 						"customer_name"=> $name,
-						"ic" => $ic,
-						"company_reg" => $company_reg,
-						// "subscriber_id" => $subscriber_id,
-						// "contact_no"=> $contact_no,
-						// "unit_no"=>$f->Subscriber->unit_no,
-						// "building"=>$building,
-						// "street"=>$address,
-						// "submitted_date" => $f->created_at->toDateTimeString(),
-						// "package_contract" => $f->PackageDetail->contract,
-						// "package_name" => $f->PackageDetail->name,
-						// 'dealer' => $labelD,
-						// 'wo' => $woId,
-						// 'activated_date' => $woD,
-						// 'installer_name' => $installer_name,
-						// 'contractor_name' => $contractor_name,
+						//"ic" => $ic,
+						//"company_reg" => $company_reg,
+						 "subscriber_id" => $subscriber_id,
+						 "contact_no"=> $contact_no,
+						 "unit_no"=>$f->Subscriber->unit_no,
+						 "building"=>$building,
+						 "street"=>$address,
+						 "submitted_date" => $f->created_at->toDateTimeString(),
+						 "package_contract" => $f->PackageDetail->contract,
+						 "package_name" => $f->PackageDetail->name,
+						 'dealer' => $labelD,
+						 'wo' => $woId,
+						 'activated_date' => $woD,
+						 'installer_name' => $installer_name,
+						 'contractor_name' => $contractor_name,
 					));		
 					// array_push($result,array(
 					// 	// 'Installer' => $installerId,