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

app/Http/Controllers/Api/ClaimedController.php

@@ -32,7 +32,7 @@ class ClaimedController extends BaseController
 
 				$name = ''; $contact_no = ''; $building = '';
 				$labelD = ''; $service = ''; $rating = ''; 
-				$installer_name =''; $contractor_name='';
+				$installer_name =''; $contractor_name=''; $submitted_date='';
 
 				if(!empty($f->dealer)){
 					$c = Company::find($f->dealer);
@@ -71,11 +71,12 @@ class ClaimedController extends BaseController
 					foreach($docket as $d) {	
 						$service = $d->nature_work;
 						$rating = $d->Rating1;
+                        $submitted_date = $d->end_job;
 					}
 				}
 						
 					array_push($result,array(
-						// "Dealer Name" => $labelD,
+						"Dealer Name" => $labelD,
 						"Installer Name" => $installer_name,
 						"Contractor Name" => $contractor_name,
 						"Customer Name"=> $name,
@@ -89,6 +90,7 @@ class ClaimedController extends BaseController
 						"Building"=> $building,
 						"Rating" => $rating,
 						"Claim Amount" => $f->total_claim,
+                        "Submitted Date" => $submitted_date,
 					));	
 				}	
 

routes/api.php

@@ -46,5 +46,5 @@ Route::group(['middleware' => 'mobileapps'], function() {
 	Route::get('/form/statistic','Api\FormController@getFormStatistic');
 	Route::get('/claim/12/12/2019','DS\MarketingController@manualDate');
 	Route::get('/get-data','Api\FormController@get_data_form');
-	Route::get('/get-data-claim','Api\ClaimedController@get_data_claim');
+	//Route::get('/get-data-claim','Api\ClaimedController@get_data_claim');
 });