Merge branch 'master' into 'dev_production'
Master
See merge request !223
Showing
| ... | @@ -134,7 +134,7 @@ class Api_model extends CI_Model { | ... | @@ -134,7 +134,7 @@ class Api_model extends CI_Model { |
| 'newline' => "\r\n" | 'newline' => "\r\n" | ||
| )); | )); | ||
| $ci->email->from('[email protected]', 'TimeOut'); | $ci->email->from('[email protected]', 'TimeOut'); | ||
| $ci->email->to($email); | $ci->email->to($email); | ||
| $ci->email->subject($subject); | $ci->email->subject($subject); | ||
| $ci->email->message($message); | $ci->email->message($message); | ||
| ... | ... |
application/models/HotelServices_model.php
0 → 100644
This diff is collapsed.
Click to expand it.
| ... | @@ -683,7 +683,7 @@ class Webservice_model extends CI_Model { | ... | @@ -683,7 +683,7 @@ class Webservice_model extends CI_Model { |
| 'newline' => "\r\n" | 'newline' => "\r\n" | ||
| )); | )); | ||
| $ci->email->from('[email protected]', 'TimeOut'); | $ci->email->from('[email protected]', 'TimeOut'); | ||
| $ci->email->to($email); | $ci->email->to($email); | ||
| $ci->email->subject($subject); | $ci->email->subject($subject); | ||
| $ci->email->message($message); | $ci->email->message($message); | ||
| ... | @@ -729,7 +729,7 @@ class Webservice_model extends CI_Model { | ... | @@ -729,7 +729,7 @@ class Webservice_model extends CI_Model { |
| $sql = "SELECT TC.category_id,TC.category_name,TC.category_image | $sql = "SELECT TC.category_id,TC.category_name,TC.category_image | ||
| FROM translator_category AS TC | FROM translator_category AS TC | ||
| INNER JOIN event_category AS ECAT ON (ECAT.cat_id=TC.category_id) | 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 | $where | ||
| GROUP BY ECAT.cat_id ORDER BY ECAT.priority"; | GROUP BY ECAT.cat_id ORDER BY ECAT.priority"; | ||
| $result = $this->db->query($sql)->result(); | $result = $this->db->query($sql)->result(); | ||
| ... | @@ -814,7 +814,7 @@ class Webservice_model extends CI_Model { | ... | @@ -814,7 +814,7 @@ class Webservice_model extends CI_Model { |
| $sql = "SELECT TREG.region_name FROM region AS REG | $sql = "SELECT TREG.region_name FROM region AS REG | ||
| INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) | INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) | ||
| WHERE REG.status='1' AND REG.id='$city_id' AND | 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"; | GROUP BY REG.id"; | ||
| $re = $this->db->query($sql)->row(); | $re = $this->db->query($sql)->row(); | ||
| $cityName = $re->region_name; | $cityName = $re->region_name; | ||
| ... | @@ -826,7 +826,7 @@ class Webservice_model extends CI_Model { | ... | @@ -826,7 +826,7 @@ class Webservice_model extends CI_Model { |
| FROM region AS REG | FROM region AS REG | ||
| INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) | INNER JOIN translator_region AS TREG ON (TREG.region_id = REG.id) | ||
| WHERE REG.status = '1' AND | WHERE REG.status = '1' AND | ||
| (TREG.language_code='$lang' OR TREG.language_code='EN') | TREG.language_code='$lang' | ||
| HAVING distance < ".$radius." | HAVING distance < ".$radius." | ||
| ORDER BY distance ASC LIMIT 1")->row_array(); | ORDER BY distance ASC LIMIT 1")->row_array(); | ||
| if(!empty($data)){ | if(!empty($data)){ | ||
| ... | @@ -1428,19 +1428,28 @@ class Webservice_model extends CI_Model { | ... | @@ -1428,19 +1428,28 @@ class Webservice_model extends CI_Model { |
| translator_event.event_name,booking.qrcode AS event_image, | translator_event.event_name,booking.qrcode AS event_image, | ||
| venue.location,event_date_time.time,booking.event_id, | venue.location,event_date_time.time,booking.event_id, | ||
| booking.no_of_ticket AS ticket_count,events.has_payment, | booking.no_of_ticket AS ticket_count,events.has_payment, | ||
| booking.status AS booking_status | booking.status AS booking_status,transaction.status AS transaction_status | ||
| FROM booking | FROM booking | ||
| INNER JOIN events ON booking.event_id = events.event_id | INNER JOIN events ON booking.event_id = events.event_id | ||
| INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id | INNER JOIN event_date_time ON booking.event_date_id = event_date_time.id | ||
| INNER JOIN venue ON venue.id = events.venue_id | INNER JOIN venue ON venue.id = events.venue_id | ||
| INNER JOIN translator_event ON translator_event.event_id=events.event_id | INNER JOIN translator_event ON translator_event.event_id=events.event_id | ||
| WHERE booking.customer_id = '$user_id' AND booking.status IN(0,1,2,6) | LEFT JOIN transaction ON transaction.booking_id=booking.bookId | ||
| WHERE booking.customer_id = '$user_id' AND booking.status IN (0,1,2,6) | |||
| AND (translator_event.language_code='$lang' OR | AND (translator_event.language_code='$lang' OR | ||
| translator_event.language_code='EN') | translator_event.language_code='EN') | ||
| GROUP BY booking.id | GROUP BY booking.id | ||
| ORDER BY booking.id DESC | ORDER BY booking.id DESC | ||
| LIMIT $page_limit, $per_page"; | LIMIT $page_limit, $per_page"; | ||
| $result = $this->db->query($sql)->result_array(); | $result = $this->db->query($sql)->result_array(); | ||
| if(!empty($result)){ | |||
| foreach ($result AS $key => $value) { | |||
| if($value['has_payment'] == '1' && $value['transaction_status'] != '1'){ | |||
| unset($result[$key]); | |||
| } | |||
| } | |||
| $result = array_values($result); | |||
| } | |||
| $meta = array('total_pages'=>ceil($count/$per_page), | $meta = array('total_pages'=>ceil($count/$per_page), | ||
| 'total'=>$count, | 'total'=>$count, | ||
| 'current_page'=>$page, | 'current_page'=>$page, | ||
| ... | @@ -1594,7 +1603,7 @@ class Webservice_model extends CI_Model { | ... | @@ -1594,7 +1603,7 @@ class Webservice_model extends CI_Model { |
| TCAT.category_image AS category_image | TCAT.category_image AS category_image | ||
| FROM event_category AS ECAT | FROM event_category AS ECAT | ||
| INNER JOIN translator_category AS TCAT ON (TCAT.category_id=ECAT.cat_id) | 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 | GROUP BY ECAT.cat_id | ||
| ORDER BY ECAT.priority"; | ORDER BY ECAT.priority"; | ||
| $category = $this->db->query($sql)->result(); | $category = $this->db->query($sql)->result(); | ||
| ... | @@ -2185,7 +2194,7 @@ class Webservice_model extends CI_Model { | ... | @@ -2185,7 +2194,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 | $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 | FROM customer AS CUST | ||
| INNER JOIN users AS USR ON (USR.id = CUST.customer_id) | 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"; | HAVING distance < 5"; | ||
| $result = $this->db->query($sql); | $result = $this->db->query($sql); | ||
| if(!empty($result) && !empty($result = $result->result_array())){ | if(!empty($result) && !empty($result = $result->result_array())){ | ||
| ... | ... |
Please
register
or
sign in
to comment