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

app/Http/Controllers/Api/ClaimedController.php

@@ -89,6 +89,7 @@ class ClaimedController extends BaseController
 						"Completion Date" => $f->activated_dt,
 						"Form Type" => $f->formT,
 						"Package"=> $f->package,
+                        "Package Contract" => $f->contract,
 						"WO No" => $f->wo,
 						"DO No" => $f->docket,
 						"Service Type" => $service,

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', '2019-01-01');
         $start = $dateS->copy()->startOfDay();
-        $dateE = Carbon::createFromFormat('Y-m-d', '2020-10-31');
+        $dateE = Carbon::createFromFormat('Y-m-d', '2020-12-31');
         $end = $dateE->copy()->endOfDay();
 
         $result = array();
@@ -172,7 +172,7 @@ class FormController extends BaseController
 						 'type_application' => $f->type_application,
 						 "type_service" => $f->type_service,
 						"customer_name"=> $name,
-						//"ic" => $ic,
+						"ic" => $ic,
 						//"company_reg" => $company_reg,
 						 "subscriber_id" => $subscriber_id,
 						 "contact_no"=> $contact_no,