Merge branch 'master' into 'dev_production'

application/models/Api_model.php

@@ -1645,6 +1645,22 @@ class Api_model extends CI_Model {
   						push_sent_cancel(2,$bkData['fcm_token'],$userData);
 				    }
 			    }
+			    $evtInvite = $this->db->get_where('event_invites',array('book_id'=>$book_id))->result_array();
+				if(!empty($evtInvite)){
+			    	$msg = "Hi, You are invited for the event '".$bkData['event_name']."', and show is on '".
+			    		   $showTime."'. Booking ID ".$post_data['bookId'].
+			    		   ". Find the QR Code ".base_url('/'.$bkData['qrcode']);
+				    foreach ($evtInvite AS $inviteData) {
+				    	if(!empty($inviteData['phone'])){
+				    		$this->sendSMS($inviteData['phone'],$msg);
+				    	}
+				    	if(!empty($inviteData['user_id'])){
+				    		$usrData = $this->db->get_where('customer',
+				    							  array('customer_id'=>$inviteData['user_id']))->row_array();
+							$this->sendSMS($usrData['phone'],$msg);
+				    	}
+				    }
+				}
           		$this->db->update('booking',array('status'=>$bokStatus),array('bookId'=>$book_id));
           		$this->db->update('event_invites',array('status'=>'1'),array('book_id'=>$book_id));
           		$this->db->update('promocode_used',array('status'=>'1'),array('booking_id'=>$book_id));

application/models/Organizer_model.php

@@ -369,7 +369,13 @@ class Organizer_model extends CI_Model {
  	public function getCustomerList($data){
  		try{
  			$provider_id = $data['organiser_id'];
- 			$count = $this->db->query("SELECT BUK.customer_id FROM  booking AS BUK INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) WHERE EVT.provider_id ='$provider_id' GROUP BY BUK.customer_id")->num_rows();
+ 			$sql = "SELECT BUK.customer_id 
+ 					FROM booking AS BUK 
+ 					INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) 
+ 					INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) 
+ 					WHERE EVT.provider_id ='$provider_id' AND CUST.status!='2' 
+ 					GROUP BY BUK.customer_id"
+ 			$count = $this->db->query($sql)->num_rows();
  			if($count > 0) {
 				$perPage = 10;
 				$page = (isset($data['page']))?$data['page']:1;
@@ -377,7 +383,14 @@ class Organizer_model extends CI_Model {
 				$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
 						  'current_page'=>$page,'per_page'=>$perPage);
 
-	 			$sql = "SELECT BUK.customer_id,CUST.name AS customer_name,CUST.email,CUST.phone,CASE WHEN CUST.gender ='1' THEN 'male' WHEN CUST.gender='2' THEN 'female' ELSE 'others' END AS gender,CUST.profile_image AS image,CUST.profile_city AS city FROM booking AS BUK INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) WHERE EVT.provider_id ='$provider_id' GROUP BY BUK.customer_id LIMIT $limit,$perPage";
+	 			$sql = "SELECT BUK.customer_id,CUST.name AS customer_name,CUST.email,CUST.phone,
+	 					CASE WHEN CUST.gender ='1' THEN 'male' WHEN CUST.gender='2' THEN 'female' ELSE 'others' END AS gender,
+	 					CUST.profile_image AS image,CUST.profile_city AS city 
+	 					FROM booking AS BUK 
+	 					INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) 
+	 					INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) 
+	 					WHERE EVT.provider_id ='$provider_id' AND CUST.status!='2' 
+	 					GROUP BY BUK.customer_id LIMIT $limit,$perPage";
 	 			$custData = $this->db->query($sql)->result_array();
 	 			$res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta));
 	 		}else{
@@ -401,7 +414,7 @@ class Organizer_model extends CI_Model {
 				    INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
 				    INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
 				    INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
-		 			WHERE BOK.status IN (0,1,2,3,5,6) AND EVT.provider_id='$provider_id' 
+		 			WHERE BOK.status IN (0,1,2,3,5,6) AND EVT.provider_id='$provider_id' AND CUST.status!='2' 
 		 			GROUP BY BOK.id";
  			$count = $this->db->query($sql)->num_rows();
  			if($count > 0) {
@@ -421,7 +434,7 @@ class Organizer_model extends CI_Model {
 					    INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
 					    INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
 					    INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
-			 			WHERE EVT.provider_id ='$provider_id' AND BOK.status != 4
+			 			WHERE EVT.provider_id ='$provider_id' AND BOK.status != 4 AND CUST.status!='2' 
 			 			GROUP BY BOK.id ORDER BY BOK.id DESC
 			 			LIMIT $limit,$perPage";
 	 			$bookingData = $this->db->query($sql)->result_array();
@@ -458,7 +471,7 @@ class Organizer_model extends CI_Model {
  				INNER JOIN translator_venue AS TSVNE ON (TSVNE.venue_id = EVT.venue_id) 
  				INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id)
  				INNER JOIN venue AS VNE ON (VNE.id = EVT.venue_id) 
- 				WHERE BUK.bookId='".$data['booking_id']."'";
+ 				WHERE BUK.bookId='".$data['booking_id']."' AND CUST.status!='2' ";
  			$query = $this->db->query($sql);
  			if(empty($query) || empty($query= $query->row_array())){
  				$res= array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
@@ -867,7 +880,9 @@ class Organizer_model extends CI_Model {
 		    		FROM events AS EVT 
 		    		INNER JOIN booking AS BUK ON (BUK.event_id = EVT.event_id) 
 		    		INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) 
-		    		WHERE EVT.provider_id='".$data['organiser_id']."' AND CUST.name LIKE '%".$data['keyword']."%' GROUP BY BUK.customer_id";
+		    		WHERE EVT.provider_id='".$data['organiser_id']."' AND 
+	    				  CUST.name LIKE '%".$data['keyword']."%' AND CUST.status!='2' 
+				    GROUP BY BUK.customer_id";
     		$custData = $this->db->query($sql);
     		if(empty($custData) || empty($custData = $custData->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
@@ -889,7 +904,9 @@ class Organizer_model extends CI_Model {
 		    		INNER JOIN translator_category AS TSCAT ON (TSCAT.category_id = EVT.category_id) 
 		    		INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) 
 		    		INNER JOIN event_date_time AS EVDT ON (EVDT.id = BUK.event_date_id) 
-		    		WHERE EVT.provider_id='".$data['organiser_id']."' AND TSEVT.event_name LIKE '%".$data['keyword']."%' AND TSEVT.language_code='EN' GROUP BY EVT.event_id";
+		    		WHERE EVT.provider_id='".$data['organiser_id']."' AND CUST.status!='2' AND 
+	    				  TSEVT.event_name LIKE '%".$data['keyword']."%' AND TSEVT.language_code='EN' 
+				  	GROUP BY EVT.event_id";
     		$bookData = $this->db->query($sql);
     		if(empty($bookData) || empty($bookData = $bookData->result_array())){
     			$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');