Merge branch 'master' into 'local_production'

application/controllers/Webservices.php

@@ -1151,11 +1151,13 @@
 			}
 			
 			$err = 0;
-			if((!isset($postdata['is_emergency']) || $postdata['is_emergency'] != 1) && 
-			   (!isset($postData['service_id']) || empty($postData['service_id']))){
+			if(!isset($postData['is_emergency']) || $postData['is_emergency'] != 1){
+				if(!isset($postData['service_id']) || empty($postData['service_id'])){
 					$err = 1;
 					$msg = 'Service Id is Required';
 				}
+			}
+			   
 			else if(!isset($postData['location']) || empty($postData['location'])){
 				$err = 1;
 				$msg = 'Location is Required';

application/models/Webservice_model.php

@@ -392,7 +392,7 @@ class Webservice_model extends CI_Model {
     }
     $current_lat = $postData['location_lat'];
     $current_lng = $postData['location_lng'];
-    $issue_cat_id = $postData['service_id'];
+    $issue_cat_id = (isset($postData['is_emergency']) && $postData['is_emergency'] == 1)?'':$postData['service_id'];
     if($start != 0 || $per_page != 0){
       $limt = "limit ".$start.",".$per_page;
     }else{