Skip to content

T
TimeOutAdmin
Commit e7f02d5a by Tobin
Options

dc

parent 2965b38d
Showing with 54 additions and 30 deletions
application/controllers/Event.php
...@@ -194,7 +194,7 @@ class Event extends CI_Controller { ...@@ -194,7 +194,7 @@ class Event extends CI_Controller {
$subject = "TimeOut, New Event Created"; $subject = "TimeOut, New Event Created";
$emailId = $settings['admin_mail_id']; $emailId = $settings['admin_mail_id'];
$message = "<html><body> $message = "<html><body>
New Event Created, event name: <strong>".$_POST['event_name_en']."</strong>. Event URL : ".base_url()."Event/listEvents New Event Created, event name: <strong>".$_POST['event_name_EN']."</strong>. Event URL : ".base_url()."Event/listEvents
</body></html>"; </body></html>";
$this->Api_model->send_mail($subject,$emailId,$message); $this->Api_model->send_mail($subject,$emailId,$message);
} }
......
application/controllers/OrganizerServices.php
...@@ -174,6 +174,17 @@ class OrganizerServices extends CI_Controller { ...@@ -174,6 +174,17 @@ class OrganizerServices extends CI_Controller {
$data = (array) json_decode(file_get_contents('php://input')); $data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->organiserSignUp($data); $res = $this->Organizer_model->organiserSignUp($data);
if($res['status'] != 0){ if($res['status'] != 0){
$settings = getSettings();
$this->load->model('Api_model');
$subject = "New Organizer Account Created";
$message = "<html>
<body>
New Organizer Account for the username
<strong>".$data['username']."</strong> is created and submited for approval.
</body>
</html>";
$this->Api_model->send_mail($subject,$settings['admin_mail_id'],$message);
$this->successResponse($res); $this->successResponse($res);
} }
else{ else{
......
application/controllers/Provider.php
...@@ -66,7 +66,7 @@ class Provider extends CI_Controller { ...@@ -66,7 +66,7 @@ class Provider extends CI_Controller {
$this->load->model('Api_model'); $this->load->model('Api_model');
$providerData = $this->Provider_model->getProviderData($provider_id,'0,1'); $providerData = $this->Provider_model->getProviderData($provider_id,'0,1');
if(!empty($providerData)){ if($status == 1 && !empty($providerData)){
$subject = "Your Organizer Account is now activated"; $subject = "Your Organizer Account is now activated";
$email_id = $providerData->email; $email_id = $providerData->email;
$template = getNotifTemplate(); $template = getNotifTemplate();
......
application/models/Organizer_model.php
...@@ -391,16 +391,16 @@ class Organizer_model extends CI_Model { ...@@ -391,16 +391,16 @@ class Organizer_model extends CI_Model {
try{ try{
$provider_id = $data['organiser_id']; $provider_id = $data['organiser_id'];
$this->db->query("SET SESSION group_concat_max_len = 20000"); $this->db->query("SET SESSION group_concat_max_len = 20000");
$sql = "SELECT BUK.id $sql = "SELECT BOK.id AS booking_id
FROM booking AS BUK FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id) INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id)
INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id) INNER JOIN event_category AS ECAT ON (ECAT.cat_id=EVT.category_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id) INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
TSCAT.language_code='EN' AND BUK.status !='4' WHERE BOK.status IN (0,1,2,3,5,6) AND EVT.provider_id='$provider_id'
GROUP BY BUK.id"; GROUP BY booking_id";
$count = $this->db->query($sql)->num_rows(); $count = $this->db->query($sql)->num_rows();
if($count > 0) { if($count > 0) {
$perPage = 10; $perPage = 10;
...@@ -409,21 +409,30 @@ class Organizer_model extends CI_Model { ...@@ -409,21 +409,30 @@ class Organizer_model extends CI_Model {
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count, $meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage); 'current_page'=>$page,'per_page'=>$perPage);
$sql = "SELECT TSEVT.event_id,TSEVT.event_name,BUK.bookId,TSCAT.category_name,BUK.amount, $sql = "SELECT BOK.id AS booking_id,EVT.event_id,BOK.bookId,BOK.amount,BOK.status,
BUK.status,CUST.name AS customer_name,EVDT.date AS scheduled_date, CUST.name AS customer_name,EDT.date AS scheduled_date,
EVDT.time AS scheduled_time EDT.time AS scheduled_time,EVT.category_id
FROM booking AS BUK FROM booking AS BOK
INNER JOIN events AS EVT ON (EVT.event_id = BUK.event_id) INNER JOIN events AS EVT ON (EVT.event_id=BOK.event_id)
INNER JOIN translator_event AS TSEVT ON (EVT.event_id = TSEVT.event_id) INNER JOIN customer AS CUST ON (CUST.customer_id=BOK.customer_id)
INNER JOIN translator_category AS TSCAT ON (EVT.category_id = TSCAT.category_id) INNER JOIN event_category AS ECAT ON (ECAT.cat_id=EVT.category_id)
INNER JOIN customer AS CUST ON (CUST.customer_id = BUK.customer_id) INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN event_date_time AS EVDT ON (BUK.event_date_id = EVDT.id) INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
WHERE EVT.provider_id ='$provider_id' AND TSEVT.language_code='EN' AND INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
TSCAT.language_code='EN' AND BUK.status !='4' WHERE EVT.provider_id ='$provider_id' AND BOK.status != 4
GROUP BY BUK.id ORDER BY BUK.id DESC GROUP BY booking_id ORDER BY booking_id DESC
LIMIT $limit,$perPage"; LIMIT $limit,$perPage";
$custData = $this->db->query($sql)->result_array(); $bookingData = $this->db->query($sql)->result_array();
$res = array('status'=>1,'data'=>array('data'=>$custData,'meta'=>$meta));
if(!empty($bookingData)){
foreach ($bookingData AS $index => $book) {
$rtlData = langTranslator($book['event_id'],'EVT');
$bookingData[$index]['event_name'] = $rtlData['event_name_EN'];
$rtlData = langTranslator($book['category_id'],'CAT');
$bookingData[$index]['category_name'] = $rtlData['category_name_EN'];
}
}
$res = array('status'=>1,'data'=>array('data'=>$bookingData,'meta'=>$meta));
}else{ }else{
$res = array('status'=>0,'message'=>'No Data found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No Data found','code'=>'ER06');
} }
...@@ -812,7 +821,9 @@ class Organizer_model extends CI_Model { ...@@ -812,7 +821,9 @@ class Organizer_model extends CI_Model {
public function getCategories(){ public function getCategories(){
try{ try{
$sql = "SELECT category_id AS cat_id,category_name AS cat_name FROM translator_category WHERE language_code='EN'"; $sql = "SELECT category_id AS cat_id,category_name AS cat_name
FROM translator_category
WHERE language_code='EN' AND status='1'";
$category = $this->db->query($sql); $category = $this->db->query($sql);
if(empty($category) || empty($category = $category->result_array())){ if(empty($category) || empty($category = $category->result_array())){
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06'); $res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
......
application/models/Webservice_model.php
...@@ -1695,7 +1695,7 @@ class Webservice_model extends CI_Model { ...@@ -1695,7 +1695,7 @@ class Webservice_model extends CI_Model {
INNER JOIN customer AS CUST ON (CUST.city=LOC.region_id) INNER JOIN customer AS CUST ON (CUST.city=LOC.region_id)
INNER JOIN translator_locality AS TLOC ON (TLOC.locality_id=LOC.id) INNER JOIN translator_locality AS TLOC ON (TLOC.locality_id=LOC.id)
WHERE CUST.customer_id='$user_id' AND LOC.status='1' AND WHERE CUST.customer_id='$user_id' AND LOC.status='1' AND
(TLOC.language_code='$lang' OR TLOC.language_code='EN') TLOC.language_code='$lang'
GROUP BY LOC.id"; GROUP BY LOC.id";
$locality = $this->db->query($sql)->result(); $locality = $this->db->query($sql)->result();
......
application/views/Booking/generate.php
...@@ -42,7 +42,9 @@ ...@@ -42,7 +42,9 @@
<?php <?php
if(!empty($providerData)){ if(!empty($providerData)){
foreach ($providerData as $provider) { foreach ($providerData as $provider) {
echo '<option value="'.$provider->provider_id.'">'.$provider->name.'</option>'; echo '<option value="'.$provider->provider_id.'">'.
$provider->name.' ('.$provider->email.')'.
'</option>';
} }
} }
?> ?>
......
application/views/Checker/viewChecker.php
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
foreach ($provider_data as $provider) { foreach ($provider_data as $provider) {
$select=(isset($provider_id)&&$provider->provider_id==$provider_id)?'selected':''; $select=(isset($provider_id)&&$provider->provider_id==$provider_id)?'selected':'';
echo '<option '.$select.' value="'.$provider->provider_id.'">'. echo '<option '.$select.' value="'.$provider->provider_id.'">'.
$provider->name. $provider->name.' ('.$provider->email.')'.
'</option>'; '</option>';
} }
?> ?>
......
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