merge master

app/Http/Controllers/CustomerService/CustomerController.php

@@ -74,7 +74,9 @@ class CustomerController extends Controller
 		$nested_data = array();
 
 		if($type == 'null' && $building == 'null' && $dealer == 'null'){
-			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->orderBy('created_at', 'desc')->take(2000)->get();
+
+		$form = Form::with('Subscriber','PackageDetail','WorkOrder')->orderBy('created_at', 'desc')->take(2000)->get();
+
 		}else if($type != 'null' && $building == 'null' && $dealer == 'null'){
 			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('type_service',$type)->orderBy('created_at', 'desc')->get();
 		}else if($type != 'null' && $building != 'null' && $dealer == 'null'){