Merge branch 'master' into 'production'

application/controllers/Webservices.php

@@ -337,15 +337,25 @@ class Webservices extends CI_Controller {
       $request = json_decode($postdata, true);
       $auth = apache_request_headers()['Auth'];
       $request['auth'] = $auth;
-      $result = $this->Webservice_model->call_ambulance($request);
-
-      if ($result) {
-        print json_encode(array('status'=>'success','data'=>$result));
+      if(!empty($request) && isset($request['trip_type']) && !empty($request['trip_type']) && 
+         isset($request['source_name']) && !empty($request['source_name']) && 
+         isset($request['destination_name']) && !empty($request['destination_name']) && 
+         isset($request['source_latitude']) && !empty($request['source_latitude']) && 
+         isset($request['source_longitude']) && !empty($request['source_longitude']) && 
+         isset($request['destination_latitude']) && !empty($request['destination_latitude']) && 
+         isset($request['destination_longitude']) && !empty($request['destination_longitude'])){
+
+        $result = $this->Webservice_model->call_ambulance($request);
+        if ($result) {
+          print json_encode(array('status'=>'success','data'=>$result));
+        } else {
+          print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'507'));
+        }
       } else {
-        print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'507'));
+        print json_encode(array('status'=>'error','message'=>'Required fields are empty','error'=>'508'));
       }
     } else {
-      print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'507'));
+      print json_encode(array('status'=>'error','message'=>'Authentication Error','error'=>'509'));
     }
   }
 
@@ -444,7 +454,7 @@ class Webservices extends CI_Controller {
 
   public function request_status() { 
     header('Content-type: application/json'); 
-    $request = $_GET; 
+    $request = $_GET;
     if (isset($request['request_id'])) {   
       $result = $this->Webservice_model->req_status($request);
 
@@ -456,7 +466,7 @@ class Webservices extends CI_Controller {
         print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'606'));
       }
     } else {
-      print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'606')); 
+      print json_encode(array('status'=>'error','message'=>'Something Went wrong','error'=>'607')); 
     }
   }
 
@@ -482,25 +492,18 @@ class Webservices extends CI_Controller {
 
   public function phone_number_availability(){
     header('Content-type: application/json'); 
-    if (isset(apache_request_headers()['Auth'])) {   
-      $auth = apache_request_headers()['Auth'];
-
-      $postdata = file_get_contents("php://input");
-      $request = json_decode($postdata, true);
-      $request['auth'] = $auth;
+    $postdata = file_get_contents("php://input");
+    $request = json_decode($postdata, true);
 
-      if (!empty($request)) {
-        $phStatus = $this->Webservice_model->phone_number_availability($request);
-        if($phStatus){
-          print json_encode(array('status'=>'success','data'=>array('is_available'=>true)));
-        } else {
-          print json_encode(array('status'=>'success','data'=>array('is_available'=>false)));
-        }
+    if (!empty($request) && isset($request['phone']) && !empty($request['phone'])) {
+      $phStatus = $this->Webservice_model->phone_number_availability($request);
+      if($phStatus){
+        print json_encode(array('status'=>'success','data'=>array('is_available'=>true)));
       } else {
-        print json_encode(array('status'=>'error','code'=>'210','message'=>'Required Fields are empty.'));
+        print json_encode(array('status'=>'success','data'=>array('is_available'=>false)));
       }
-    } else { 
-      print json_encode(array('status'=>'error','code'=>'209','message'=>'Something Went wrong'));
+    } else {
+      print json_encode(array('status'=>'error','code'=>'210','message'=>'Required Fields are empty.'));
     }
   }
 

application/models/Webservice_model.php

@@ -687,7 +687,7 @@
 
                   } else {
 
-                        return $result;
+                        return 0;
 
                   }