Skip to content

T
TimeOutAdmin
Commit 72e6efba by Tobin
Options

Merge branch 'master' into 'dev_production'

contact changes See merge request !297
parents be4a33ca 96248100
Showing with 13 additions and 10 deletions
application/controllers/Event.php
......@@ -150,24 +150,24 @@ class Event extends CI_Controller {
$event_id = $this->Event_model->createEvent($eventData,$languageArr);
if(!empty($event_id)){
$insertEventDate = array();
$evtDateTime = array();
if(isset($_POST['schedule_type']) && $_POST['schedule_type'] == 0){
$date = strtotime($_POST['event_start_date']);
$date = date('Y-m-d',$date);
foreach ($_POST['event_time'] AS $time) {
$insertEventDate[] = array('event_id'=>$event_id,'date'=>$date,'time'=>$time);
$evtDateTime[] = array('event_id'=>$event_id,'date'=>$date,'time'=>$time);
}
} else {
$cdate = strtotime($_POST['event_start_date']);
while ($cdate <= strtotime($_POST['event_end_date'])) {
$cdate = date('Y-m-d',$cdate);
foreach ($_POST['event_time'] AS $time) {
$insertEventDate[] = array('event_id'=>$event_id,'date'=>$cdate,'time'=>$time);
$evtDateTime[] = array('event_id'=>$event_id,'date'=>$cdate,'time'=>$time,'status'=>1);
}
$cdate = strtotime($cdate . ' +1 day');
}
}
$status = $this->Event_model->createEventDateTime($insertEventDate);
$status = $this->Event_model->createEventDateTime($evtDateTime);
$insertTag = array();
foreach ($_POST['tags'] AS $tag) {
......@@ -332,24 +332,24 @@ class Event extends CI_Controller {
$status = $this->Event_model->updateEvent($event_id, $eventData, $languageArr);
if($status){
$insertEventDate = array();
$evtDateTime = array();
if(isset($_POST['schedule_type']) && $_POST['schedule_type'] == 0){
$date = strtotime($_POST['event_start_date']);
$date = date('Y-m-d',$date);
foreach ($_POST['event_time'] AS $time) {
$insertEventDate[] = array('event_id'=>$event_id,'date'=>$date,'time'=>$time);
$evtDateTime[] = array('event_id'=>$event_id,'date'=>$date,'time'=>$time);
}
} else {
$cdate = strtotime($_POST['event_start_date']);
while ($cdate <= strtotime($_POST['event_end_date'])) {
$cdate = date('Y-m-d',$cdate);
foreach ($_POST['event_time'] AS $time) {
$insertEventDate[] = array('event_id'=>$event_id,'date'=>$cdate,'time'=>$time);
$evtDateTime[] = array('event_id'=>$event_id,'date'=>$cdate,'time'=>$time,'status'=>1);
}
$cdate = strtotime($cdate . ' +1 day');
}
}
$status = $this->Event_model->updateEventDateTime($event_id,$insertEventDate);
$status = $this->Event_model->updateEventDateTime($event_id,$evtDateTime);
$insertTag = array();
foreach ($_POST['tags'] AS $tag) {
......
application/models/Api_model.php
......@@ -785,7 +785,7 @@ class Api_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
INNER JOIN translator_event AS TEVT ON (TEVT.event_id=EVT.event_id)
WHERE EVT.status='1' AND BK.status IN ('1','6') AND
WHERE EVT.status='1' AND BK.status IN ('1','6') AND EDATE.status='1' AND
TEVT.language_code='EN' AND BK.bookId='".$post_data['bookId']."'";
$bkData = $this->db->query($sql)->row_array();
......
application/models/Webservice_model.php
......@@ -1198,7 +1198,7 @@ class Webservice_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.customer_id=BK.customer_id)
INNER JOIN event_date_time AS EDATE ON (EDATE.id=BK.event_date_id)
WHERE BK.bookId='$bookId' AND EVT.status='1' AND
BK.status IN ('1','6') AND
BK.status IN ('1','6') AND EDATE.status='1' AND
(TEVT.language_code='$lang' OR TEVT.language_code='EN')";
$bkData = $this->db->query($sql)->row_array();
......@@ -2027,6 +2027,9 @@ class Webservice_model extends CI_Model {
$chatUsers[] = $result;
}
}
// BackUp Contacts
$this->db->update('customer',array('contact_details'=>json_encode($data['contacts'])),
array('customer_id'=>$user_id));
$respArr = array('status'=>1,'data'=>$chatUsers);
return $respArr;
}
......
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