Merge branch 'master' into 'dev_production'

application/models/HotelServices_model.php

@@ -74,9 +74,10 @@ class HotelServices_model extends CI_Model {
 	    		$trackingId = time().rand(100000,999999);
 	    		$settings = getSettings();
 	    		if(!isset($data['nextToken']) && empty($data['nextToken'])){
-	    			$this->db->select('nationality');
-		    		$userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
+					$this->db->select('nationality');
+					$userData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
 					$countryData = $this->getCountryData($user_id);
+					$currency = ($data['currency'])?$data['currency']:$countryData['currency'];
 	    		}
 				$url = (isset($data['nextToken']) && !empty($data['nextToken']))?"https://trawex.biz/api/hotel_trawexv5/getMoreHotels?user_id=".$settings['trawex_user_id']."&user_password=".$settings['trawex_user_password']."&access=".$settings['trawex_access']."&ip_address=".$settings['trawex_ip_address']."&sessionId=".$data['sessionId']."&nextToken=".$data['nextToken']."&trackingId=".$data['trackingId']."":"https://trawex.biz/api/hotel_trawexv5/hotel_search";
 				if(!isset($data['nextToken']) && empty($data['nextToken'])){
@@ -90,7 +91,7 @@ class HotelServices_model extends CI_Model {
 								  'child'=>$data['child'],'child_age'=>$data['child_age'],
 								  'checkin'=>$data['checkin'],'checkout'=>$data['checkout'],
 								  'client_nationality'=>$userData['nationality'],
-								  'requiredCurrency'=>$countryData['currency']);
+								  'requiredCurrency'=>$currency);
 				}
 
 			    $postFields = (isset($data['nextToken']) && !empty($data['nextToken']))?'':$postData;

application/models/Webservice_model.php

@@ -1163,7 +1163,7 @@ class Webservice_model extends CI_Model {
 						$bookId = $post_data['bookId'];
 						$lang = $countryData['language_code'];
 						$sql = "SELECT TEVT.event_name,CUST.name,CUST.email,CUST.phone,
-					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time,PDR.fcm_token
+					            	   CONCAT(EDATE.date,' ',EDATE.time) AS show_time,PDR.fcm_token,BK.qrcode
 					            FROM booking AS BK 
 					            INNER JOIN events AS EVT ON (EVT.event_id=BK.event_id)
 					            INNER JOIN provider AS PDR ON (PDR.provider_id=EVT.provider_id)
@@ -1197,7 +1197,7 @@ class Webservice_model extends CI_Model {
 					    }
 					    $this->sendSMS($bkData['phone'],$msgContent);
 
-					    $msg = "Hi, You are invited for the event '".$bkData['event_name']."', and show is on '".$showTime."'. Booking ID ".$post_data['bookId'];
+					    $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']);
 						if(!empty($invite_ids)){
 							foreach($invite_ids AS $userId) {
 								$usrData = $this->db->get_where('customer',