t : local changes

application/controllers/Api.php

@@ -624,12 +624,14 @@ class Api extends CI_Controller {
     $merchant_key = $settings['merchant_key'];
 
     $ses_id       = time().rand(100000,999999);
-    $reqData      = '{"sessionId":"'.$ses_id.'","merchantId":"'.$merchant_id.'","custId":"'.$cust_id.'","emailId":"'.$email.'"}';
+    $reqData      = '{"sessionId":"'.$ses_id.'","merchantId":"'.$merchant_id.'","custId":"'.$cust_id.
+                    '","emailId":"'.$email.'"}';
     $plainText    = $this->encryptePayData($merchant_iv,$merchant_key,$reqData);
     $plainText    = $merchant_id.'|'.$plainText;
+    $env = (strpos($settings['payment_gateway_url'],'staging') !==false )?'staging':'payments';
 
     $ch = curl_init();
-    curl_setopt($ch,CURLOPT_URL,$settings['payment_gateway_url']);
+    curl_setopt($ch,CURLOPT_URL,"https://$env.bayanpay.sa/direcpay/secure/PaymentsMerchStoredCardDtlsAPI");
     curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);
     curl_setopt($ch,CURLOPT_POST,1);
     curl_setopt($ch,CURLOPT_POSTFIELDS,$plainText); 
@@ -671,6 +673,9 @@ class Api extends CI_Controller {
     $mKey       = base64_decode($merchant_key);
     $encText    = base64_decode($encText);
     $padtext    = openssl_decrypt($encText,$key,$mKey,OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $merchant_iv);
+    if(empty($padtext)){
+      return;
+    }
     $padData    = ord($padtext{strlen($padtext) - 1});
 
     if ($padData > strlen($padtext)) return false;

application/models/Api_model.php

@@ -134,7 +134,7 @@ class Api_model extends CI_Model {
 	        'newline' => "\r\n"
         ));
         
-        $ci->email->from('[email protected]', 'TimeOut');
+        $ci->email->from('[email protected]', 'TimeOut');
         $ci->email->to($email);
         $ci->email->subject($subject);
         $ci->email->message($message);

application/models/Webservice_model.php

@@ -683,7 +683,7 @@ class Webservice_model extends CI_Model {
 			'newline' => "\r\n"
 		));
 
-		$ci->email->from('[email protected]', 'TimeOut');
+		$ci->email->from('[email protected]', 'TimeOut');
 		$ci->email->to($email);
 		$ci->email->subject($subject);
 		$ci->email->message($message);
@@ -729,7 +729,7 @@ class Webservice_model extends CI_Model {
 				$sql = "SELECT TC.category_id,TC.category_name,TC.category_image
 						FROM translator_category AS TC 
 						INNER JOIN event_category AS ECAT ON (ECAT.cat_id=TC.category_id)
-						WHERE ECAT.status = 1 AND (TC.language_code='$lang' OR TC.language_code='EN') 
+						WHERE ECAT.status = 1 AND TC.language_code='$lang'
 							  $where 
 						GROUP BY ECAT.cat_id ORDER BY ECAT.priority";
 				$result = $this->db->query($sql)->result();
@@ -814,7 +814,7 @@ class Webservice_model extends CI_Model {
 					$sql = "SELECT TREG.region_name FROM region AS REG 
 							INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) 
 							WHERE REG.status='1' AND REG.id='$city_id' AND 
-								  (TREG.language_code='$lang' OR TREG.language_code='EN')
+								  TREG.language_code='$lang'
 						    GROUP BY REG.id";
 					$re = $this->db->query($sql)->row();
 					$cityName = $re->region_name;
@@ -826,7 +826,7 @@ class Webservice_model extends CI_Model {
 						FROM region AS REG 
 						INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) 
 						WHERE REG.status = '1' AND 
-							 (TREG.language_code='$lang' OR TREG.language_code='EN') 
+							  TREG.language_code='$lang'
 						HAVING distance < ".$radius." 
 						ORDER BY distance ASC LIMIT 1")->row_array();
 					if(!empty($data)){
@@ -1594,7 +1594,7 @@ class Webservice_model extends CI_Model {
 							   TCAT.category_image AS category_image
 					    FROM event_category AS ECAT
 						INNER JOIN translator_category AS TCAT ON (TCAT.category_id=ECAT.cat_id)
-					    WHERE ECAT.status = 1 
+					    WHERE ECAT.status = 1 AND TCAT.language_code='$lang'
 					    GROUP BY ECAT.cat_id
 					    ORDER BY ECAT.priority";
 				$category = $this->db->query($sql)->result();
@@ -2185,7 +2185,7 @@ class Webservice_model extends CI_Model {
  				$sql = "SELECT CUST.customer_id AS user_id,CUST.name,CUST.profile_image AS user_image,CUST.cust_lat AS latitude,CUST.cust_lng AS longitude, (((acos(sin((".$data['latitude']."*pi()/180)) * sin((CUST.cust_lat*pi()/180)) + cos((".$data['latitude']."*pi()/180)) * cos((CUST.cust_lat*pi()/180)) * cos(((".$data['longitude']." - CUST.cust_lng)*pi()/180))))*180/pi())*60*1.1515) as distance 
 		 				FROM customer AS CUST 
 		 				INNER JOIN users AS USR ON (USR.id = CUST.customer_id) 
-		 				WHERE USR.user_type='3' AND USR.status='1'
+		 				WHERE USR.user_type='3' AND USR.status='1' AND CUST.enable_chat='1'
 		 				HAVING distance < 5";
 		 		$result = $this->db->query($sql);
 		 		if(!empty($result) && !empty($result = $result->result_array())){