Skip to content

N
nemt_backend
Commit 81c2cabb by Tobin
Options

daily commit

parent fda0f271
Showing with 430 additions and 58 deletions
application/controllers/Payment.php
...@@ -14,6 +14,7 @@ class Payment extends CI_Controller { ...@@ -14,6 +14,7 @@ class Payment extends CI_Controller {
} }
function getPayDetails(){ function getPayDetails(){
$company_id = '';
if($this->session->userdata('user_type') == 1){ if($this->session->userdata('user_type') == 1){
$company_id=(isset($_POST['company_id'])&&!empty($_POST['company_id']))?$_POST['company_id']:''; $company_id=(isset($_POST['company_id'])&&!empty($_POST['company_id']))?$_POST['company_id']:'';
}else{ }else{
...@@ -27,8 +28,9 @@ class Payment extends CI_Controller { ...@@ -27,8 +28,9 @@ class Payment extends CI_Controller {
$template['menu'] = "Payment Management"; $template['menu'] = "Payment Management";
$template['sub_menu'] = "Payment Details"; $template['sub_menu'] = "Payment Details";
$template['company_id'] = $company_id;
$template['user_type'] = $this->session->userdata('user_type'); $template['user_type'] = $this->session->userdata('user_type');
$template['company_data'] = $this->Company_model->getCompany($company_id); $template['company_data'] = $this->Company_model->getCompany();
$template['payment_details'] = $this->Company_model->getPayDetails($company_id); $template['payment_details'] = $this->Company_model->getPayDetails($company_id);
$this->load->view('template',$template); $this->load->view('template',$template);
} }
......
application/controllers/Report.php
...@@ -105,7 +105,7 @@ class Report extends CI_Controller { ...@@ -105,7 +105,7 @@ class Report extends CI_Controller {
if(empty($dataRow) || empty($fileName)){ if(empty($dataRow) || empty($fileName)){
return; return;
} }
$this->db->query("UPDATE `company_payment_details` SET `report_count`=report_count+1 WHERE `company_id`=10");
//Download CSV\\ //Download CSV\\
$temp_memory = fopen('php://memory', 'w'); $temp_memory = fopen('php://memory', 'w');
foreach ($dataRow as $line) { foreach ($dataRow as $line) {
......
application/controllers/Ride.php
...@@ -48,6 +48,8 @@ class Ride extends CI_Controller { ...@@ -48,6 +48,8 @@ class Ride extends CI_Controller {
$insertArr = array(); $insertArr = array();
$headerArr = array(); $headerArr = array();
$insertData = array(); $insertData = array();
$medicalIds = array();
$custInsrData = array();
if (($handle = fopen($_FILES['csv_file']['tmp_name'], "r")) !== FALSE) { if (($handle = fopen($_FILES['csv_file']['tmp_name'], "r")) !== FALSE) {
while (($row = fgetcsv($handle, 1000, ",")) !== FALSE) { while (($row = fgetcsv($handle, 1000, ",")) !== FALSE) {
$colCnt = 0; $colCnt = 0;
...@@ -85,12 +87,20 @@ class Ride extends CI_Controller { ...@@ -85,12 +87,20 @@ class Ride extends CI_Controller {
'data'=>json_encode($rowArr)); 'data'=>json_encode($rowArr));
$insertData['appointment_time'] = strtotime($date_time); $insertData['appointment_time'] = strtotime($date_time);
$insertArr[] = $insertData; $insertArr[] = $insertData;
$custData = $this->db->query("SELECT medical_id FROM customers WHERE medical_id='".$row[0]."' AND status <> '2'");
if(1 > $custData->num_rows() && !in_array($row[0],$medicalIds)){
$medicalIds[] = $row[0];
$custInsrData[] = array('medical_id'=>$row[0],'first_name'=>$row[2],
'last_name'=>$row[1],'date_of_birth'=>$row[3],
'age'=>$row[4],'phone'=>$row[5],'alt_phone'=>$row[6]);
}
} }
$header = 1; $header = 1;
} }
fclose($handle); fclose($handle);
$status = $this->Ride_model->uploadRides($insertArr); $status = $this->Ride_model->uploadRides($insertArr,$custInsrData);
if($status){ if($status){
$flashMsg['class'] = "success"; $flashMsg['class'] = "success";
$flashMsg['message'] = "Upload Scuccessfull"; $flashMsg['message'] = "Upload Scuccessfull";
......
application/controllers/User.php
...@@ -14,18 +14,111 @@ class User extends CI_Controller { ...@@ -14,18 +14,111 @@ class User extends CI_Controller {
} }
} }
public function viewProfile($user_id = '') { public function viewProfile() {
if(empty($user_id)){
redirect(base_url());
}
$user_id = decode_param($user_id);
$template['page'] = 'User/viewProfile'; $template['page'] = 'User/viewProfile';
$template['page_desc'] = "Edit or View Profile"; $template['page_desc'] = "Edit or View Profile";
$template['page_title'] = "User Profile"; $template['page_title'] = "User Profile";
$template['user_data'] = $this->User_model->getUserData($user_id); $template['user_data'] = $this->User_model->getUserData();
$this->load->view('template',$template);
}
public function editProfile() {
$template['page'] = 'User/editProfile';
$template['page_desc'] = "Edit Profile";
$template['page_title'] = "Edit Profile";
$template['user_data'] = $this->User_model->getUserData();
$this->load->view('template',$template); $this->load->view('template',$template);
} }
public function updateUser(){
$user_id = $this->session->userdata('id');
$user_type = $this->session->userdata('user_type');
$flashMsg = array('message'=>'Something went wrong, please try again..!','class'=>'error');
if(empty($user_id)){
$this->session->set_flashdata('message',$flashMsg);
redirect(base_url('User/editProfile'));
}
if(isset($_FILES['profile_image']) && !empty($_FILES['profile_image'])){
$config = set_upload_service("assets/uploads/services");
$this->load->library('upload');
$new_name = time()."_".$_FILES['profile_image']['name'];
$config['file_name'] = $new_name;
$this->upload->initialize($config);
if($this->upload->do_upload('profile_image')){
$upload_data = $this->upload->data();
$_POST['profile_image'] = $config['upload_path']."/".$upload_data['file_name'];
}
}
if((isset($_POST['password']) || isset($_POST['cPassword'])) &&
(!empty($_POST['password']) || !empty($_POST['cPassword']))){
if($_POST['password'] != $_POST['cPassword']){
$flashMsg = array('message'=>'Re-enter Password..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
}
$password = $_POST['password'];
unset($_POST['password']);
unset($_POST['cPassword']);
$_POST['password'] = md5($password);
} else {
unset($_POST['password']);
unset($_POST['cPassword']);
}
if(!isset($_POST['company_name']) || empty($_POST['company_name'])){
$flashMsg = array('message'=>'Provide a valid Display Name..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else if (!isset($_POST['email_id']) || empty($_POST['email_id'])){
$flashMsg = array('message'=>'Provide a valid Email ID..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
}
if ($user_type == 2){
if (!isset($_POST['address']) || empty($_POST['address'])){
$flashMsg = array('message'=>'Provide a valid Address..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else if (!isset($_POST['fax']) || empty($_POST['fax'])){
$flashMsg = array('message'=>'Provide a valid Fax Number..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else if (!isset($_POST['phone']) || empty($_POST['phone'])){
$flashMsg = array('message'=>'Provide a valid Phone Number..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else if (!isset($_POST['company_contact']) || empty($_POST['company_contact'])){
$flashMsg = array('message'=>'Provide a valid Contact Number..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else if (!isset($_POST['company_info']) || empty($_POST['company_info'])){
$flashMsg = array('message'=>'Provide a valid Contact Info..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
}
}
$status = $this->User_model->updateUser($user_id,$user_type,$_POST);
if($status == 1){
if(isset($_POST['profile_image']) && !empty($_POST['profile_image'])){
$this->session->set_userdata('profile_pic',$_POST['profile_image']);
}
$flashMsg =array('message'=>'Successfully Upadated User Details..!','class'=>'success');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/viewProfile'));
} else if($status == 2){
$flashMsg = array('message'=>'Email ID alrady exist..!','class'=>'error');
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
} else {
$this->session->set_flashdata('message', $flashMsg);
redirect(base_url('User/editProfile'));
}
}
} }
?> ?>
\ No newline at end of file
application/controllers/company.php
...@@ -110,7 +110,6 @@ class Company extends CI_Controller { ...@@ -110,7 +110,6 @@ class Company extends CI_Controller {
$this->session->set_flashdata('message',$flashMsg); $this->session->set_flashdata('message',$flashMsg);
redirect(base_url('Company/add_company')); redirect(base_url('Company/add_company'));
} }
$status = $this->Company_model->addCompany($_POST); $status = $this->Company_model->addCompany($_POST);
if($status == 1){ if($status == 1){
$flashMsg['class'] = 'success'; $flashMsg['class'] = 'success';
......
application/models/Ride_model.php
...@@ -21,11 +21,16 @@ class Ride_model extends CI_Model { ...@@ -21,11 +21,16 @@ class Ride_model extends CI_Model {
return; return;
} }
function uploadRides($insertArr = array()){ function uploadRides($insertArr = array(),$custInsrData = array()){
if(empty($insertArr)){ if(empty($insertArr)){
return 0; return 0;
} }
$status = $this->db->insert_batch('transport_details',$insertArr); $status = $this->db->insert_batch('transport_details',$insertArr);
if(!empty($custInsrData)){
foreach ($custInsrData AS $custData) {
$this->db->insert('customers',$custData);
}
}
return ($status)?1:0; return ($status)?1:0;
} }
......
application/models/User_model.php
...@@ -6,17 +6,45 @@ class User_model extends CI_Model { ...@@ -6,17 +6,45 @@ class User_model extends CI_Model {
parent::_construct(); parent::_construct();
} }
function getUserData($user_id = ''){ function getUserData(){
if(empty($user_id)){ $user_id = $this->session->userdata('id');
return; $user_type = $this->session->userdata('user_type');
} if($user_type == 1){
$result = $this->db->get_where('admin_users',array('status'=>'1','id'=>$user_id)); $result = $this->db->get_where('admin_users',array('status'=>'1','id'=>$user_id));
} else {
pr($result); $sql = "SELECT AU.*, CMP.*
FROM admin_users AS AU
INNER JOIN company AS CMP ON (CMP.company_id = AU.id)
WHERE AU.status = '1' AND AU.id = '".$user_id."'";
$result = $this->db->query($sql);
}
if(empty($result)){ if(empty($result)){
return 0; return 0;
} }
return $result; return $result->row();
}
function updateUser($user_id = '',$user_type = '',$user_data = array()){
if(empty($user_id) || empty($user_type) || empty($user_data)){
return 0;
}
$emailChk = $this->db->get_where('admin_users',array('username'=>$user_data['email_id'],'id !'=>$user_id,'status !='=>'2'));
if(!empty($emailChk) && $emailChk->num_rows() > 0){
return 2;
}
$admUpArr = array('username'=>$user_data['email_id'],'display_name'=>$user_data['company_name']);
if(!empty($user_data['profile_image'])){
$admUpArr['profile_image'] = $user_data['profile_image'];
}
if(!empty($user_data['password'])){
$admUpArr['password'] = $user_data['password'];
}
$status = $this->db->update('admin_users',$admUpArr,array('id'=>$user_id));
if($status && $user_type == 2){
$company_federal_id = (isset($user_data['company_federal_id']) && !empty($user_data['company_federal_id']))?$user_data['company_federal_id']:'';
$status = $this->db->update('company',array('company_name'=>$user_data['company_name'],'address'=>$user_data['address'],'phone'=>$user_data['phone'],'fax'=>$user_data['fax'],'email_id'=>$user_data['email_id'],'company_contact'=>$user_data['company_contact'],'company_info'=>$user_data['company_info'],'company_federal_id'=>$company_federal_id), array('company_id'=>$user_id));
}
return $status;
} }
} }
?> ?>
\ No newline at end of file
application/views/Company/add_company.php
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<label for="exampleInputEmail1">Email</label> <label for="exampleInputEmail1">User Name</label>
<input type="email" class="form-control required" data-parsley-trigger="change" <input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter email ID"> data-parsley-minlength="2" required="" name="email_id" placeholder="Enter User Name">
<span class="glyphicon form-control-feedback"></span> <span class="glyphicon form-control-feedback"></span>
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
......
application/views/Payment/payment_details.php
...@@ -29,27 +29,25 @@ ...@@ -29,27 +29,25 @@
<h3 class="box-title">Transaction Management</h3> <h3 class="box-title">Transaction Management</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<form role="form" action="<?=base_url('Payment/getPayDetails')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data"> <form role="form" id="cmpyPayDetlsForm" action="<?=base_url('Payment/getPayDetails')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label for="exampleInputEmail1" style="padding-top:12px;">Company</label> <label>Select Company</label>
<select name="company_id" class="form-control required" data-parsley-trigger="change" required> <select name="company_id" class="form-control required" data-parsley-trigger="change" onchange="getCmpyPayDetls()" dmClick="0" required>
<option selected disabled>Select Company</option> <option selected disabled>Select Company</option>
<?php <?php
if(!empty($company_data)){ if(!empty($company_data)){
foreach ($company_data as $company) { foreach ($company_data as $company) {
echo '<option value="'.$company->company_id.'">'.$company->company_name.'</option>'; $chkFlg = ($company_id == $company->company_id)?'selected':'';
echo '<option value="'.$company->company_id.'" '.$chkFlg.'>
'.$company->company_name.
'</option>';
} }
} }
?> ?>
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-12">
<div class="box-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>
...@@ -88,35 +86,66 @@ ...@@ -88,35 +86,66 @@
</div> </div>
</div> </div>
</div> </div>
<br>
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Transaction Details</h3> <h3 class="box-title">Payment Details</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"> <div class="col-md-6">
<div class="col-md-4">Booking Charge</div> <div class="col-md-4">Booking Count</div>
<div class="col-md-1">:</div> <div class="col-md-1">:</div>
<div class="col-md-1"><strong><?= $payment_details->booking_charge ?></strong></div> <div class="col-md-1"><strong><?= $payment_details->booking_count ?></strong></div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="col-md-4">SMS Charge</div> <div class="col-md-4">SMS Send</div>
<div class="col-md-1">:</div> <div class="col-md-1">:</div>
<div class="col-md-1"><strong><?= $payment_details->sms_charge ?></strong></div> <div class="col-md-1"><strong><?= $payment_details->sms_count ?></strong></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="col-md-4">Booking Charge</div> <div class="col-md-4">Notification Send</div>
<div class="col-md-1">:</div> <div class="col-md-1">:</div>
<div class="col-md-1"><strong><?= $payment_details->booking_charge ?></strong></div> <div class="col-md-1"><strong><?= $payment_details->push_count ?></strong></div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="col-md-4">SMS Charge</div> <div class="col-md-4">Report Generated</div>
<div class="col-md-1">:</div> <div class="col-md-1">:</div>
<div class="col-md-1"><strong><?= $payment_details->sms_charge ?></strong></div> <div class="col-md-1"><strong><?= $payment_details->report_count ?></strong></div>
</div> </div>
</div> </div>
<div class="col-md-12" style="padding-top:20px;">
<div class="col-md-6">
<div class="col-md-4">Total Earning</div>
<div class="col-md-1">:</div>
<div class="col-md-1"><strong><?= $payment_details->total_earnings ?></strong></div>
</div>
<div class="col-md-6">
<div class="col-md-4">Total Paid</div>
<div class="col-md-1">:</div>
<div class="col-md-1"><strong><?= $payment_details->paid_amount ?></strong></div>
</div>
</div>
<div class="col-md-12" style="padding-top:20px;">
<div class="col-md-8">
<div class="col-md-4">Last Payment On</div>
<div class="col-md-4" style="padding-left:0px;"><strong><?= (!empty($payment_details->last_paid_date))?date('d-M-Y G:i',$payment_details->last_paid_date):'' ?></strong></div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-8">
<div class="col-md-4">Outstanding Amount</div>
<div class="col-md-4" style="padding-left:0px;"><strong><?= $payment_details->outstanding_amount ?></strong></div>
</div>
</div>
<?php if($this->session->userdata['user_type'] != 1 && $payment_details->outstanding_amount > 0){ ?>
<div class="col-md-12" style="padding-top:20px;">
<div class="box-footer" style="padding-left:45%;">
<button type="submit" class="btn btn-primary">Pay Now</button>
</div>
</div>
<?php } ?>
</div> </div>
</div> </div>
</div> </div>
......
application/views/Templates/header-menu.php
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<!-- Menu Footer--> <!-- Menu Footer-->
<li class="user-footer"> <li class="user-footer">
<div class="pull-left"> <div class="pull-left">
<a href="<?= base_url('User/viewProfile/'.encode_param($this->session->userdata['id'])) ?>" class="btn btn-default btn-flat">Profile</a> <a href="<?=base_url('User/viewProfile')?>" class="btn btn-default btn-flat">Profile</a>
</div> </div>
<div class="pull-right"> <div class="pull-right">
<a href="<?php echo base_url(); ?>logout" class="btn btn-default btn-flat">Sign out</a> <a href="<?php echo base_url(); ?>logout" class="btn btn-default btn-flat">Sign out</a>
......
application/views/User/editProfile.php 0 → 100644
<div class="content-wrapper">
<section class="content-header">
<h1>
<?= $page_title ?>
<small><?= $page_desc ?></small>
</h1>
<ol class="breadcrumb">
<li><a href="<?= base_url() ?>"><i class="fa fa-star-o" aria-hidden="true"></i>Home</a></li>
<li>Driver</li>
<li class="active">Edit Driver</li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="col-md-12">
<?php
if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button>
<?= $flashdata['message'] ?>
</div>
<?php } ?>
</div>
<div class="col-md-12">
<div class="box box-warning">
<div class="box-header with-border">
<div class="col-md-6">
<h3 class="box-title">Admin Details</h3>
</div>
<div class="col-md-6" align="right">
<a class="btn btn-sm btn-primary" href="<?= base_url('User/viewProfile') ?>">Back</a>
</div>
</div>
<div class="box-body">
<form role="form" action="<?=base_url('User/updateUser')?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company Name</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" data-parsley-pattern="^[a-zA-Z\ . ! @ # $ % ^ & * () + = , \/]+$" required="" name="company_name" value="<?= $user_data->display_name ?>" placeholder="Enter Company Name">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Email</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="email_id" placeholder="Enter User Name" value="<?= $user_data->username ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php if($this->session->userdata('user_type') == 2){ ?>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Address</label>
<textarea class="ip_reg_form_input form-control reset-form-custom required" placeholder="Enter Company Address" name="address" data-parsley-trigger="change" data-parsley-minlength="2" required=""><?= $user_data->company_name ?></textarea>
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company Federal ID</label>
<input type="text" class="form-control" data-parsley-trigger="change"
data-parsley-minlength="2" name="company_federal_id" placeholder="Enter Company Federal ID" value="<?= $user_data->company_federal_id ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Fax</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="fax" placeholder="Enter Fax Number" value="<?= $user_data->fax ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php } ?>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Profile Picture</label>
<div class="col-md-12" style="padding-bottom:10px;">
<div class="col-md-3">
<img id="image_id" src="<?= base_url($user_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
</div>
<div class="col-md-9" style="padding-top: 25px;">
<input name="profile_image" type="file" accept="image/*" onchange="setImg(this,'image_id');" />
</div>
</div>
</div>
<?php if($this->session->userdata('user_type') == 2){ ?>
<div class="form-group">
<label for="exampleInputEmail1">Phone</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="phone" placeholder="Enter Phone Number" value="<?= $user_data->phone ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Company Contact</label>
<input type="number" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="company_contact" placeholder="Enter Company Contact Number" value="<?= $user_data->company_contact ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Contact Person Information</label>
<input type="text" class="form-control required" data-parsley-trigger="change"
data-parsley-minlength="2" required="" name="company_info" placeholder="Enter Contact Person Info" value="<?= $user_data->company_info ?>">
<span class="glyphicon form-control-feedback"></span>
</div>
<?php } ?>
</div>
</div>
<!-- Change Password -->
<div class="col-md-12" style="padding-top:10px;">
<div class="box-header with-border">
<h3 class="box-title">Change Password</h3>
</div><br>
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">New Password</label>
<input type="password" class="form-control" name="password" placeholder="New Password" >
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
<div class="col-md-6">
<div class="form-group has-feedback">
<label for="exampleInputEmail1">Confirm Password</label>
<input type="password" class="form-control" name="cPassword" placeholder="Confirm Password" >
<span class="glyphicon form-control-feedback"></span>
</div>
</div>
</div>
<div class="col-md-12">
<div class="box-footer" style="padding-left:46%;">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</section>
</div>
application/views/User/viewProfile.php
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<section class="content"> <section class="content">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<?php if($this->session->flashdata('message')) { <?php
if($this->session->flashdata('message')) {
$flashdata = $this->session->flashdata('message'); ?> $flashdata = $this->session->flashdata('message'); ?>
<div class="alert alert-<?= $flashdata['class'] ?>"> <div class="alert alert-<?= $flashdata['class'] ?>">
<button class="close" data-dismiss="alert" type="button">×</button> <button class="close" data-dismiss="alert" type="button">×</button>
...@@ -26,37 +27,99 @@ ...@@ -26,37 +27,99 @@
<div class="box-header with-border"> <div class="box-header with-border">
<div class="col-md-6"><h3 class="box-title">Admin Details</h3></div> <div class="col-md-6"><h3 class="box-title">Admin Details</h3></div>
<div class="col-md-6" align="right"> <div class="col-md-6" align="right">
<a class="btn btn-sm btn-primary" href="<?= base_url('Staffs/editStaff/'.$user_id.'/viewProfile') ?>">Edit</a> <a class="btn btn-sm btn-primary" href="<?= base_url('User/editProfile') ?>">Edit</a>
<a class="btn btn-sm btn-primary" href="<?= base_url() ?>">Back</a> <a class="btn btn-sm btn-primary" href="<?= base_url() ?>">Back</a>
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
<div> <div class="col-md-12">
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<img src="<?= base_url($user_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="100" width="100" /> <img src="<?= base_url($user_data->profile_image) ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="100" width="100" />
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-10">
<div class="form-group has-feedback"> <div class="row">
<span style="padding-right: 52px;">Name </span> : <div class="col-md-2"><span>Display Name </span></div>
<label style="padding-left: 10px;" for="exampleInputEmail1"> <div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->display_name ?> <?= $user_data->display_name ?>
</label> </label>
</div> </div>
<div class="form-group has-feedback"> </div>
<span style="padding-right: 22px;">User Name </span> : <div class="row">
<label style="padding-left: 10px;" for="exampleInputEmail1"> <div class="col-md-2"><span>User Name </span></div>
<?= $user_data->user_name ?> <div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->username ?>
</label> </label>
</div> </div>
<div class="form-group has-feedback"> </div>
<span style="padding-right: 28px;">User Type </span> : <?php if($this->session->userdata('user_type') == 2){ ?>
<label style="padding-left: 10px;" for="exampleInputEmail1"><?= $user_data->user_type ?></label> <div class="row">
<div class="col-md-2"><span>Address </span></div>
<div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->address ?>
</label>
</div>
</div>
<div class="row">
<div class="col-md-2"><span>Phone Number </span></div>
<div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->phone ?>
</label>
</div>
</div>
<div class="row">
<div class="col-md-2"><span>Fax Number </span></div>
<div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->fax ?>
</label>
</div>
</div>
<div class="row">
<div class="col-md-2"><span>Company Contact </span></div>
<div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->company_contact ?>
</label>
</div>
</div>
<div class="row">
<div class="col-md-2"><span>Contact Person </span></div>
<div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->username ?>
</label>
</div>
</div>
<?php if(!empty($user_data->company_federal_id)){ ?>
<div class="row">
<div class="col-md-2"><span>Contact Person </span></div>
<div class="col-md-8">
<span>:</span>
<label style="padding-top:10px;padding-left:20px;">
<?= $user_data->company_federal_id ?>
</label>
</div>
</div>
<?php } ?>
<?php } ?>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</section> </section>
</div> </div>
assets/js/nemt_custom.js
...@@ -152,3 +152,7 @@ jQuery('#report_table tbody').on('click','a',function() { ...@@ -152,3 +152,7 @@ jQuery('#report_table tbody').on('click','a',function() {
jQuery('[id="report_list_content"]').html(body_html); jQuery('[id="report_list_content"]').html(body_html);
jQuery('[id="report_list_modal"]').modal('show'); jQuery('[id="report_list_modal"]').modal('show');
}); });
function getCmpyPayDetls(){
jQuery('[id="cmpyPayDetlsForm"]').submit();
}
\ No newline at end of file
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