load all data back

app/Http/Controllers/CustomerService/CustomerController.php

@@ -66,45 +66,41 @@ class CustomerController extends Controller
 
 		$i = 0; $n1 = ''; $street = ''; $labelD = '';
 		$curr = Carbon::now()->getTimestamp();
-		$dateS= Carbon::createFromFormat('Y-m-d', '2020-07-01');
-		$start = $dateS->copy()->startOfDay();
-		$dateE = Carbon::createFromFormat('Y-m-d', '2020-07-31');
-        $end = $dateE->copy()->startOfDay();
 		$nested_data = array();
 
 		if($type == 'null' && $building == 'null' && $dealer == 'null'){
-			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->orderBy('created_at', 'desc')->get();
 		}else if($type != 'null' && $building == 'null' && $dealer == 'null'){
-			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('type_service',$type)->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('type_service',$type)->orderBy('created_at', 'desc')->get();
 		}else if($type != 'null' && $building != 'null' && $dealer == 'null'){
 			$form = Form::with(['Subscriber' => function($q) use ($building)
 				{
 					$q->where('building_name', $building)->get();
-				}],'PackageDetail','WorkOrder')->where('type_service',$type)->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+				}],'PackageDetail','WorkOrder')->where('type_service',$type)->orderBy('created_at', 'desc')->get();
 		}
 		else if($type == 'null' && $building != 'null' && $dealer == 'null'){
 			$form = Form::with(['Subscriber' => function($q) use ($building)
 				{
 					$q->where('building_name', $building)->get();
-				}],'PackageDetail','WorkOrder')->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+				}],'PackageDetail','WorkOrder')->orderBy('created_at', 'desc')->get();
 		}
 		else if($type == 'null' && $building == 'null' && $dealer != 'null'){
-			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('company_id',$dealer)->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('company_id',$dealer)->orderBy('created_at', 'desc')->get();
 		}
 		else if($type == 'null' && $building != 'null' && $dealer != 'null'){
 			$form = Form::with(['Subscriber' => function($q) use ($building)
 				{
 					$q->where('building_name', $building)->get();
-				}],'PackageDetail','WorkOrder')->where('company_id',$dealer)->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+				}],'PackageDetail','WorkOrder')->where('company_id',$dealer)->orderBy('created_at', 'desc')->get();
 		}
 		else if($type != 'null' && $building == 'null' && $dealer != 'null'){
-			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('type_service',$type)->where('company_id',$dealer)->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('type_service',$type)->where('company_id',$dealer)->orderBy('created_at', 'desc')->get();
 		}
 		else if($type != 'null' && $building != 'null' && $dealer != 'null'){
 			$form = Form::with(['Subscriber' => function($q) use ($building)
 				{
 					$q->where('building_name', $building)->get();
-				}],'PackageDetail','WorkOrder')->where('type_service',$type)->where('company_id',$dealer)->whereBetween('created_at', array($start, $end))->orderBy('created_at', 'desc')->get();
+				}],'PackageDetail','WorkOrder')->where('type_service',$type)->where('company_id',$dealer)->orderBy('created_at', 'desc')->get();
 		}
 
 		if(!empty($form)){
@@ -227,7 +223,7 @@ class CustomerController extends Controller
 				}
 			}
 		}
-		// return json_encode($nested_data);
+
     	return \DataTables::of($nested_data)->make(true);
     }