| @@ -92,9 +92,9 @@ 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-07-27'); | |||
| $start = $dateS->copy()->startOfDay(); | |||
| $dateE = Carbon::createFromFormat('Y-m-d', '2020-12-31'); | |||
| $dateE = Carbon::createFromFormat('Y-m-d', '2020-07-30'); | |||
| $end = $dateE->copy()->endOfDay(); | |||
| $result = array(); | |||
| @@ -127,6 +127,7 @@ class FormController extends BaseController | |||
| if(!empty($f->Subscriber) && !empty($f->PackageDetail)){ | |||
| if($f->type_application == 'R'){ | |||
| $name = $f->Subscriber->name; | |||
| $subscriber_id = $f->Subscriber->subscriber_id; | |||
| $contact_no = $f->Subscriber->phone1; | |||
| $building = $f->Subscriber->building_name; | |||
| if($f->Subscriber->street != ''){ | |||
| @@ -164,6 +165,7 @@ class FormController extends BaseController | |||
| 'type_application' => $f->type_application, | |||
| "type_service" => $f->type_service, | |||
| "customer_name"=> $name, | |||
| "subscriber_id" => $subscriber_id, | |||
| "contact_no"=> $contact_no, | |||
| "unit_no"=>$f->Subscriber->unit_no, | |||
| "building"=>$building, | |||