add report

app/Http/Controllers/Api/FormController.php

@@ -8,6 +8,7 @@ use App\Http\Controllers\Api\BaseController;
 use Illuminate\Support\Facades\Auth;
 
 Use App\Model\Form;
+Use App\Model\DealerClaim;
 Use App\Model\PackageDetail;
 Use App\Model\Subscriber;
 Use App\Model\WorkOrder;
@@ -101,7 +102,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')->withTrashed()->get();
+		$data = Form::with('PackageDetail', 'Subscriber','WorkOrder')->whereBetween('created_at', array($start, $end))->get();
 
         if(count($data) > 0) {
 			foreach($data as $f) {	
@@ -116,6 +118,7 @@ class FormController extends BaseController
 				}else{
 					$labelD = "";
 				}
+				$amount_claim= DealerClaim::where('wo',$f->WorkOrder->wo)->get();
 
 				if(!empty($f->Subscriber) && !empty($f->PackageDetail)){
 					if($f->type_application == 'R'){
@@ -158,21 +161,34 @@ class FormController extends BaseController
 						}
 					}
 					
+					// array_push($result,array(
+					// 	'type_application' => $f->type_application,
+					// 	"type_service" => $f->type_service,
+					// 	"customer_name"=> $name,
+					// 	"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,
+					// ));		
 					array_push($result,array(
-						'type_application' => $f->type_application,
-						"type_service" => $f->type_service,
-						"customer_name"=> $name,
-						"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,
-					));		
+						'Dealer Name' => $labelD,
+						"Customer Name"=> $name,
+						'Completion Date' => $woD,
+						"Form Type" => $f->type_service,
+						"Package"=> $f->PackageDetail->contract,
+						"WO No" => $woId,
+						"DO No" => $f->WorkOrder->docket_id,
+						"Service Type" => $f->WorkOrder->nature_work,
+						"Building"=>$building,
+						"Rating" => $f->WorkOrder->Docket->Rating1,
+						"Claim Amount" => $amount_claim,
+					));	
 				}	
 
 			}

html/cbb/.env.

@@ -1,44 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"