Skip to content

T
TimeOutAdmin
Commit 114a2d86 by Tobin
Options

dc

parent 5a01c0e2
Showing with 89 additions and 36 deletions
application/controllers/Category.php
...@@ -50,7 +50,10 @@ class Category extends CI_Controller { ...@@ -50,7 +50,10 @@ class Category extends CI_Controller {
$errMsg = ''; $errMsg = '';
if($err == 0 && (!isset($_POST['category']) || empty($_POST['category']))){ if($err == 0 && (!isset($_POST['category']) || empty($_POST['category']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Category Name'; $errMsg = 'Provide a Category Name in English';
} else if($err == 0 && (!isset($_POST['category_ar']) || empty($_POST['category_ar']))){
$err = 1;
$errMsg = 'Provide a Category Name in Arabic';
} else if($err == 0 && (!isset($_POST['category_description']) || empty($_POST['category_description']))){ } else if($err == 0 && (!isset($_POST['category_description']) || empty($_POST['category_description']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Category Description'; $errMsg = 'Provide a Category Description';
...@@ -136,11 +139,14 @@ class Category extends CI_Controller { ...@@ -136,11 +139,14 @@ class Category extends CI_Controller {
$errMsg = ''; $errMsg = '';
if($err == 0 && (!isset($_POST['category']) || empty($_POST['category']))){ if($err == 0 && (!isset($_POST['category']) || empty($_POST['category']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Category Name'; $errMsg = 'Provide a Category Name in English';
} else if($err == 0 && (!isset($_POST['category_description']) || empty($_POST['category_description']))){ } else if ($err == 0 && (!isset($_POST['category_ar']) || empty($_POST['category_ar']))){
$err = 1;
$errMsg = 'Provide a Category Name in Arabic';
} else if ($err == 0 && (!isset($_POST['category_description']) || empty($_POST['category_description']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Category Description'; $errMsg = 'Provide a Category Description';
} else if($err == 0 && (!isset($_FILES) || empty($_FILES) || } else if ($err == 0 && (!isset($_FILES) || empty($_FILES) ||
!isset($_FILES['category_image']) || empty($_FILES['category_image']))){ !isset($_FILES['category_image']) || empty($_FILES['category_image']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Category Icon'; $errMsg = 'Provide a Category Icon';
......
application/controllers/Region.php
...@@ -50,7 +50,10 @@ class Region extends CI_Controller { ...@@ -50,7 +50,10 @@ class Region extends CI_Controller {
$errMsg = ''; $errMsg = '';
if($err == 0 && (!isset($_POST['name']) || empty($_POST['name']))){ if($err == 0 && (!isset($_POST['name']) || empty($_POST['name']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Region Name'; $errMsg = 'Provide a Region Name in English';
} else if($err == 0 && (!isset($_POST['name_ar']) || empty($_POST['name_ar']))){
$err = 1;
$errMsg = 'Provide a Region Name in Arabic';
} else if($err == 0 && (!isset($_FILES) || !isset($_FILES['region_icon']) || } else if($err == 0 && (!isset($_FILES) || !isset($_FILES['region_icon']) ||
empty($_FILES['region_icon']))){ empty($_FILES['region_icon']))){
$err = 1; $err = 1;
...@@ -126,7 +129,10 @@ class Region extends CI_Controller { ...@@ -126,7 +129,10 @@ class Region extends CI_Controller {
$errMsg = ''; $errMsg = '';
if($err == 0 && (!isset($_POST['name']) || empty($_POST['name']))){ if($err == 0 && (!isset($_POST['name']) || empty($_POST['name']))){
$err = 1; $err = 1;
$errMsg = 'Provide a Region Name'; $errMsg = 'Provide a Region Name in English';
} else if($err == 0 && (!isset($_POST['name_ar']) || empty($_POST['name_ar']))){
$err = 1;
$errMsg = 'Provide a Region Name in Arabic';
} }
if($err == 1){ if($err == 1){
......
application/models/Api_model.php
...@@ -159,17 +159,17 @@ class Api_model extends CI_Model { ...@@ -159,17 +159,17 @@ class Api_model extends CI_Model {
$res = array('status'=>0,'message'=>'Please try again','code'=>'ER15'); $res = array('status'=>0,'message'=>'Please try again','code'=>'ER15');
} }
} else { } else {
$res = array('status'=>0,'message'=>'No account has been found in this email id','code'=>'ER14'); $res = array('status'=>0,'message'=>'No account has been found in this email id','code'=>'ER14');
} }
} catch(Exception $e) { } catch(Exception $e) {
$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06'); $res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
} }
return $res; return $res;
} }
function popular() { function popular() {
try { try {
$rs = $this->db->select('id,name,region_icon AS image')->where('status',1)->get('region')->result(); $rs = $this->db->select('id,name,name_ar,region_icon AS image')->where('status',1)->get('region')->result();
if(count($rs) > 0) { if(count($rs) > 0) {
$res = array('status'=>1,'data'=>$rs); $res = array('status'=>1,'data'=>$rs);
} else { } else {
...@@ -184,7 +184,7 @@ class Api_model extends CI_Model { ...@@ -184,7 +184,7 @@ class Api_model extends CI_Model {
function category() { function category() {
try { try {
$rs = $this->db->select('cat_id,category,category_description,category_image')->where('status',1)->get('event_category')->result(); $rs = $this->db->select('cat_id,category,category_ar,category_description,category_image')->where('status',1)->get('event_category')->result();
if(count($rs) > 0) { if(count($rs) > 0) {
$res = array('status'=>1,'data'=>$rs); $res = array('status'=>1,'data'=>$rs);
} else { } else {
...@@ -214,7 +214,6 @@ class Api_model extends CI_Model { ...@@ -214,7 +214,6 @@ class Api_model extends CI_Model {
} catch(Exception $e) { } catch(Exception $e) {
$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06'); $res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
} }
return $res; return $res;
} }
...@@ -975,15 +974,39 @@ class Api_model extends CI_Model { ...@@ -975,15 +974,39 @@ class Api_model extends CI_Model {
public function save_organizer($data){ public function save_organizer($data){
try{ try{
$count=$this->db->get_where('users',array('username'=>$data['email_id']))->num_rows(); $userNameChk = $this->db->query("SELECT * FROM users
if($count > 0){ WHERE user_type='2' AND status!='2' AND
$res = array('status'=>0,'message'=>'Email Id Already Exist','code'=>'ER06'); username='".$data['email_id']."'");
}else{ if(!empty($userNameChk) && $userNameChk->num_rows() > 0){
$this->db->insert('users',array('username'=>$data['email_id'],'password'=>md5($data['password']),'display_name'=>$data['name'],'status'=>'0')); $res = array('status'=>0,'message'=>'Username Already Exist','code'=>'ER07');
$last_id = $this->db->insert_id(); return $res;
if($this->db->insert('provider',array('provider_id'=>$last_id,'name'=>$data['name'],'email'=>$data['email_id'],'phone'=>$data['phone']))){ }
$res = array('status'=>1);
} $emailChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
WHERE USR.user_type='2' AND USR.status!='2' AND
PRV.email='".$data['email_id']."'");
if(!empty($emailChk) && $emailChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Email Id Already Exist','code'=>'ER08');
return $res;
}
$phoneChk = $this->db->query("SELECT * FROM provider AS PRV
INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
WHERE USR.user_type='2' AND USR.status!='2' AND
PRV.phone='".$data['phone']."'");
if(!empty($phoneChk) && $phoneChk->num_rows() > 0){
$res = array('status'=>0,'message'=>'Phone Number Already Exist','code'=>'ER09');
return $res;
}
$this->db->insert('users',array('username'=>$data['email_id'],'display_name'=>$data['name'],
'password'=>md5($data['password']),'user_type'=>'2','status'=>'0'));
$last_id = $this->db->insert_id();
if($this->db->insert('provider',array('provider_id'=>$last_id,'name'=>$data['name'],
'email'=>$data['email_id'],'phone'=>$data['phone']))){
$res = array('status'=>1);
} }
}catch(Exception $e){ }catch(Exception $e){
$res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06'); $res = array('status'=>0,'message'=>'Ohh No!! Something went South!!','code'=>'ER06');
......
application/models/Booking_model.php
...@@ -28,7 +28,7 @@ class Booking_model extends CI_Model { ...@@ -28,7 +28,7 @@ class Booking_model extends CI_Model {
INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id) INNER JOIN venue AS VEN ON (VEN.id=EVT.venue_id)
INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id) INNER JOIN host_categories AS HCAT ON (HCAT.host_cat_id=VEN.host_cat_id)
INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id) INNER JOIN event_date_time AS EDT ON (EDT.id=BOK.event_date_id)
INNER JOIN provider AS PRV ON (PRV.provider_id=EVT.provider_id) LEFT JOIN provider AS PRV ON (PRV.provider_id=EVT.provider_id)
WHERE $cond AND EVT.status!='2'"; WHERE $cond AND EVT.status!='2'";
$bookingData = $this->db->query($sql); $bookingData = $this->db->query($sql);
......
application/views/Category/categoryAddForm.php
...@@ -31,15 +31,24 @@ ...@@ -31,15 +31,24 @@
<form role="form" action="<?= base_url($url) ?>" method="post" <form role="form" action="<?= base_url($url) ?>" method="post"
class="validate" data-parsley-validate="" enctype="multipart/form-data"> class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label>Category Name</label> <label>Category Name (English)</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$"
name="category" required="" value="<?= (isset($categoryData->category))?$categoryData->category:'' ?>"placeholder="Category Name"> name="category" required="" value="<?= (isset($categoryData->category))?$categoryData->category:'' ?>"placeholder="Category Name">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<label>Category Name (Arabic)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="category_ar" required placeholder="Category Name"
value="<?= (isset($categoryData->category_ar))?$categoryData->category_ar:''?>">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
...@@ -54,17 +63,14 @@ ...@@ -54,17 +63,14 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>Category Description</label> <label>Category Description</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <textarea type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" data-parsley-minlength="2" name="category_description" required placeholder="Category Description" style="height:76px;"><?= (isset($categoryData->category_description))?$categoryData->category_description:'' ?></textarea>
name="category_description" required placeholder="Category Description"
value="<?= (isset($categoryData->category_description))?$categoryData->category_description:'' ?>" >
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div> </div>
......
application/views/Category/viewCategoryList.php
...@@ -40,9 +40,10 @@ ...@@ -40,9 +40,10 @@
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="50px;">Icon</th> <th width="50px;">Icon</th>
<th width="150px;">Category</th> <th width="110px;">Category (En)</th>
<th width="250px;">Category Description</th> <th width="110px;">Category (Ar)</th>
<th width="70px;">Status</th> <th width="200px;">Category Description</th>
<th width="60px;">Status</th>
<th width="200px;">Action</th> <th width="200px;">Action</th>
</tr> </tr>
</thead> </thead>
...@@ -58,6 +59,7 @@ ...@@ -58,6 +59,7 @@
height="50" width="50" /> height="50" width="50" />
</th> </th>
<th class="center"><?= $category->category ?></th> <th class="center"><?= $category->category ?></th>
<th class="center"><?= $category->category_ar ?></th>
<th class="center"><?= $category->category_description ?></th> <th class="center"><?= $category->category_description ?></th>
<th class="center"><?= ($category->status == 1)?'Active':'De-activate' ?></th> <th class="center"><?= ($category->status == 1)?'Active':'De-activate' ?></th>
<td class="center"> <td class="center">
......
application/views/Provider/viewProvider.php
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
<thead> <thead>
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="150px;">Organizer Name</th> <th width="120px;">Organizer</th>
<th width="120px;">User Name</th> <th width="120px;">User Name</th>
<th width="130px;">Email_id</th> <th width="130px;">Email_id</th>
<th width="80px;">Phone</th> <th width="80px;">Phone</th>
<th width="60px;">Status</th> <th width="60px;">Status</th>
<th width="500px;">Action</th> <th width="520px;">Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
application/views/Region/regionAddForm.php
...@@ -30,15 +30,23 @@ ...@@ -30,15 +30,23 @@
<div class="box-body"> <div class="box-body">
<form role="form" action="<?= base_url($url) ?>" method="post" <form role="form" action="<?= base_url($url) ?>" method="post"
class="validate" data-parsley-validate="" enctype="multipart/form-data"> class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-6"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<label>Region Name</label> <label>Region Name (En)</label>
<input type="text" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$" data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z0-9\ . _ - ' \/]+$"
name="name" required="" value="<?= (isset($regionData->name))?$regionData->name:'' ?>"placeholder="Region Name"> name="name" required="" value="<?= (isset($regionData->name))?$regionData->name:'' ?>"placeholder="Region Name">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<label>Region Name (Ar)</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" name="name_ar" required value="<?= (isset($regionData->name_ar))?$regionData->name_ar:'' ?>"placeholder="Region Name">
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label>Region Icon</label> <label>Region Icon</label>
......
application/views/Region/viewRegionList.php
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
<tr> <tr>
<th class="hidden">ID</th> <th class="hidden">ID</th>
<th width="50px;">Icon</th> <th width="50px;">Icon</th>
<th width="250px;">Region</th> <th width="125px;">Region (English)</th>
<th width="125px;">Region (Arabic)</th>
<th width="100px;">Status</th> <th width="100px;">Status</th>
<th width="200px;">Action</th> <th width="200px;">Action</th>
</tr> </tr>
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
height="50" width="50" /> height="50" width="50" />
</th> </th>
<th class="center"><?= $region->name ?></th> <th class="center"><?= $region->name ?></th>
<th class="center"><?= $region->name_ar ?></th>
<th class="center"><?= ($region->status == 1)?'Active':'De-activate' ?></th> <th class="center"><?= ($region->status == 1)?'Active':'De-activate' ?></th>
<td class="center"> <td class="center">
<a class="btn btn-sm btn-primary" <a class="btn btn-sm btn-primary"
......
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