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

app/Http/Controllers/CustomerService/CustomerController.php

@@ -75,7 +75,7 @@ class CustomerController extends Controller
 
 		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(1000)->get();
 
 		}else if($type != 'null' && $building == 'null' && $dealer == 'null'){
 			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->where('type_service',$type)->orderBy('created_at', 'desc')->get();
@@ -630,7 +630,7 @@ class CustomerController extends Controller
 		$nested_data = array();
 
 		if($type == 'null' && $building == 'null' && $dealer == 'null'){
-			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->orderBy('created_at', 'desc')->get();
+			$form = Form::with('Subscriber','PackageDetail','WorkOrder')->orderBy('created_at', 'desc')->take(1000)->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'){
@@ -745,7 +745,7 @@ 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(1000)->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'){
@@ -862,7 +862,7 @@ 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(1000)->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'){