Skip to content

T
TimeOutAdmin
Commit 3b29bc59 by Tobin
Options

Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin

parents 41e538fc ea87e937
Showing with 74 additions and 44 deletions
application/controllers/Api.php
......@@ -496,14 +496,14 @@ class Api extends CI_Controller {
}
public function paymentSuccessUrl(){
$settings = getSettings();
$iv = $settings['merchant_iv'];
$mKey = $settings['merchant_key'];
$redUrl = $settings['web_base_url'];
if(isset($_REQUEST['responseParameter']) && !empty($_REQUEST['responseParameter']) &&
!empty($response = explode("||",$_REQUEST['responseParameter'])) && !isset($_POST['txnErrMsg'])){
!empty($response = explode("||",$_REQUEST['responseParameter'])) &&
!isset($_POST['txnErrMsg'])){
$settings = getSettings();
$iv = $settings['merchant_iv'];
$mKey = $settings['merchant_key'];
$redUrl = $settings['web_base_url'];
if(!isset($response[1]) || empty($response[1])){
redirect($redUrl.'failure');
}
......
application/controllers/OrganizerServices.php
......@@ -113,7 +113,8 @@ class OrganizerServices extends CI_Controller {
public function deActivateOrganizerEvent(){
$data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->changeOrganizerEventStatus($data,0);
$status = ($data['status'] == 0)?0:1;
$res = $this->Organizer_model->changeOrganizerEventStatus($data,$status);
if($res['status'] != '0'){
$this->successResponse($res);
}else{
......@@ -204,7 +205,8 @@ class OrganizerServices extends CI_Controller {
public function checkerDeactivate(){
$data = (array) json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->checkerDeactivate($data);
$status = ($data['status'] == 0)?0:1;
$res = $this->Organizer_model->checkerDeactivate($data,$status);
if($res['status'] != 0){
$this->successResponse($res);
}else{
......@@ -466,7 +468,7 @@ class OrganizerServices extends CI_Controller {
public function getOrganizerCityList(){
$data = (array)json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->getOrganizerCityList($data,0);
$res = $this->Organizer_model->getOrganizerCityList($data);
if($res['status'] != 0){
$this->response($res['data']);
}else{
......@@ -486,7 +488,7 @@ class OrganizerServices extends CI_Controller {
public function editOrganizerCityDetails(){
$data = $_POST;
$res = $this->Organizer_model->editOrganizerCityDetails($data,0);
$res = $this->Organizer_model->editOrganizerCityDetails($data);
if($res['status'] != 0){
$this->successResponse($res);
}else{
......@@ -496,7 +498,7 @@ class OrganizerServices extends CI_Controller {
public function addCity(){
$data = $_POST;
$res = $this->Organizer_model->addCity($data,0);
$res = $this->Organizer_model->addCity($data);
if($res['status'] != 0){
$this->successResponse($res);
}else{
......@@ -626,7 +628,8 @@ class OrganizerServices extends CI_Controller {
public function deActivateOrganizerVenue(){
$data = (array)json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->changeOrganizerVenueStatus($data,0);
$status = ($data['status'] == 0)?0:1;
$res = $this->Organizer_model->changeOrganizerVenueStatus($data,$status);
if($res['status'] != 0){
$this->successResponse($res);
}else{
......@@ -638,7 +641,7 @@ class OrganizerServices extends CI_Controller {
$data = (array)json_decode(file_get_contents('php://input'));
$res = $this->Organizer_model->getVenueList($data);
if($res['status'] != 0){
$this->response($res);
$this->response($res['data']);
}else{
$this->errorResponse($res['code'],$res['message']);
}
......
application/models/Organizer_model.php
......@@ -258,7 +258,8 @@ class Organizer_model extends CI_Model {
return $res;
}
if($this->db->update('events',array('status'=>$status),array('event_id'=>$data['event_id'],'provider_id'=>$data['organiser_id']))){
$res = array('status'=>1,'message'=>($status == 2)?'Event Deleted Successfully':'Event DeActivated Successfully');
$evStatus = ($status == 0)?'Deactivated':'Activated';
$res = array('status'=>1,'message'=>($status == 2)?'Event Deleted Successfully':'Event '.$evStatus.' Successfully');
}
} catch(Exception $e){
$res = array('status'=>'0','message'=>'Ohh No!! Something Went South!!','code'=>'ER06');
......@@ -312,7 +313,7 @@ class Organizer_model extends CI_Model {
$cond .= (!empty($data['venue_id']))?" AND VNE.id='".$data['venue_id']."' ":"";
$cond .= (!empty($data['organiser_id']))?" AND VNE.provider_id='".$data['organiser_id']."' ":"";
$sql = "SELECT VNE.id AS venue_id,VNE.layout AS venue_images,VNE.layout_details AS seat_block,VNE.region_id,VNE.location AS venue_location,HST.host_category
$sql = "SELECT VNE.id AS venue_id,VNE.layout AS venue_images,VNE.layout_details AS seat_block,VNE.region_id,VNE.location AS venue_location,HST.host_category,VNE.location_lat,VNE.location_lng
FROM venue AS VNE
INNER JOIN host_categories AS HST ON (HST.host_cat_id=VNE.host_cat_id)
WHERE $cond";
......@@ -507,10 +508,10 @@ class Organizer_model extends CI_Model {
return $res;
}
public function checkerDeactivate($data){
public function checkerDeactivate($data,$status =''){
try{
if($this->db->update('checker',array('status'=>'0'),array('id'=>$data['checker_id'],'provider_id'=>$data['organiser_id']))){
$res = array('status'=>1,'message'=>'Checker Deactivated');
if($this->db->update('checker',array('status'=>$status),array('id'=>$data['checker_id'],'provider_id'=>$data['organiser_id']))){
$res = array('status'=>1,'message'=>($status == 0)?'Checker Deactivated':'Checker Activated');
}
} catch (Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
......@@ -882,14 +883,14 @@ class Organizer_model extends CI_Model {
public function getCheckerList($data){
try{
$count = $this->db->query("SELECT id FROM checker AS CHKR WHERE CHKR.status=1 AND CHKR.provider_id = '".$data['organiser_id']."'")->num_rows();
$count = $this->db->query("SELECT id FROM checker AS CHKR WHERE CHKR.status IN('0','1') AND CHKR.provider_id = '".$data['organiser_id']."'")->num_rows();
if($count > 0) {
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
$limit = ($page - 1) * $perPage;
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage);
$sql = "SELECT CHKR.username AS checker_name,CHKR.id AS checker_id,PDR.name AS provider,CHKR.status FROM checker AS CHKR INNER JOIN provider AS PDR ON (PDR.provider_id = CHKR.provider_id) WHERE CHKR.status = '1' AND CHKR.provider_id ='".$data['organiser_id']."' LIMIT $limit,$perPage";
$sql = "SELECT CHKR.username AS checker_name,CHKR.id AS checker_id,PDR.name AS provider,CHKR.status FROM checker AS CHKR INNER JOIN provider AS PDR ON (PDR.provider_id = CHKR.provider_id) WHERE CHKR.status IN('0','1') AND CHKR.provider_id ='".$data['organiser_id']."' LIMIT $limit,$perPage";
$chkrData = $this->db->query($sql);
if(empty($chkrData) || empty($chkrData = $chkrData->result_array())){
$res = array('status'=>0,'message'=>'No Data Found','code'=>'ER06');
......@@ -1256,23 +1257,33 @@ class Organizer_model extends CI_Model {
return $res;
}
public function getOrganizerCityList(){
public function getOrganizerCityList($data){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
try{
$count = $this->db->get_where('region')->num_rows();
$count = $this->db->get_where('region',array('status !='=>2))->num_rows();
if($count > 0){
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
$limit = ($page - 1) * $perPage;
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage);
$sql = $this->db->query("SELECT * FROM region LIMIT $limit,$perPage");
$sql = $this->db->query("SELECT * FROM region WHERE status !='2' LIMIT $limit,$perPage");
if(empty($sql) || empty($regionData = $sql->result_array())){
return $res; exit;
}
foreach ($regionData AS $key => $region) {
$regData = langTranslator($region['id'],'REG','EN');
$regionData[$key] = array_merge($regionData[$key],$regData);
$this->db->select('id,status');
$loc = $this->db->get_where('locality',array('region_id'=>$region['id']));
$regionData[$key]['locality'] = [];
if(isset($loc) && !empty($locData = $loc->result_array())){
foreach ($locData AS $key_loc => $locality) {
$reglocData = langTranslator($locality['id'],'LOC','EN');
$locData[$key_loc] = array_merge($locData[$key_loc],$reglocData);
}
$regionData[$key]['locality'] = $locData;
}
}
$resp = array('data'=>$regionData,'meta'=>$meta);
$res = array('status'=>1,'message'=>'Successfully','data'=>$resp);
......@@ -1397,14 +1408,14 @@ class Organizer_model extends CI_Model {
public function getOrganizerCategoryList($data){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
try{
$count = $this->db->query("SELECT * FROM event_category ORDER BY priority")->num_rows();
$count = $this->db->query("SELECT * FROM event_category WHERE status != '2' ORDER BY priority")->num_rows();
if($count > 0){
$perPage = 10;
$page = (isset($data['page']))?$data['page']:1;
$limit = ($page - 1) * $perPage;
$meta = array('total_pages'=>ceil($count/$perPage),'total'=>$count,
'current_page'=>$page,'per_page'=>$perPage);
$sql = $this->db->query("SELECT * FROM event_category ORDER BY priority LIMIT $limit,$perPage");
$sql = $this->db->query("SELECT * FROM event_category WHERE status != '2' ORDER BY priority LIMIT $limit,$perPage");
if(empty($sql) || empty($categoryData = $sql->result_array())){
return $res; exit;
}
......@@ -1627,7 +1638,9 @@ class Organizer_model extends CI_Model {
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
try{
$this->db->update('venue',array('status'=>$status),array('id'=>$data['venue_id']));
$res = array('status'=>1,'message'=>'success');
$venStatus = ($status == 2)?'Deleted':'Deactivated';
$venStatus = ($status == 1)?'Activated':$venStatus;
$res = array('status'=>1,'message'=>'Venue '.$venStatus.' Successfully');
}catch(Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something Went South','code'=>'ER06');
}
......
application/models/Validation_organizer_model.php
......@@ -59,6 +59,12 @@ class Validation_organizer_model extends CI_Model {
'code' => 'ER32',
'message' => 'Event ID is null or empty'
)
),
'status' => array(
'required' => array(
'code' => 'ER32',
'message' => 'Status is null or empty'
)
)
),
'getVenueList'=>array(
......@@ -203,6 +209,12 @@ class Validation_organizer_model extends CI_Model {
'code' => 'ER30',
'message' => 'Organizer Id is null or empty'
)
),
'status' => array(
'required' => array(
'code' => 'ER32',
'message' => 'Status is null or empty'
)
)
),
'getTagList'=>array(
......@@ -522,12 +534,6 @@ class Validation_organizer_model extends CI_Model {
'message' => 'Organizer Id is null or empty'
)
),
'page' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Page is null or empty'
)
),
),
'addHostCategory'=>array(
'organiser_id' => array(
......@@ -584,12 +590,6 @@ class Validation_organizer_model extends CI_Model {
'message' => 'Organizer Id is null or empty'
)
),
'page' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Page is null or empty'
)
)
),
'getCityDetails'=>array(
'organiser_id' => array(
......@@ -674,12 +674,6 @@ class Validation_organizer_model extends CI_Model {
'message' => 'Organizer Id is null or empty'
)
),
'page' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Page is null or empty'
)
)
),
'getOrganizerCategoryDetails'=>array(
'organiser_id' => array(
......@@ -821,6 +815,12 @@ class Validation_organizer_model extends CI_Model {
'code' => 'ER04',
'message' => 'Host Id is null or empty'
)
),
'status' => array(
'required' => array(
'code' => 'ER32',
'message' => 'Status is null or empty'
)
)
),
'editOrganizerVenueDetails'=>array(
......@@ -875,6 +875,20 @@ class Validation_organizer_model extends CI_Model {
)
),
),
'getOrganizerVenueList'=>array(
'organiser_id' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Organizer Id is null or empty'
)
),
'status' => array(
'required' => array(
'code' => 'ER04',
'message' => 'Status is null or empty'
)
)
),
);
public function _consruct(){
......
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