Merge branch 'master' into hajar

app/Http/Controllers/Api/DocketMobile.php

@@ -132,24 +132,6 @@ class DocketMobile extends BaseController
 		}
 	}
 
-	public function checkResetDocket(Request $request)
-	{
-
-		$loginUser = Staff::with('StaffDetail')->where('api_token', $request->api_token)->where('roles_access', 'Installer')->first();
-		if (!empty($loginUser)) {
-
-			$docket = Docket::with('WorkOrder')->where('installer_id', $loginUser->_id)->where('router_serial_number', '')->where('cable_read', '')->get();
-
-			if (!empty($docket)) {
-				return $this->sendResponse('true', 'CS initiated to reset docket');
-			} else {
-				return $this->sendResponse('false', 'No docket need to reset');
-			}
-		} else {
-			return $this->sendError('Invalid User', 'User Not Exist!');
-		}
-	}
-
 	public function getResetDocket(Request $request)
 	{
 
@@ -157,16 +139,11 @@ class DocketMobile extends BaseController
 		$loginUser = Staff::with('StaffDetail')->where('api_token', $request->api_token)->where('roles_access', 'Installer')->first();
 		if (!empty($loginUser)) {
 
-			$docket = Docket::with('WorkOrder')->where('installer_id', $loginUser->_id)->where('router_serial_number', '')->where('cable_read', '')->get();
+			$docket = Docket::with('WorkOrder')->where('installer_id', $loginUser->_id)->where('condition', '')->get();
 
 			if (!empty($docket)) {
 				foreach ($docket as $a) {
 
-					$nw = '';
-					if (!empty($a->WorkOrder->nature_work)) {
-						$nw = $a->WorkOrder->nature_work;
-					}
-
 					array_push($data, array(
 						"docket_id" =>  $a->docket_id,
 						"wo_id" =>  $a->work_order_id,

app/Http/Controllers/CustomerService/DocketController.php

@@ -208,9 +208,6 @@ class DocketController extends Controller
 		$docket = Docket::where('docket_id', $request->id)->first();
 
 		if (!empty($docket)) {
-			$docket->router_serial_number = '';
-			$docket->modem_sn = '';
-			$docket->cable_read = '';
 			$docket->condition = '';
 			$docket->save();
 

resources/views/customer-service/view_docket.blade.php

@@ -52,11 +52,11 @@
 				</table>
 			</div> 		
 			
-			<div class="dialog-reset" title="Reset Docket">
-            	<p id="inner-reset"></p>
+			{{-- <div class="dialog-reset" title="Reset Docket">
+				<p id="inner-reset"></p>
+			</div> --}}
 		</div>
 	</div>
-	</div>
 @endsection
 
 @section('external_js')
@@ -175,7 +175,7 @@
 						var split = data.split('/');
 						var link1 = "{{ url('/customer-service/docket/generate-pdf')}}"+"/"+split[0];
 						var link2 = "{{ url('/customer-service/work-order/generate-pdf') }}"+"/"+split[1];
-						return '<a target="_blank" href="'+link1+'" class="tablectrl_medium bGreen tipS" title="View Docket PDF"><span class="iconb" data-icon=""></span></a> <a target="_blank" href="'+link2+'" class="tablectrl_medium bBlue tipS" title="View W/O PDF"><span class="iconb" data-icon=""></span></a> <a target="_blank" class="tablectrl_medium bGold tipS" onclick="reset(\''+split[0]+'\',\'' + split[0] + '\', )" title="Reset Docket PDF"><span class="iconb" data-icon="&#xe004"></span></a>' ;
+						return '<a target="_blank" href="'+link1+'" class="tablectrl_medium bGreen tipS" title="View Docket PDF"><span class="iconb" data-icon=""></span></a> <a target="_blank" href="'+link2+'" class="tablectrl_medium bBlue tipS" title="View W/O PDF"><span class="iconb" data-icon=""></span></a>';
 					},
 					"targets": 11
 				},

routes/api.php

@@ -33,7 +33,6 @@ Route::group(['middleware' => 'mobileapps'], function() {
 	Route::post('/mobile/update/workorder','Api\WorkOrderMobile@updateWorkOrder');
 	Route::get('/mobile/questions/list','Api\WorkOrderMobile@getQuestions');
 
-	Route::post('/mobile/check-reset-docket', 'Api\DocketMobile@checkResetDocket');
 	Route::post('/mobile/get-reset-docket-list', 'Api\DocketMobile@getResetDocket');
 	Route::post('/mobile/save-reset-docket', 'Api\DocketMobile@saveResetDocket');