dc

application/controllers/Api.php

@@ -797,13 +797,13 @@ class Api extends CI_Controller {
     $data = (array) json_decode(file_get_contents('php://input'));
     $reqData = $this->decrypt($data['requestData'],$this->local_key,$this->local_iv);
     if(empty($reqData) || empty($reqData = json_decode($reqData,true)) || 
-       !isset($reqData['email']) || empty($reqData['email']) || 
+       !isset($reqData['gmail']) || empty($reqData['gmail']) || 
        !isset($reqData['token']) || empty($reqData['token'])){
       $this->errorResponse('892','Invalid Request Data');
     }
 
     $request      = '{"sessionId":"'.time().rand(100000,999999).'","merchantId":"'.$merchant_id.'",
-                      "custId":"'.$cust_id.'","emailId":"'.$reqData['email'].'",
+                      "custId":"'.$cust_id.'","emailId":"'.$reqData['gmail'].'",
                       "tokenNo":"'.$reqData['token'].'"}';
     $plainText    = $this->encryptePayData($merchant_iv,$merchant_key,$request);
     $plainText    = $merchant_id.'|'.$plainText;

application/controllers/Webservice.php

@@ -313,9 +313,9 @@ class Webservice extends CI_Controller {
     $data['auth_token'] = $this->auth_token;
     $res_count = $this->Webservice_model->bookedlist($data,0,0);
     $res = $this->Webservice_model->bookedlist($data,10,'',$res_count);
-    if(isset($res['data']) && !empty($res['data']) && sizeof($res['data']) && $res['status']!=0){
+    if(isset($res['data']) && sizeof($res['data']) && $res['status']!=0){
       $this->responseBookList($res['data']);
-    } elseif(isset($res['data']) && !empty($res['data']) && sizeof($res['data'] == 0) && $res['status']!=0){
+    } elseif(isset($res['data']) && sizeof($res['data'] == 0) && $res['status']!=0){
       $this->response($res['data']);
     }else{
       $this->errorResponse($res['code'],$res['message']);

application/models/Organizer_model.php

@@ -274,8 +274,13 @@ class Organizer_model extends CI_Model {
 
  	public function getVenueList($data){
  		try{
- 			$status = implode(',', $data['status']);
-	 		$cond  = " VNE.status IN (".$status.")";
+ 			$status = '';
+ 			if(isset($data['status']) && !empty($data['status']) && 
+ 			   empty($status = implode(',', $data['status']))){
+				$status = implode(',', $data['status']);
+	 			$cond  = " VNE.status IN (".$status.")";
+ 			}
+ 			
 		 	$cond .= (!empty($data['organiser_id']))?" AND VNE.provider_id='".$data['organiser_id']."' ":"";
  			$count = $this->db->query("SELECT * FROM venue AS VNE WHERE $cond ")->num_rows();
  			if($count > 0) {

application/models/Validation_organizer_model.php

@@ -67,20 +67,7 @@ class Validation_organizer_model extends CI_Model {
 				)
 			)
 		),
-		'getVenueList'=>array(
-			'organiser_id' => array(
-				'required' => array(
-					'code' => 'ER30',
-					'message' => 'Organizer ID is null or empty'
-				)
-			),
-			'status' => array(
-				'required' => array(
-					'code' => 'ER30',
-					'message' => 'Status is null or empty'
-				)
-			)
-		),
+		'getVenueList'=>array(),
 		'getVenueDetails'=>array(
 			'organiser_id' => array(
 				'required' => array(

assets/js/custom-script.js

@@ -512,11 +512,6 @@ jQuery('[id="viewCustomer"]').on('click',function() {
                               '<div class="col-md-6"><label>'+ customer_data['name']+'</label></div>'+
                             '</div> '+
                             '<div class="row">'+
-                              '<div class="col-md-3">Phone</div>'+
-                              '<div class="col-md-1">:</div>'+
-                              '<div class="col-md-6"><label>'+customer_data['phone']+'</label></div>'+
-                            '</div> '+
-                            '<div class="row">'+
                               '<div class="col-md-3">Email ID</div>'+
                               '<div class="col-md-1">:</div>'+
                               '<div class="col-md-6"><label>'+ customer_data['email']+'</label></div>'+