Merge branch 'master' into 'dev_production'

application/controllers/Notification.php

@@ -125,7 +125,7 @@ class Notification extends CI_Controller {
 							  'title'=>$event_data->event_name_EN,
 							  'param'=>'event_id',
 							  'message'=>$message);
-			push_sent_cancel($user['fcm_token'],$userData);
+			push_sent_cancel(1,$user['fcm_token'],$userData);
 		}
 
 		$flashMsg['class'] = 'success';
@@ -156,7 +156,7 @@ class Notification extends CI_Controller {
 							  'param'=>'booking_id',
 							  'title'=>$bData['event_name_en'],
 							  'message'=>'Booking Remainder');
-	  		push_sent_cancel($bData['fcm_token'],$userData);
+	  		push_sent_cancel(1,$bData['fcm_token'],$userData);
 	  	}
 	}
 }

application/helpers/generals_helper.php

@@ -397,9 +397,9 @@
 		return $langArr;
 	}
 	
-	function push_sent_cancel($fcm_token='', $fcm_data=array()) {
+	function push_sent_cancel($app='1',$fcm_token='', $fcm_data=array()) {
 		$settings = getSettings();
-		$key = $settings['org_app_id'];
+		$key = ($app=='1')?$settings['app_id']:$settings['org_app_id'];
 		if(empty($key) || empty($fcm_token) || empty($fcm_data)){
 			return;
 		}

application/models/Api_model.php

@@ -705,7 +705,7 @@ class Api_model extends CI_Model {
 							  'title'=>'New Booking',
 							  'param'=>'booking_id',
 							  'message'=>'New Booking is There For Approval');
-	  						push_sent_cancel($bkData['fcm_token'],$userData);
+	  						push_sent_cancel(2,$bkData['fcm_token'],$userData);
 					    }
 					}
 		 		} else {
@@ -1423,7 +1423,7 @@ class Api_model extends CI_Model {
 						  'title'=>'New Booking',
 						  'param'=>'booking_id',
 						  'message'=>'New Booking is There For Approval');
-  						push_sent_cancel($bkData['fcm_token'],$userData);
+  						push_sent_cancel(2,$bkData['fcm_token'],$userData);
 				    }
 			    }
           		$this->db->update('booking',array('status'=>$bokStatus),array('bookId'=>$book_id));

application/models/Organizer_model.php

@@ -1100,7 +1100,7 @@ class Organizer_model extends CI_Model {
 							  'param'=>'booking_id',
 							  'title'=>'Booking Approved',
 							  'message'=>'Your Booking is Approved by the Event Provider');
-	  		push_sent_cancel($bData['fcm_token'],$userData);
+	  		push_sent_cancel(2,$bData['fcm_token'],$userData);
  			$res = array('status'=>1,'message'=>'Booking Accepted Successfully');
  		}catch(Exception $e){
  			$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');

application/models/Validation_app_model.php

@@ -664,6 +664,12 @@ class Validation_app_model extends CI_Model {
 					'message' => 'Tracking Id is null or empty'
 				)
 			),
+			'boardCode' => array(
+				'required' => array(
+					'code' => 'ER02',
+					'message' => 'Board Code Field is null or empty'
+				)
+			),
 		),
 		'hotel_book'=>array(
 			'auth_token' => array(

application/models/Webservice_model.php

@@ -1215,7 +1215,7 @@ class Webservice_model extends CI_Model {
 					    					  'param'=>'booking_id',
 											  'title'=>'New Booking',
 											  'message'=>'New Booking is There For Approval');
-	  						push_sent_cancel($bkData['fcm_token'],$userData);
+	  						push_sent_cancel(2,$bkData['fcm_token'],$userData);
 					    }
 					}
 				} else {
@@ -1911,10 +1911,10 @@ class Webservice_model extends CI_Model {
 		if($data['add_as_friend'] == 1){
 			$toCustData = $this->db->get_where('customer',array('customer_id'=>$fromUser))->row_array();
 		    $frmCustData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
-		    $fcmData  = array('id'=>$toUser,'param'=>'user_id',
+		    $fcmData  = array('id'=>$user_id,'param'=>'user_id',
 							  'title'=>'Accepted Chat Request',
 							  'message'=>$frmCustData['name'].' has Accepted Your Chat Request');
-			push_sent_cancel($toCustData['fcm_token'],$fcmData);
+			push_sent_cancel(1,$toCustData['fcm_token'],$fcmData);
 		}
 		return ($status)?1:0;
 	}
@@ -1936,9 +1936,9 @@ class Webservice_model extends CI_Model {
 			    $toCustData = $this->db->get_where('customer',array('customer_id'=>$toUser))->row_array();
 			    $frmCustData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
 			    $fcmData  = array('id'=>$toUser,'param'=>'user_id',
-								  'title'=>'New Friend Request',
-								  'message'=>'You got a New Friend Request from '.$toCustData['name']);
-				push_sent_cancel($frmCustData['fcm_token'],$fcmData);
+								  'title'=>'New Chat Request',
+								  'message'=>'You got a New Chat Request from '.$toCustData['name']);
+				push_sent_cancel(1,$frmCustData['fcm_token'],$fcmData);
 			} else if (!empty($result) && $result['type'] == '0'){
 				$this->db->update('chats',array('type'=>'1'),array('chat_id'=>$result['chat_id']));
 			}
@@ -2347,7 +2347,7 @@ class Webservice_model extends CI_Model {
     		$user_id = $this->auth_token_get($data['auth_token']);
     		if($user_id > 0){
     			$settings = getSettings();
-    			$url = "https://trawex.biz/api/hotel_trawexv5/get_booking_terms";
+    			$url = "https://trawex.biz/api/hotel_trawexv5/get_rate_rules";
     			$postData = array(
     							"user_id"=>$settings['trawex_user_id'],
     							"user_password"=>$settings['trawex_user_password'],
@@ -2362,7 +2362,7 @@ class Webservice_model extends CI_Model {
     							"hotel_name"=>$data['hotel_name'],"infosource"=>$data['infosource'],
     							"meal_code"=>$data['meal_code'],
     							"rate_basis_id"=>$data['rate_basis_id'],
-    							"room_code"=>$data['room_code'],
+    							"room_code"=>$data['room_code'],"boardCode"=>$data['boardCode'],
     							"roomType_runno"=>$data['roomType_runno']);
     			$result = $this->passToJsonCurl($url,$postData);
 			    if(!empty($result)){