Commit 36db9560 by Tobin

Merge branch 'master' into 'dev_production'

dc See merge request !305
parents 96c6e8d0 e97971e1
......@@ -399,7 +399,7 @@ class Organizer_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id)
WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND
TSCAT.language_code='EN' AND BUK.status !='4' AND EVDT.status='1'
TSCAT.language_code='EN' AND BUK.status !='4'
GROUP BY BUK.id";
$count = $this->db->query($sql)->num_rows();
if($count > 0) {
......@@ -419,7 +419,7 @@ class Organizer_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id)
WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND
TSCAT.language_code='EN' AND BUK.status !='4' AND EVDT.status='1'
TSCAT.language_code='EN' AND BUK.status !='4'
GROUP BY BUK.id ORDER BY BUK.id DESC
LIMIT $limit,$perPage";
$custData = $this->db->query($sql)->result_array();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment