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

app/Http/Controllers/Api/DocketMobile.php

@@ -30,16 +30,21 @@ class DocketMobile extends BaseController
 	}
 
 	function createDocketID($limit){
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+		$numberOnly = str_replace('DO-','',Docket::orderBy('docket_id', 'desc')->value('docket_id'));
+		$numberOnly++;
+		info($numberOnly);
+		return $numberOnly;
+
+		// $allowedNumbers = range(0, 9);
+		// shuffle($allowedNumbers);
+		// $digits = array_rand($allowedNumbers, $limit);
+		// $number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
+		// foreach($digits as $d){
+		// 	$number .= $allowedNumbers[$d];
+		// }
+		// $unique_id = $number;
+		// return $unique_id;
 	}
 
 	public function createDocket(Request $request){

app/Http/Controllers/Contractor/WorkOrderController.php

@@ -29,23 +29,23 @@ class WorkOrderController extends Controller
         return substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, $limit);
     }
 
-    function createWorkID($limit){
-                $number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
-		$numberOnly = str_replace('WO-','',$number->wo);
-		$numberOnly++;
-		return $numberOnly;
-
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+    // function createWorkID($limit){
+    //             $number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
+	// 	$numberOnly = str_replace('WO-','',$number->wo);
+	// 	$numberOnly++;
+	// 	return $numberOnly;
+
+	// 	$allowedNumbers = range(0, 9);
+	// 	shuffle($allowedNumbers);
+	// 	$digits = array_rand($allowedNumbers, $limit);
+	// 	$number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
-	}
+	// 	foreach($digits as $d){
+	// 		$number .= $allowedNumbers[$d];
+	// 	}
+	// 	$unique_id = $number;
+	// 	return $unique_id;
+	// }
 
 	public function viewContractorWork()
     {

app/Http/Controllers/CustomerService/CoverageController.php

@@ -29,23 +29,23 @@ class CoverageController extends Controller
         return substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, $limit);
     }
 
-    function createWorkID($limit) {
-                $number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
-		$numberOnly = str_replace('WO-','',$number->wo);
-		$numberOnly++;
-		return $numberOnly;
-
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+    // function createWorkID($limit) {
+    //             $number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
+	// 	$numberOnly = str_replace('WO-','',$number->wo);
+	// 	$numberOnly++;
+	// 	return $numberOnly;
+
+	// 	$allowedNumbers = range(0, 9);
+	// 	shuffle($allowedNumbers);
+	// 	$digits = array_rand($allowedNumbers, $limit);
+	// 	$number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
-	}
+	// 	foreach($digits as $d){
+	// 		$number .= $allowedNumbers[$d];
+	// 	}
+	// 	$unique_id = $number;
+	// 	return $unique_id;
+	// }
 
 	public function viewCoverageR()
     {

app/Http/Controllers/CustomerService/CustomerController.php

@@ -35,16 +35,16 @@ class CustomerController extends Controller
 		$numberOnly++;
 		return $numberOnly;
 
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+		// $allowedNumbers = range(0, 9);
+		// shuffle($allowedNumbers);
+		// $digits = array_rand($allowedNumbers, $limit);
+		// $number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
+		// foreach($digits as $d){
+		// 	$number .= $allowedNumbers[$d];
+		// }
+		// $unique_id = $number;
+		// return $unique_id;
 	}
 
     public function viewCustomer()

app/Http/Controllers/CustomerService/DocketController.php

@@ -29,18 +29,18 @@ class DocketController extends Controller
         return substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, $limit);
     }
 
-    function createWorkID($limit){
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+    // function createWorkID($limit){
+	// 	$allowedNumbers = range(0, 9);
+	// 	shuffle($allowedNumbers);
+	// 	$digits = array_rand($allowedNumbers, $limit);
+	// 	$number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
-	}
+	// 	foreach($digits as $d){
+	// 		$number .= $allowedNumbers[$d];
+	// 	}
+	// 	$unique_id = $number;
+	// 	return $unique_id;
+	// }
 
 	public function viewDocket()
     {

app/Http/Controllers/CustomerService/TeamController.php

@@ -29,18 +29,18 @@ class TeamController extends Controller
         return substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, $limit);
     }
 
-    function createWorkID($limit){
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+    // function createWorkID($limit){
+	// 	$allowedNumbers = range(0, 9);
+	// 	shuffle($allowedNumbers);
+	// 	$digits = array_rand($allowedNumbers, $limit);
+	// 	$number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
-	}
+	// 	foreach($digits as $d){
+	// 		$number .= $allowedNumbers[$d];
+	// 	}
+	// 	$unique_id = $number;
+	// 	return $unique_id;
+	// }
 
 	public function encryptPassword($action, $string) {
 		$output = false;

app/Http/Controllers/CustomerService/WorkOrderController.php

@@ -33,21 +33,21 @@ class WorkOrderController extends Controller
     }
 
     function createWorkID($limit){
-                $number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
+        $number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
 		$numberOnly = str_replace('WO-','',$number->wo);
 		$numberOnly++;
 		return $numberOnly;
 
-		$allowedNumbers = range(0, 9);
-		shuffle($allowedNumbers);
-		$digits = array_rand($allowedNumbers, $limit);
-		$number = '';
+		// $allowedNumbers = range(0, 9);
+		// shuffle($allowedNumbers);
+		// $digits = array_rand($allowedNumbers, $limit);
+		// $number = '';
 		
-		foreach($digits as $d){
-			$number .= $allowedNumbers[$d];
-		}
-		$unique_id = $number;
-		return $unique_id;
+		// foreach($digits as $d){
+		// 	$number .= $allowedNumbers[$d];
+		// }
+		// $unique_id = $number;
+		// return $unique_id;
 	}
 
 	public function viewWorkOrder()

routes/web.php

@@ -161,13 +161,13 @@ Route::group(['middleware' => 'csAuth'], function () {
 	Route::get('/customer-service/profile',  ['uses' => 'CustomerService\ProfileController@viewProfile', 'as' => 'csProfile']);
 	Route::post('/customer-service/update-profile-picture',  ['uses' => 'CustomerService\ProfileController@updateProfilePicture', 'as' => 'csProfileImg']);
 	
-	Route::get('/CustomerService/customer/get-customer-list', 'DS\CustomerService\CustomerController@getCustomerList')->name('getCustomerList');
+	// Route::get('/CustomerService/customer/get-customer-list', 'DS\CustomerService\CustomerController@getCustomerList')->name('getCustomerList');
 
-	Route::get('/CustomerService/wo/get-wo-list', 'DS\CustomerService\CustomerController@getCustomerWo')->name('getCustomerWo');
-	Route::get('/CustomerService/wo/country-json', 'DS\CustomerService\CustomerController@getCountry')->name('getCountry');
-	Route::get('/CustomerService/wo/building-json', 'DS\CustomerService\CustomerController@getBuilding')->name('getBuilding');
-	Route::get('/CustomerService/wo/filter/{year}/{month}/{status}', 'DS\CustomerService\CustomerController@filterCustomerWo')->name('filterCustomerWo');
-	Route::post('/CustomerService/wo/delete-wo', 'DS\CustomerService\CustomerController@deleteCustomerWo')->name('deleteCustomerWo');
+	// Route::get('/CustomerService/wo/get-wo-list', 'DS\CustomerService\CustomerController@getCustomerWo')->name('getCustomerWo');
+	// Route::get('/CustomerService/wo/country-json', 'DS\CustomerService\CustomerController@getCountry')->name('getCountry');
+	// Route::get('/CustomerService/wo/building-json', 'DS\CustomerService\CustomerController@getBuilding')->name('getBuilding');
+	// Route::get('/CustomerService/wo/filter/{year}/{month}/{status}', 'DS\CustomerService\CustomerController@filterCustomerWo')->name('filterCustomerWo');
+	// Route::post('/CustomerService/wo/delete-wo', 'DS\CustomerService\CustomerController@deleteCustomerWo')->name('deleteCustomerWo');
 
 	Route::get('/customer-service/get-data-claim','Api\ClaimedController@get_data_claim');
 	Route::get('/customer-service/get-data-form','Api\FormController@get_data_form');