RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHANGE_MASTER_ISSUE_CLEAR_EXPENCE_CREATE_VIEW_CHANGE

Browse Source
This commit is contained in:
aadhavan valli 2024-09-06 11:55:09 +05:30
parent 660536d515
commit 2a85598895
17 changed files with 2788 additions and 2563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -16,6 +16,7 @@ $routes->add('loginMe', 'Login::loginMe');
$routes->get('logout', 'User::logout');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'loadChangePass', 'User::loadChangePass');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'changePassword', 'User::changePassword');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'userChangePassword', 'User::userChangePassword');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'pageNotFound', 'User::pageNotFound');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'checkEmailExists', 'User::checkEmailExists');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'forgotPassword', 'Login::forgotPassword');

7
app/Controllers/Configurationctrl.php
View File

@ -61,6 +61,8 @@ class Configurationctrl extends BaseController
function saveconfig()
{
// echo "<pre>";
// dd($this->request->getPost());
$ConfigName = $this->request->getPost('configurationname');
$Rowcount = $this->request->getPost('txtRowCount');
$Comments = $this->request->getPost('Comments');
@ -90,14 +92,15 @@ class Configurationctrl extends BaseController
$data['child'] = $this->configmodel->GetConfigCenterDetails($ConfigID);
$this->global['pageTitle'] = 'Edit Config';
// echo "<pre>";
// print_r($data);die;
$this->loadViews("editconfig", $this->global, $data, NULL);
}
function updateconfig()
{
// dd($this->request->getPost());
$ConfigId = $this->request->getPost('ConfigId');
$ConfigName = $this->request->getPost('ConfigName');
$Comments = $this->request->getPost('Remarks');

19
app/Controllers/Expense.php
View File

@ -46,11 +46,12 @@ class Expense extends BaseController
'transporter_file' => $fileName,
'supplier_id' => $this->request->getPost('supplierid'),
'remarks' => $this->request->getPost('remarks'),
'item_description' => $this->request->getPost('item_description'),
'cost' => $this->request->getPost('cost'),
'gst' => $this->request->getPost('gst'),
'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'),
'status' => $status,
'payment_method' => $paymentMethod
'cgst' => $this->request->getPost('cgst'),
'sgst' => $this->request->getPost('sgst'),
'igst' => $this->request->getPost('igst'),
'total' => $this->request->getPost('total'),
];
$insert_id = $this->expense_model->insertExpense($data);
@ -92,16 +93,16 @@ class Expense extends BaseController
$data = [
'supplier_id' => $this->request->getPost('supplierid'),
'remarks' => $this->request->getPost('remarks'),
'item_description' => $this->request->getPost('item_description'),
'cost' => $this->request->getPost('cost'),
'gst' => $this->request->getPost('gst'),
'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'),
'status' => $status,
'payment_method' => $paymentMethod
'cgst' => $this->request->getPost('cgst'),
'sgst' => $this->request->getPost('sgst'),
'igst' => $this->request->getPost('igst'),
'total' => $this->request->getPost('total'),
];
if(!empty($fileName)){
$data['transporter_file'] = $fileName;
}
$data['payment_method'] = $this->request->getPost('payment_method');
if ($id) {

1444
app/Controllers/Purchaseorder.php
View File

File diff suppressed because it is too large Load Diff

52
app/Controllers/User.php
View File

@ -901,7 +901,7 @@ class User extends BaseController
$data['userRecords'] = $this->user_model->userListing();
$this->global['pageTitle'] = 'User Listing';
// dd($data);
$this->loadViews("userListing", $this->global, $data, NULL);
//}
}
@ -1095,10 +1095,10 @@ class User extends BaseController
$data['EmpRole'] = $this->user_model->GetRoleNameByUserID($Uid);
$data['AccessDept'] = $this->costcenter_model->getaccessDept($Empid);
// $data['userInfo'] = $this->user_model->getUserInfo($userId);
// $data['userInfo'] = $this->user_model->getUserInfo($Uid);
$data['userId'] = $Uid;
$this->global['pageTitle'] = 'Edit User';
$this->loadViews("editOld", $this->global, $data, NULL);
//}
}
@ -1126,7 +1126,7 @@ class User extends BaseController
// } else {
$EmpID = $this->request->getPost('EmpList');
$role = $this->request->getPost('role');
$password = $this->request->getPost('password');
// $password = $this->request->getPost('password');
$updatedDate = get_current_date_time();
@ -1134,7 +1134,8 @@ class User extends BaseController
$userInfo = array();
$userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
// $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
$userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
$result = $this->user_model->editUser($userInfo, $EmpID);
@ -1168,6 +1169,34 @@ class User extends BaseController
echo 'Succssfully change the user status to InAcive';
}
function userChangePassword()
{
helper('form');
$userId = $this->request->getPost('userId');
$newPassword = $this->request->getPost('password');
$cNewPassword = $this->request->getPost('cpassword');
if ($newPassword == $cNewPassword) {
$usersData = array(
'password' => getHashedPassword($newPassword),
'updatedBy' => $userId,
'updatedDtm' => date('Y-m-d H:i:sa')
);
$result = $this->user_model->changePassword($userId, $usersData);
if ($result > 0) {
$this->session->setFlashdata('success', 'Password updation successful');
} else {
$this->session->setFlashdata('error', 'Password updation failed');
}
return redirect()->route('userListing');
} else {
$this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
return redirect()->route('userListing');
}
}
/**
* This function is used to load the change password screen
*/
@ -1191,10 +1220,11 @@ class User extends BaseController
// $this->validator->setRules(['cNewPassword', 'Confirm new password'=> 'required|matches[newPassword]|max_length[20]']);
// if ($this->validator->run() == FALSE) {
$oldPassword = $this->request->getPost('oldPassword');
$newPassword = $this->request->getPost('newPassword');
$cNewPassword = $this->request->getPost('newPassword');
if($newPassword === $cNewPassword && $oldPassword != $newPassword) {
$oldPassword = $this->request->getPost('oldPassword');
$newPassword = $this->request->getPost('newPassword');
$cNewPassword = $this->request->getPost('cNewPassword');
if ($newPassword == $cNewPassword) {
$resultPas = $this->user_model->matchOldPassword($this->vendorId, $oldPassword);
if (empty($resultPas)) {
$this->session->setFlashdata('nomatch', 'Your old password not correct');
@ -1205,7 +1235,6 @@ class User extends BaseController
'updatedBy' => $this->vendorId,
'updatedDtm' => date('Y-m-d H:i:sa')
);
$this->session->setFlashdata('error', 'Password updation failed');
$result = $this->user_model->changePassword($this->vendorId, $usersData);
if ($result > 0) {
$this->session->setFlashdata('success', 'Password updation successful');
@ -1215,6 +1244,9 @@ class User extends BaseController
return redirect()->route('loadChangePass');
}
} else {
$this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
return redirect()->route('loadChangePass');
}
}

2
app/Models/Expense_model.php
View File

@ -9,7 +9,7 @@ class Expense_model extends Model
protected $primaryKey = 'id'; // Primary key
protected $allowedFields = [
'transporter_file', 'supplier_id', 'remarks', 'cost', 'gst', 'total', 'status', 'payment_method'
'transporter_file', 'supplier_id', 'remarks', 'item_description', 'cost', 'cgst', 'sgst', 'igst', 'total',
];
// Retrieve all active expenses

2
app/Views/EditservicePurchaseorder.php
View File

@ -868,7 +868,7 @@ if (!empty($getlogpodtl)) {
<label>Delivery Date<span class="text-danger">*</span></label>
<div>
<?php
$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?>
</div>

74
app/Views/addEmployeenew.php
View File

@ -377,20 +377,20 @@
</script>
<div class="content-page">
<div class="content">
<div class="row">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Employee</h4>
</div>
</div>
<div class="col-6 text-right">
<a class=" btn btn-dark waves-effect waves-light" href="<?php echo base_url() ?>employeeListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="row">
<div class="col-xl-12">
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Employee</h4>
</div>
</div>
<div class="col-6 text-right">
<a class=" btn btn-dark waves-effect waves-light" href="<?php echo base_url() ?>employeeListing"><span class="bold">Back</span></a>
</div>
</div>
<div id="rootwizard">
<ul class="nav nav-pills nav-justified form-wizard-header mb-3">
<li class="nav-item" data-target-form="#accountForm">
@ -411,7 +411,7 @@
<a href="#third" data-toggle="tab" class="nav-link">
<!-- <a data-toggle="tab" class="nav-link"> -->
<span class="number">3</span>
<span class="d-none d-sm-inline">Bank Details & Emp Benefits</span>
<span class="d-none d-sm-inline">Bank & Emp Benefits</span>
</a>
</li>
<li class="nav-item" data-target-form="#proofForm">
@ -450,29 +450,30 @@
</div>
<div class="col-md-10">
<div class="row">
<div class="col-md-2 pad">
<div class="col-md-4 pad">
<span>Full Name</span><span class="badge">*</span>
<input type="text" name="FirstName"
onkeypress="return onlyAlphabets(event);" maxlength="100"
id="FirstName" class="form-control" required>
</div>
<div class="col-md-2 pad"><span>Father / Husband Name</span><span
<div class="col-md-4 pad"><span>Father / Husband Name</span><span
class="badge">*</span>
<input type="text" name="FatherName"
onkeypress="return onlyAlphabets(event);" id="FatherName"
maxlength="200" class="form-control" required>
</div>
<div class="col-md-2 pad"><span>Contact Number</span><span
<div class="col-md-4 pad"><span>Contact Number</span><span
class="badge">*</span>
<input type="text" name="ContactNumber"
onchange="return getMobileValidation();" id="ContactNumber"
required pattern="(.){10,10}" maxlength="10"
class="form-control" onkeypress="return isNumberKey(event)">
</div>
<div class="col-md-2 pad"><span>Gender</span><span
</div>
<div class="row">
<div class="col-md-4 pad"><span>Gender</span><span
class="badge">*</span>
<select id="gender" name="gender" type="text" required
class="form-control select2">
@ -489,27 +490,27 @@
?>
</select>
</div>
<div class="col-md-2 pad"><span>Date Of Birth</span><span
<div class="col-md-4 pad"><span>Date Of Birth</span><span
class="badge">*</span>
<input id="DateofBirth" required name="DateofBirth"
onkeypress="return false;" maxlength="10"
onchange="getAge();" class="form-control " data-provide="datepicker" data-date-format="dd-mm-yyyy">
</div>
</div>
<div class="row">
<div class="col-md-2 pad"><span>Age</span>
<div class="col-md-4 pad"><span>Age</span>
<input type="text" name="age" id="age" class="form-control"
readonly>
</div>
<div class="col-md-2 pad"><span>Personal Email ID</span>
</div>
<div class="row">
<div class="col-md-4 pad"><span>Personal Email ID</span><span class="badge">*</span>
<input type="email" name="emailid" id="emailid" maxlength="100"
class="form-control">
class="form-control" required>
</div>
<div class="col-md-2 pad"> <span>Official Email ID</span>
<div class="col-md-4 pad"> <span>Official Email ID</span>
<input type="email" name="comemailid" id="mail" maxlength="100"
class="form-control">
</div>
<div class="col-md-2 pad">
<div class="col-md-4 pad">
<span>Blood group</span><span class="badge">*</span>
<select id="bloodgroup" name="bloodgroup" required
@ -527,8 +528,9 @@
?>
</select>
</div>
<div class="col-md-2 pad">
</div>
<div class="row">
<div class="col-md-4 pad">
<span>Marital Status</span><span class="badge">*</span>
<select id="MartialStatus" name="MartialStatus" type="text"
required placeholder="Marital status"
@ -546,17 +548,17 @@
?>
</select>
</div>
</div>
<div class="row">
<div class="col-md-4 pad">
<span>Current Address</span><span class="badge">*</span>
<input type="text" id="currentaddress" required name="currentaddress"
pattern=".{0,500}" maxlength="500" class="form-control">
</div>
<div class="col-md-2 pad" style="margin-top: 18px;">
<div class="col-md-4 pad" style="margin-top: 18px;">
<input type="checkbox" id="checksame" name="sameaddress"
onclick="CheckClick"> Current address same as permanent address
</div>
</div>
<div class="row">
<div class="col-md-4 pad">
<span>Permanent Address</span><span
class="badge">*</span>
@ -564,16 +566,15 @@
name="permanentaddress" pattern=".{0,500}" maxlength="500"
class="form-control">
</div>
</div>
<div class="row">
<div class="col-md-3 pad">
<div class="col-md-4 pad">
<span>Emergency Contact Name</span>
<input type="text" id="emergencycontactname"
onkeypress="return onlyAlphabets(event);" maxlength="100"
name="emergencycontactname" class="form-control">
</div>
<div class="col-md-3">
<div class="col-md-4">
<span>Emergency Contact Number</span>
<input type="text" id="emergencycontactnumber"
name="emergencycontactnumber"
@ -594,7 +595,7 @@
</div>
<div class="tab-pane fade" id="second">
<form id="profileForm" method="post" action="#" class="form-horizontal">
<form id="profileForm" method="post" action="#" class="form-horizontal" style="height: 250px;">
<div class="row">
<div class="col-md-1">
</div>
@ -679,8 +680,7 @@
onchange=" return getValidReferNumber();" maxlength="10"
onkeypress="return isNumberKey(event)" class="form-control">
</div>
</div>
<div class="row" style="margin-bottom: 20px;">
<div class="col-md-3"><span>Work Location</span><span class="badge">*</span>
<select type="text" id="work_location" name="work_location" required
@ -966,7 +966,7 @@
</div>
<div class="tab-pane fade" id="fivth">
<form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data">
<form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data" style="height: 250px;">
<div class="row">
<div class="col-md-1">
</div>

126
app/Views/addUser.php
View File

@ -10,7 +10,7 @@
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
@ -159,48 +159,49 @@
$('#EmpList').select2();
$("#EmpList").change(function() {
var empID = $(this).val();
console.log(empID);
if (empID) {
$.ajax({
url: "<?php echo base_url() ?>fetchEmployeeDetails",
type: 'POST',
data: { EmpID: empID },
success: function(data) {
console.log(data);
if (data.success) {
console.log(data.userInfo[0].FirstName);
$("#FirstName").val(data.userInfo[0].FirstName);
$("#LastName").val(data.userInfo[0].LastName);
$("#Designation").val(data.userInfo[0].Designation);
$("#MailID").val(data.userInfo[0].EmailId);
$("#ContactNo").val(data.userInfo[0].ContactNumber);
} else {
alert('Employee not found');
var empID = $(this).val();
console.log(empID);
if (empID) {
$.ajax({
url: "<?php echo base_url() ?>fetchEmployeeDetails",
type: 'POST',
data: {
EmpID: empID
},
success: function(data) {
console.log(data);
if (data.success) {
console.log(data.userInfo[0].FirstName);
$("#FirstName").val(data.userInfo[0].FirstName);
$("#LastName").val(data.userInfo[0].LastName);
$("#Designation").val(data.userInfo[0].Designation);
$("#MailID").val(data.userInfo[0].EmailId);
$("#ContactNo").val(data.userInfo[0].ContactNumber);
} else {
alert('Employee not found');
}
},
error: function() {
alert('Failed to fetch employee details');
}
},
error: function() {
alert('Failed to fetch employee details');
}
});
} else {
// Clear fields if no employee ID is selected
$("#FirstName").val('');
$("#LastName").val('');
$("#Designation").val('');
$("#MailID").val('');
$("#ContactNo").val('');
}
});
});
} else {
// Clear fields if no employee ID is selected
$("#FirstName").val('');
$("#LastName").val('');
$("#Designation").val('');
$("#MailID").val('');
$("#ContactNo").val('');
}
});
});
$('#addPop').click(function() {
if ($('#distriList option:selected').val() != null) {
if ($('#distriList option:selected').val() == 0) {
} else {
if ($('#distriList option:selected').val() == 0) {} else {
var tempSelect = $('#distriList option:selected').val();
var tempText = $('#distriList option:selected').text();
var o = new Option(tempText, tempSelect);
@ -227,30 +228,29 @@
</script>
<script>
function Validate() {
var isValid = true;
function Validate() {
var isValid = true;
var fname = document.getElementById('FirstName').value;
if (!fname) {
alert('First Name is required');
isValid = false;
var fname = document.getElementById('FirstName').value;
if (!fname) {
alert('First Name is required');
isValid = false;
}
var email = document.getElementById('MailID').value;
var emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
if (!emailPattern.test(email)) {
alert('Invalid email address');
isValid = false;
}
var password = document.getElementById('password').value;
var cpassword = document.getElementById('cpassword').value;
if (password !== cpassword) {
alert('Passwords do not match');
isValid = false;
}
return isValid;
}
var email = document.getElementById('MailID').value;
var emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
if (!emailPattern.test(email)) {
alert('Invalid email address');
isValid = false;
}
var password = document.getElementById('password').value;
var cpassword = document.getElementById('cpassword').value;
if (password !== cpassword) {
alert('Passwords do not match');
isValid = false;
}
return isValid;
}
</script>
</script>

294
app/Views/addconfig.php
View File

@ -3,13 +3,15 @@
background-color: #ddd;
}
</style>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Config Details</h4>
@ -58,7 +60,7 @@
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row" style="margin-top:10px">
<div class="col-md-12 text-right">
<a data-toggle="modal" href="#AddConfiguration" style="margin-right: 10px;" class="btn btn-success"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Configuration</a>
@ -90,6 +92,7 @@
</div>
</div>
<div class="col-md-12 text-right">
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" />
<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
</div>
@ -118,8 +121,7 @@
<?php echo session()->getFlashdata('success'); ?>
</div>
<?php } ?>
</div>
t <!-- end row -->
</div> <!-- end row -->
</div> <!-- container -->
</div> <!-- content -->
@ -128,9 +130,9 @@
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
<!-- Modal Body -->
@ -145,7 +147,7 @@
</div>
<div class="col-md-5">
<input class="form-control" name="ConfigValue" class="form-control" id="ConfigValue" type="text">
<input class="form-control" name="ConfigValue" class="form-control" required="true" id="ConfigValue" type="text">
</div>
</div>
@ -156,8 +158,8 @@
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickAdd" ID="tempClickAdd" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickAdd" ID="tempClickAdd"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
</div>
</div>
</div>
@ -194,7 +196,7 @@
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
</div>
</div>
@ -213,162 +215,172 @@
<td>
<a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
<a class="editConfig" data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
</tr>
</script>
<script>
var index = '1';
var numbers = /^[0-9]+$/;
var userid = '';
$(document).ready(function() {
$("#Edit").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
var s = $('#configtable tr:eq(' + userid + ') td:eq(1)').text()
$("#EditConfigValue").val(s);
});
var index = '1';
var numbers = /^[0-9]+$/;
var userid = '';
$("#Edit").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
var s = $('#configtable tr:eq(' + userid + ') td:eq(1)').text()
$("#EditConfigValue").val(s);
});
$('.tempClickAdd').click(function() {
$('.tempClickAdd').click(function() {
if ($("#ConfigValue").val() != '-1' && $("#ConfigValue").val() != null && $("#ConfigValue").val() != '') {
if ($("#ConfigValue").val() != '-1') {
$('#ConfigValue').show();
var temp = index;
var ConfigValue = $("#ConfigValue").val();
$('#ConfigValue').show();
var temp = index;
var ConfigValue = $("#ConfigValue").val();
$('#ConfigValue').val('');
$('#ConfigValue').val('');
index = parseInt(index) + 1;
index = parseInt(index) + 1;
var template = jQuery("#tempList").html();
var template = jQuery("#tempList").html();
var html = `
<tr id="${temp}">
<td>${temp}</td>
<td>${ConfigValue}</td>
<td>
<a class="editConfig" data-target='#Edit' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#Edit">
<i class="ri-pencil-fill"></i>
&nbsp;&nbsp;&nbsp;
</a>
</td>
</tr>`;
$('#tempAppend').append(html);
var theForm = $("#addconfig");
addHidden(theForm, "ConfigValue" + temp, ConfigValue);
$('#tempAppend').append(_.template(template, {
index: temp,
ConfigValue: ConfigValue
}));
$('#txtRowCount').val(temp);
$('#AddConfiguration').modal('hide');
//CountRows();
} else {
alert('Please enter a value');
var theForm = $(".addconfig");
addHidden(theForm, "ConfigValue" + temp, ConfigValue);
$('#txtRowCount').val(temp);
//CountRows();
} else {
alert('Please enter all the values');
}
});
function addHidden(theForm, key, value) {
// Create a hidden input element, and append it to the form:
var input = document.createElement('input');
input.type = 'hidden';
input.name = key;
'name-as-seen-at-the-server';
input.value = value;
input.id = key;
theForm.append(input);
}
$('.tempClickEdit').click(function() {
if ($("#EditConfigValue").val() != '') {
var temp = index;
var ConfigValue = $("#EditConfigValue").val();
//alert(userid);
$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
//alert($('#hConfigValue'+userid).val());
//$('#hConfigValue'+userid).val(ConfigValue);
$("#ConfigValue" + userid).val(ConfigValue); //ConfigValue2
} else {
alert('Please enter all the values');
}
});
function ConfirmDelete() {
var x = confirm("Are you sure you want to delete?");
if (x)
return true;
else
return false;
}
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 &&
(charCode < 48 || charCode > 57))
return false;
return true;
}
function Rowcount() {
var rowCount = $('#configtable').length;
if (rowCount == '4') {
$("#AddConfiguration").modal('hide');
} else {
$("#AddConfiguration").modal('show');
}
}
var totalRowCount = 0;
var rowCount = 0;
var table = document.getElementById("configtable");
var rows = table.getElementsByTagName("tr");
function CountRows() {
totalRowCount = 0;
rowCount = 0;
table = document.getElementById("ConfigValue");
rows = table.getElementsByTagName("tr")
for (var i = 0; i < rows.length; i++) {
totalRowCount++;
if (rows[i].getElementsByTagName("td").length > 0) {
rowCount++;
}
});
function addHidden(theForm, key, value) {
// Create a hidden input element, and append it to the form:
var input = document.createElement('input');
input.type = 'hidden';
input.name = key;
// 'name-as-seen-at-the-server';
input.value = value;
input.id = key;
$(theForm).append(input);
}
var message = "Total Row Count: " + totalRowCount;
message += "\nRow Count: " + rowCount;
//alert(message);
if (totalRowCount > "4") {
$("#AddConfiguration").modal('hide');
} else {
return false;
$('.tempClickEdit').click(function() {
if ($("#EditConfigValue").val() != '') {
var temp = index;
var ConfigValue = $("#EditConfigValue").val();
//alert(userid);
$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
//alert($('#hConfigValue'+userid).val());
//$('#hConfigValue'+userid).val(ConfigValue);
$("#ConfigValue" + userid).val(ConfigValue); //ConfigValue2
$("#AddConfiguration").modal('hide');
} else {
alert('Please enter all the values');
}
});
function ConfirmDelete() {
var x = confirm("Are you sure you want to delete?");
if (x)
return true;
else
return false;
}
}
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 &&
(charCode < 48 || charCode > 57))
return false;
return true;
}
function Rowcount() {
var rowCount = $('#configtable').length;
if (rowCount == '4') {
$("#AddConfiguration").modal('hide');
} else {
$("#AddConfiguration").modal('show');
}
}
var totalRowCount = 0;
var rowCount = 0;
var table = document.getElementById("configtable");
var rows = table.getElementsByTagName("tr");
function CountRows() {
totalRowCount = 0;
rowCount = 0;
table = document.getElementById("ConfigValue");
rows = table.getElementsByTagName("tr")
for (var i = 0; i < rows.length; i++) {
totalRowCount++;
if (rows[i].getElementsByTagName("td").length > 0) {
rowCount++;
}
}
var message = "Total Row Count: " + totalRowCount;
message += "\nRow Count: " + rowCount;
//alert(message);
if (totalRowCount > "4") {
$("#AddConfiguration").modal('hide');
} else {
return false;
}
}
});
</script>

1717
app/Views/companyview.php
View File

File diff suppressed because it is too large Load Diff

341
app/Views/editOld.php
View File

@ -1,5 +1,3 @@
<?php
$EmpId = '';
@ -9,28 +7,22 @@ $ContactNo = '';
$EmailId = '';
$Role = '';
$Designation = '';
$RoleName = '';
if(!empty($EmpRole))
{
foreach ($EmpRole as $Er)
{
$Role = $Er->roleId;
$RoleName = $Er->role;
}
$RoleName = '';
if (!empty($EmpRole)) {
foreach ($EmpRole as $Er) {
$Role = $Er->roleId;
$RoleName = $Er->role;
}
}
if(!empty($EmpList))
{
foreach ($EmpList as $Emp)
{
if (!empty($EmpList)) {
foreach ($EmpList as $Emp) {
$EmpId = $Emp->EmpID;
$FirstName = $Emp->FirstName;
$LastName = $Emp->LastName;
$ContactNo = $Emp->ContactNumber;
$EmailId = $Emp->EmailId;
$Designation = $Emp->Designation;
$Designation = $Emp->Designation;
}
}
@ -38,20 +30,19 @@ if(!empty($EmpList))
<div class="content-page">
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit User <?= ' - '.$EmpId; ?> Details</h4>
<h4 class="page-title">Edit User <?= ' - ' . $EmpId; ?> Details</h4>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<!-- User Details Form -->
<div class="row">
<div class="col-12">
<div class="card">
@ -77,7 +68,6 @@ if(!empty($EmpList))
</div>
</div>
<div class="form-row">
<div class="col-md-3">
<label for="MailID">Email address</label>
<input type="text" class="form-control required email" value="<?php echo $EmailId ?>" readonly id="MailID" name="MailID" maxlength="128">
@ -86,18 +76,23 @@ if(!empty($EmpList))
<label for="ContactNo">Contact Number</label>
<input type="text" class="form-control required digits" value="<?php echo $ContactNo ?>" readonly id="ContactNo" name="ContactNo" minlength="10" maxlength="10">
</div>
</div>
<div class="form-row">
<div class="col-md-3">
<label for="password">Password</label>
<input type="password" class="form-control" id="password" required name="password" maxlength="10">
</div>
<div class="col-md-3">
<label for="cpassword">Confirm Password</label>
<input type="password" class="form-control equalTo" id="cpassword" name="cpassword" maxlength="10">
<label for="Role">Role</label>
<select class="form-control required" id="role" name="role" required>
<option value="0">Select Role</option>
<?php
if (!empty($roles)) {
foreach ($roles as $rl) {
$selected = ($rl->roleId == $Role) ? 'selected' : '';
?>
<option value="<?php echo $rl->roleId ?>" <?php echo $selected; ?>><?php echo $rl->role ?></option>
<?php
}
}
?>
</select>
</div>
</div>
</div>
<div class="form-group text-right mt-3">
<input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
@ -105,6 +100,8 @@ if(!empty($EmpList))
<input type="submit" class="btn btn-success" value="Submit">
</div>
</form>
<!-- Flash messages for errors and success -->
<?php
$listErrors = session()->getFlashdata('listErrors');
if ($listErrors) {
@ -114,6 +111,7 @@ if(!empty($EmpList))
<?php echo session()->getFlashdata('listErrors'); ?>
</div>
<?php } ?>
<?php
$error = session()->getFlashdata('error');
if ($error) {
@ -123,6 +121,7 @@ if(!empty($EmpList))
<?php echo session()->getFlashdata('error'); ?>
</div>
<?php } ?>
<?php
$success = session()->getFlashdata('success');
if ($success) {
@ -134,152 +133,160 @@ if(!empty($EmpList))
<?php } ?>
</div>
</div>
</div> <!-- end card -->
</div><!-- end col -->
</div>
</div>
<!-- Change Password Form -->
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-body">
<form role="form" action="<?php echo base_url() ?>userChangePassword" method="post" id="changePasswordForm">
<input type="hidden" class="form-control" id="userId" name="userId" value="<?= $userId ?>">
<div class="form-row">
<div class="col-md-3">
<label for="password">New Password</label>
<input type="password" class="form-control" id="password" required name="password" maxlength="10">
</div>
<div class="col-md-3">
<label for="cpassword">Confirm New Password</label>
<input type="password" class="form-control equalTo" id="cpassword" name="cpassword" maxlength="10">
</div>
</div>
<div class="form-group text-right mt-3">
<input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
<input type="submit" class="btn btn-primary" value="Change Password">
</div>
</form>
</div>
</div>
</div>
</div>
</div>
<!-- end row -->
</div> <!-- container -->
</div> <!-- content -->
</div>
</div>
<script src="<?php echo base_url(); ?>public/assets/js/editUser.js" type="text/javascript"></script>
<script type="text/javascript">
$('#addPop').click(function() {
if ($('#distriList option:selected').val() != null) {
if ($('#distriList option:selected').val() == 0) {} else {
var tempSelect = $('#distriList option:selected').val();
var Eid = $('#txtEmpid').val();
var tempText = $('#distriList option:selected').text();
var o = new Option(tempText, tempSelect);
var hidval = tempSelect;
//salert(orgVal);
var Selectedval = ''
if (orgVal != '') {
Selectedval = orgVal + ':' + hidval;
} else {
Selectedval = hidval
}
$(o).html(tempText);
$("#selectDistriList").append(o);
$('#distriList option:selected').remove();
$("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$('#content').loader('show');
$.ajax({
data: {
Eid: Eid
},
type: "POST",
url: "<?php echo base_url() ?>user/Adduserdepartment",
success: function(data) {
if (data) {
$('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
//window.location = baseurl + 'CostCenter/CostListing';
}
}
});
//$('#content').loader('hide');
tempSelect = '';
tempText = '';
Selectedval = '';
$('#addPop').click(function () {
if ($('#distriList option:selected').val() != null) {
if($('#distriList option:selected').val()==0 ){
}
else{
var tempSelect = $('#distriList option:selected').val();
var Eid= $('#txtEmpid').val();
var tempText = $('#distriList option:selected').text();
var o = new Option(tempText,tempSelect);
var hidval = tempSelect;
//salert(orgVal);
var Selectedval = ''
if(orgVal != '')
{
Selectedval = orgVal + ':' + hidval;
}
else
{
Selectedval = hidval
}
$(o).html(tempText);
$("#selectDistriList").append(o);
$('#distriList option:selected').remove();
$("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
} else {
alert("Before add please select any position.");
}
});
$('#removePop').click(function() {
if ($('#selectDistriList option:selected').val() != null) {
if ($('#selectDistriList option:selected').val() == 0) {
//alert('cannot removed');
} else {
var tempSelect = $('#selectDistriList option:selected').val();
var Eid = $('#txtEmpid').val();
$('#selectDistriList option:selected').remove().appendTo('#distriList');
$("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$("#distriList").val(tempSelect);
tempSelect = '';
$('#content').loader('show');
$.ajax({
data:{Eid:Eid},
type:"POST",
url:"<?php echo base_url() ?>user/Adduserdepartment",
success:function(data) {
if(data)
{
$('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
//window.location = baseurl + 'CostCenter/CostListing';
}
$.ajax({
data: {
Eid: Eid
},
type: "POST",
url: "<?php echo base_url() ?>user/Deleteuserdepartment",
success: function(data) {
if (data) {
$('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
//window.location = baseurl + 'CostCenter/CostListing';
}
}
});
//$('#content').loader('hide');
}
} else {
alert("Before remove please select any position.");
}
});
//$('#content').loader('hide');
tempSelect = '';
tempText = '';
Selectedval = '';
}
}
else {
alert("Before add please select any position.");
}
});
$('#removePop').click(function () {
if ($('#selectDistriList option:selected').val() != null) {
if($('#selectDistriList option:selected').val() == 0){
//alert('cannot removed');
}
else{
var tempSelect = $('#selectDistriList option:selected').val();
var Eid= $('#txtEmpid').val();
$('#selectDistriList option:selected').remove().appendTo('#distriList');
$("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$("#distriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected");
$("#distriList").val(tempSelect);
tempSelect = '';
$('#content').loader('show');
$.ajax({
data:{Eid:Eid},
type:"POST",
url:"<?php echo base_url() ?>user/Deleteuserdepartment",
success:function(data) {
if(data)
{
$('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
//window.location = baseurl + 'CostCenter/CostListing';
}
}
});
//$('#content').loader('hide');
}
}
else
{
alert("Before remove please select any position.");
}
});
</script>>
});
</script>>

4
app/Views/editRevenuepurchaseorder.php
View File

@ -1958,7 +1958,7 @@ if (!empty($getlogpodtl)) {
<label>Delivery Date<span class="text-danger">*</span></label>
<div class="form-group">
<?php
$data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?>
@ -1986,7 +1986,7 @@ if (!empty($getlogpodtl)) {
<label>Purchase Order Date</label>
<div class="form-group">
<?php
$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
</div>

320
app/Views/editconfig.php
View File

@ -1,8 +1,8 @@
<script>
//window.onload=al();
function al() {
alert($('#ConfigId').val());
}
//window.onload=al();
function al() {
alert($('#ConfigId').val());
}
</script>
<?php
$ConfigId = '';
@ -11,11 +11,11 @@ $Comments = '';
$ConfigValue = '';
if (!empty($master)) {
foreach ($master as $con) {
$ConfigId = $con->Config_ID;
$ConfigName = $con->ConfigName;
$Comments = $con->Comments;
}
foreach ($master as $con) {
$ConfigId = $con->Config_ID;
$ConfigName = $con->ConfigName;
$Comments = $con->Comments;
}
}
?>
@ -31,7 +31,7 @@ if (!empty($master)) {
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
</div>
</div>
@ -132,10 +132,10 @@ if (!empty($master)) {
</div>
<div class="form-row text-right" style="margin-top:10px; text-align:right">
<div class="col-md-12 text-right">
<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Update" />
</div>
<div class="col-md-12 text-right">
<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel">Cancel</a>
<input type="submit" class="btn btn-success" value="Update" />
</div>
</div>
</div>
</div>
@ -148,9 +148,9 @@ if (!empty($master)) {
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
<!-- Modal Body -->
@ -171,7 +171,7 @@ if (!empty($master)) {
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal">Cancel</a>
<a class="btn btn-success font tempClickAdd" id="tempClickAdd"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add</a>
</div>
</div>
@ -184,9 +184,9 @@ if (!empty($master)) {
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Edit Config</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">Edit Config</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
<!-- Modal Body -->
@ -238,7 +238,7 @@ if (!empty($master)) {
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal">Cancel</a>
<a class="btn btn-success font tempClickUpdate" id="tempClickUpdate"><i class="fa fa-pencil"></i>&nbsp;&nbsp;Update</a>
</div>
</div>
@ -250,168 +250,176 @@ if (!empty($master)) {
<script type="text/html" id="tempList">
<tr id="<%=index%>">
<tr id="<%=index%>">
<?php
$data = array('name' => '"configVal[<%=index%>][index]"', 'value' => set_value('<%=index%>'), 'id' => '"configVal[<%=index%>][index]"', 'class' => 'form-control', 'type' => 'hidden');
echo form_input($data);
?>
<td align="left"><%=index%></td>
<td align="left"><%=ConfigValue%></td>
<?php
$data = array('name' => '"configVal[<%=index%>][index]"', 'value' => set_value('<%=index%>'), 'id' => '"configVal[<%=index%>][index]"', 'class' => 'form-control', 'type' => 'hidden');
echo form_input($data);
?>
<td align="left"><%=index%></td>
<td align="left"><%=ConfigValue%></td>
<td>
<a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
</tr>
<td>
<a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
</tr>
</script>
<script>
var index = $('#txtRowCount').val();
var userid = '';
$(document).ready(function() {
$("#Edit").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
$('#key').val($('#configtable tr:eq(' + userid + ') td:eq(0)').text());
$('#Config_ID').val($('#ConfigId').val());
$('#EditConfigValue').val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
$('#ConfigVal' + userid).val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
var index = $('#txtRowCount').val();
var userid = '';
});
$("#Edit").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
$('#key').val($('#configtable tr:eq(' + userid + ') td:eq(0)').text());
$('#Config_ID').val($('#ConfigId').val());
$('#configValue').val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
$('#ConfigVal' + userid).val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
$('.tempClickAdd').click(function() {
});
var cid = $('#ConfigId').val()
$('.tempClickAdd').click(function() {
if ($("#AddConfigValue").val() != '-1') {
var cid = $('#ConfigId').val()
if ($("#AddConfigValue").val() != '-1' && $("#AddConfigValue").val() != null && $("#AddConfigValue").val() != '') {
$('#AddConfigValue').show();
$('#AddConfigValue').show();
var ConfigValue = $("#AddConfigValue").val();
$('#AddConfigValue').val('');
var ConfigValue = $("#AddConfigValue").val();
$('#AddConfigValue').val('');
index = parseInt(index) + 1;
var temp = index;
index = parseInt(index) + 1;
var temp = index;
var template = jQuery("#tempList").html();
var html = `
<tr id="${temp}">
<td>${temp}</td>
<td>${ConfigValue}</td>
<td>
<a class="editConfig" data-target='#Edit' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#Edit">
<i class="ri-pencil-fill"></i>
&nbsp;&nbsp;&nbsp;
</a>
</td>
</tr>`;
$('#tempAppend').append(html);
var theForm = $(".editConfig");
addHidden(theForm, "DbKey" + temp, 0);
addHidden(theForm, "configVal" + temp, ConfigValue);
$('#txtRowCount').val(temp);
//CountRows();
$('#AddConfiguration').modal('hide');
} else {
alert('Please enter all the values');
}
});
var template = jQuery("#tempList").html();
function addHidden(theForm, key, value) {
// Create a hidden input element, and append it to the form:
var input = document.createElement('input');
input.type = 'hidden';
input.name = key;
'name-as-seen-at-the-server';
input.value = value;
theForm.append(input);
}
$('#tempAppend').append(_.template(template, {
index: temp,
ConfigValue: ConfigValue,
}));
var theForm = $(".editConfig");
addHidden(theForm, "DbKey" + temp, 0);
addHidden(theForm, "configVal" + temp, ConfigValue);
$('#txtRowCount').val(temp);
//CountRows();
} else {
alert('Please enter all the values');
}
});
$('.tempClickUpdate').click(function() {
function addHidden(theForm, key, value) {
// Create a hidden input element, and append it to the form:
var input = document.createElement('input');
input.type = 'hidden';
input.name = key;
'name-as-seen-at-the-server';
input.value = value;
theForm.append(input);
}
$('.tempClickEdit').click(function() {
if ($("#configValue").val() != '') {
if ($("#EditConfigValue").val() != '') {
var temp = index;
var ConfigValue = $("#configValue").val();
//alert(userid);
$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
//alert($('#hConfigValue'+userid).val());
//$('#hConfigValue'+userid).val(ConfigValue);
$('#Config_ID' + userid).val($('#ConfigId').val());
$('#configValue' + userid).val(ConfigValue);
$("#configVal" + userid).val(ConfigValue);
$('#Edit').modal('hide');
} else {
alert('Please enter all the values');
}
});
var temp = index;
var ConfigValue = $("#EditConfigValue").val();
//alert(userid);
function ConfirmDelete() {
var x = confirm("Are you sure you want to delete?");
if (x)
return true;
else
return false;
}
$('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 &&
(charCode < 48 || charCode > 57))
return false;
//alert($('#hConfigValue'+userid).val());
//$('#hConfigValue'+userid).val(ConfigValue);
return true;
}
$('#Config_ID' + userid).val($('#ConfigId').val());
$('#EditConfigValue' + userid).val(ConfigValue);
$("#configVal" + userid).val(ConfigValue);
//var baseurl = "<?php print base_url(); ?>";
$(".editConfig").submit(function(e) {
if (validate()) {
$('#content').loader('show');
$.ajax({
data: $('.editConfig').serialize(),
type: 'POST',
url: "<?php echo base_url(); ?>configurationctrl/configedit",
success: function(data) {
//alert(data);
if (data) {
$('#content').loader('hide');
//alert(data);
$('#txtSelectedDepartment').val('');
$('#txtRowCount').val('');
//window.location = baseurl + 'CostCenter/CostListing';
}
}
});
//$('#content').loader('hide');
}
});
} else {
alert('Please enter all the values');
function validate() {
if ($("option:selected", $("#ApprovedBy")).val() == '-1') {
alert('Please Select Approver Names');
return false;
} else {
return true;
}
}
});
function ConfirmDelete() {
var x = confirm("Are you sure you want to delete?");
if (x)
return true;
else
return false;
}
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 &&
(charCode < 48 || charCode > 57))
return false;
return true;
}
</script>
<script>
//var baseurl = "<?php print base_url(); ?>";
$(".editConfig").submit(function(e) {
if (validate()) {
$('#content').loader('show');
$.ajax({
data: $('.editConfig').serialize(),
type: 'POST',
url: "<?php echo base_url(); ?>configurationctrl/configedit",
success: function(data) {
//alert(data);
if (data) {
$('#content').loader('hide');
//alert(data);
$('#txtSelectedDepartment').val('');
$('#txtRowCount').val('');
//window.location = baseurl + 'CostCenter/CostListing';
}
}
});
//$('#content').loader('hide');
}
});
function validate() {
if ($("option:selected", $("#ApprovedBy")).val() == '-1') {
alert('Please Select Approver Names');
return false;
} else {
return true;
}
}
}
});
</script>

185
app/Views/expense_list.php
View File

@ -9,6 +9,11 @@
padding-bottom: 0%;
}
.expandable-td {
cursor: pointer;
}
.Date-filter-form {
display: flex;
align-items: center;
@ -86,15 +91,16 @@
<table class="table table-bordered table-hover" id="expense_list_table" style="background-color:#fff;">
<thead>
<tr>
<th align="right">Created Date</th>
<th align="right" style="width: 10%;">Created Date</th>
<!-- <th align="right">Expense Id</th> -->
<th align="right">Supplier Name</th>
<th align="right">Cost</th>
<th align="right">GST</th>
<th align="right">Total</th>
<th align="right">Payment Method</th>
<th align="right">Status</th>
<th>Action</th>
<th align="right" style="width: 20%;">Supplier Name</th>
<th align="right" style="width: 25%;">Item Description</th>
<th align="right" style="width: 7%;">Cost</th>
<th align="right" style="width: 5%;">CGST</th>
<th align="right" style="width: 5%;">SGST</th>
<th align="right" style="width: 5%;">IGST</th>
<th align="right" style="width: 7%;">Total</th>
<th align="right" style="width: 8%;">Action</th>
</tr>
</thead>
<tbody>
@ -118,12 +124,23 @@
?>
<td><?php echo $cdate; ?></td>
<!-- <td><?php echo $record['id']; ?></td> -->
<td><?php echo $record['SupplierName']; ?></td>
<td class="expandable-td">
<div class="text-container" style="max-height: 20px; overflow: hidden;">
<?php echo $record['SupplierName']; ?>
</div>
</td>
<!-- Item Description with Clickable TD for Expand/Collapse -->
<td class="expandable-td">
<div class="text-container" style="max-height: 20px; overflow: hidden;">
<?php echo $record['item_description']; ?>
</div>
</td>
<td><?php echo $record['cost']; ?></td>
<td><?php echo $record['gst']; ?></td>
<td><?php echo $record['cgst']; ?></td>
<td><?php echo $record['sgst']; ?></td>
<td><?php echo $record['igst']; ?></td>
<td><?php echo $record['total']; ?></td>
<td><?php echo $record['payment_method']; ?></td>
<td><?php echo $record['status']; ?></td>
<td>
<?php if ($fileExists == 1) { ?>
<button title="Download FIle" class="download_button" onclick="downloadFile('<?php echo $record['id']; ?>', '<?php echo $record['transporter_file']; ?>')" style="border: none;background-color: white;color: #02a8b5;">
@ -166,62 +183,82 @@
<form id="expenseForm" class="form-horizontal" role="form">
<input type="hidden" name="id" id="id">
<div class="form-group row">
<div class="col-md-3">
<label for="supplierid" class="col-form-label">Supplier </label>
</div>
<div class="col-md-5">
<select name="supplierid" id="supplierid" class="form-control" required>
</select>
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="supplierid" class="col-form-label">Item Description </label>
</div>
<div class="col-md-5">
<textarea name="item_description" id="item_description" class="form-control"></textarea>
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="cost" class="col-form-label">Cost</label>
</div>
<div class="col-md-5">
<input type="number" name="cost" id="cost" class="form-control" onchange="totalCalculate()">
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="cost" class="col-form-label">CGST</label>
</div>
<div class="col-md-5">
<input type="number" name="cgst" id="cgst" class="form-control" onchange="totalCalculate()">
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="cost" class="col-form-label">SGST</label>
</div>
<div class="col-md-5">
<input type="number" name="sgst" id="sgst" class="form-control" onchange="totalCalculate()">
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="igst" class="col-form-label">IGST</label>
</div>
<div class="col-md-5">
<input type="number" name="igst" id="igst" class="form-control" onchange="totalCalculate()">
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="cost" class="col-form-label">Total</label>
</div>
<div class="col-md-5">
<input type="number" name="total" id="total" class="form-control">
</div>
</div>
<div class="form-group row">
<div class="col-md-3">
<label for="transporterfile" class="col-form-label">Transporter File</label>
</div>
<div class="col-md-5">
<input type="file" name="transporterfile" id="transporterfile" class="form-control">
<input type="hidden" name="transporterfile_name" id="transporterfile_name">
<small id="fileHelp" class="form-text text-muted">
Current file: <span id="currentFileName"></span>
</small>
</div>
<div class="col-md-1">
</div>
<div class="col-md-5">
<label for="supplierid" class="col-form-label">Supplier </label>
<select name="supplierid" id="supplierid" class="form-control" required>
</select>
</div>
</div>
<div class="form-group row">
<div class="col-md-5">
<label for="cost" class="col-form-label">Cost</label>
<input type="number" name="cost" id="cost" class="form-control">
</div>
<div class="col-md-1">
</div>
<div class="col-md-5">
<label for="gst" class="col-form-label">Tax</label>
<input type="number" name="gst" id="gst" class="form-control">
</div>
</div>
<div class="form-group row">
<div class="col-md-5">
<label for="status" class="col-form-label">Status</label>
<select name="status" id="status_id" class="form-control" required>
<option>Select Status</option>
<option value="Payment Pending">Payment Pending</option>
<option value="Paid">Paid</option>
</select>
</div>
<div class="col-md-1">
<div class="col-md-3">
<label for="note" class="col-form-label">Notes</label>
</div>
<div class="col-md-5">
<label for="payment_method" class="col-form-label">Payment Method</label>
<select name="payment_method" id="payment_method" class="form-control" required>
<option>Select Payment Method</option>
<option value="Cash">Cash</option>
<option value="Online">Online</option>
</select>
</div>
</div>
<div class="form-group row">
<div class="col-md-12">
<label for="remarks" class="col-form-label">Remarks</label>
<!-- <input type="text" name="remarks" id="remarks" class="form-control"> -->
<textarea name="remarks" id="remarks" class="form-control"></textarea>
</div>
</div>
</form>
</div>
@ -305,11 +342,13 @@
$('#currentFileName').text(''); // Clear the file name display
$('#supplierid').val(expense.supplier_id).trigger('change');
$('#remarks').val(expense.remarks);
$('#item_description').val(expense.item_description);
$('#cost').val(expense.cost);
$('#gst').val(expense.gst);
$('#cgst').val(expense.cgst);
$('#sgst').val(expense.sgst);
$('#igst').val(expense.igst);
$('#total').val(expense.total);
$('#status_id').val(expense.status);
$('#payment_method').val(expense.payment_method);
// Clear any existing file link and delete button
$('#transporterfile').next('.download_button').remove();
@ -411,10 +450,8 @@
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
],
responsive: true,
order: [
[0, 'desc']
],
// responsive: true,
order: [],
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>',
@ -497,12 +534,34 @@
}
});
});
</script>
<script>
document.getElementById('transporterfile').addEventListener('change', function() {
var fileName = this.files[0].name;
document.getElementById('currentFileName').textContent = fileName;
});
function totalCalculate() {
var cost = parseFloat($('#cost').val()) || 0;
var cgst = parseFloat($('#cgst').val()) || 0;
var sgst = parseFloat($('#sgst').val()) || 0;
var igst = parseFloat($('#igst').val()) || 0;
var total = cgst + sgst + igst + cost;
// var totalTaxAmount = (cost * totalTaxPercentage) / 100;
// var total = cost + totalTaxAmount;
$('#total').val(total.toFixed(2));
}
$(document).ready(function() {
$('.expandable-td').on('click', function() {
var $textContainer = $(this).find('.text-container');
if ($textContainer.css('max-height') === '20px') {
// Expand the content
$textContainer.css('max-height', 'none');
} else {
// Collapse the content
$textContainer.css('max-height', '20px');
}
});
});
</script>

761
app/Views/includes/new_header.php
View File

@ -1,140 +1,156 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title><?php echo $pageTitle; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
<meta content="Coderthemes" name="author" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- App favicon -->
<link rel="shortcut icon" href="<?php echo base_url(); ?>public/new_assets/images/RI_favicon.png">
<head>
<meta charset="utf-8" />
<title><?php echo $pageTitle; ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
<meta content="Coderthemes" name="author" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- App favicon -->
<link rel="shortcut icon" href="<?php echo base_url(); ?>public/new_assets/images/RI_favicon.png">
<!-- third party css -->
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<!-- third party css end -->
<!-- App css -->
<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
<!-- third party css -->
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" />
<!-- third party css end -->
<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
<!-- App css -->
<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
<!-- icons -->
<link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
<!-- icons -->
<link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
<link href="<?php echo base_url(); ?>public/new_assets/libs/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
<!-- Latest jQuery -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
<link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
<!-- Chart.js -->
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<!-- DataTables CSS -->
<link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet">
<link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet">
<!-- DataTables JS -->
<script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
<!-- Latest jQuery -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
<!-- JSZip for Excel export -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<!-- Chart.js -->
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<!-- pdfmake for PDF export -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
<!-- Additional Styles -->
<link href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
<!-- Scroll the table left to right -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
<!-- DataTables CSS -->
<link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet">
<link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet">
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
<!-- DataTables JS -->
<script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
<!-- JSZip for Excel export -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
<!-- pdfmake for PDF export -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
<!-- Additional Styles -->
<link href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
<!-- Scroll the table left to right -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
<style>
::-webkit-scrollbar {
width: 5px;
height: 5px;
background-color: #f5f5f5;
}
::-webkit-scrollbar-thumb {
background-color: #797a7c;
border-radius: 15px;
height: 5px;
}
::-webkit-scrollbar-track {
background-color: #f5f5f5;
}
width: 5px;
height: 5px;
background-color: #f5f5f5;
}
::-webkit-scrollbar-thumb {
background-color: #797a7c;
border-radius: 15px;
height: 5px;
}
::-webkit-scrollbar-track {
background-color: #f5f5f5;
}
/* Select2 Input Hight Set */
.select2-selection.select2-selection--single{
.select2-selection.select2-selection--single {
height: calc(1.5em + .9rem + 2px);
}
.select2-container--default .select2-selection--single .select2-selection__rendered {
line-height: 37px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
top: 7px;
}
/* Select2 Height End */
.navbar-custom{
.navbar-custom {
height: 55px;
}
.logo-box .logo {
line-height: 55px;
}
.navbar-custom .topnav-menu .nav-link{
.navbar-custom .topnav-menu .nav-link {
max-height: 55px;
line-height: 55px;
}
@media (min-width: 992px) {
.topnav {
height: 45px;
margin-top: 55px;
.topnav {
height: 45px;
margin-top: 55px;
}
}
}
.topnav .navbar-nav .nav-link{
.topnav .navbar-nav .nav-link {
line-height: 15px;
}
.navbar-custom {
background-color: #4f7c97 !important;
}
/* th{
background-color: #ddd !important;
} */
.btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{
.btn.btn-secondary.buttons-html5,
.btn.btn-secondary.buttons-print {
border: 1px solid grey;
border-radius: 4px !important;
}
legend {
border-bottom: 2px solid #FFF !important;
margin-left: -2%;
}
.badge {
color: red;
background-color: #fff;
}
.btn-cancel {
background-color: grey; /* Red color */
background-color: grey;
/* Red color */
color: white;
padding: 10px 20px;
text-align: center;
@ -145,22 +161,25 @@
}
.btn-cancel:hover {
background-color: #02a8b5; /* Darker red on hover */
background-color: #02a8b5;
/* Darker red on hover */
color: white;
}
</style>
</style>
<style>
.date_range{
width:auto;
.date_range {
width: auto;
}
.range_search_button{
.range_search_button {
background-color: blue;
color: #fff;
width: 55px;
border-radius: 5px;
}
.range_reset_button{
.range_reset_button {
background-color: red;
color: #fff;
width: 55px;
@ -168,9 +187,11 @@
padding: 8px;
text-align: center;
}
.content-page {
padding: 20px;
}
#loader_wrapper {
display: none;
position: fixed;
@ -182,49 +203,60 @@
z-index: 9999;
text-align: center;
}
#loadingDiv {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.small-box {
border-radius: 5px;
padding: 20px;
color: #fff;
margin-bottom: 20px;
}
.bg-yellow {
background-color: #f39c12;
}
.small-box .inner {
padding: 10px;
}
.small-box .icon {
font-size: 60px;
line-height: 60px;
color: rgba(0,0,0,0.2);
color: rgba(0, 0, 0, 0.2);
}
.small-box-footer {
display: block;
background: rgba(0,0,0,0.1);
background: rgba(0, 0, 0, 0.1);
color: #fff;
text-align: center;
padding: 10px;
text-decoration: none;
}
.btn-success {
margin: 10px 0;
}
</style>
<style>
.dataTables_wrapper .dataTables_paginate .paginate_button{
.dataTables_wrapper .dataTables_paginate .paginate_button {
padding: .0em 0em !important;
}
.dataTables_wrapper .dataTables_paginate .paginate_button:hover {
color: black !important; /* Text color */
border: 1px solid white; /* Light border color */
background-color: white; /* White background */
.dataTables_wrapper .dataTables_paginate .paginate_button:hover {
color: black !important;
/* Text color */
border: 1px solid white;
/* Light border color */
background-color: white;
/* White background */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #f0f0f0));
background: -webkit-linear-gradient(top, white 0%, #f0f0f0 100%);
background: -moz-linear-gradient(top, white 0%, #f0f0f0 100%);
@ -232,21 +264,26 @@
background: -o-linear-gradient(top, white 0%, #f0f0f0 100%);
background: linear-gradient(to bottom, white 0%, #f0f0f0 100%);
}
</style>
<style>
/* Style for DataTable buttons */
.dt-buttons .btn {
background-color: white; /* White background for buttons */
color: black; /* Black text color */
border: 1px solid white; /* Light gray border */
padding: 5px 10px; /* Padding for buttons */
margin-right: 10px; /* Space between buttons */
background-color: white;
/* White background for buttons */
color: black;
/* Black text color */
border: 1px solid white;
/* Light gray border */
padding: 5px 10px;
/* Padding for buttons */
margin-right: 10px;
/* Space between buttons */
}
/* Space between buttons and length menu */
.dataTables_length {
margin-left: 20px; /* Adjust this value for spacing */
margin-left: 20px;
/* Adjust this value for spacing */
}
/* Additional button hover styles */
@ -255,154 +292,156 @@
background-color: #d8eaf1;
border-color: #cfe5ed;
}
div.dataTables_wrapper div.dataTables_length select {
width: 87px !important;
display: inline-block;
}
</style>
<style>
<style>
.card_font_colorset_green {
font-size: 23.7215px;
font-weight: 500;
line-height: 1.2;
position: relative;
z-index: 1;
color: rgb(86, 166, 75);
}
.card_font_colorset_green{
font-size: 23.7215px;
font-weight: 500;
line-height: 1.2;
position: relative;
z-index: 1;
color: rgb(86, 166, 75);
}
.card_font_colorset_bule{
font-size: 23.7215px;
font-weight: 500;
line-height: 1.2;
position: relative;
z-index: 1;
color: rgb(31, 96, 196);
}
.card_font_colorset_red{
font-size: 23.7215px;
font-weight: 500;
line-height: 1.2;
position: relative;
z-index: 1;
color: rgb(173, 3, 23);
}
</style>
.card_font_colorset_bule {
font-size: 23.7215px;
font-weight: 500;
line-height: 1.2;
position: relative;
z-index: 1;
color: rgb(31, 96, 196);
}
</head>
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
.card_font_colorset_red {
font-size: 23.7215px;
font-weight: 500;
line-height: 1.2;
position: relative;
z-index: 1;
color: rgb(173, 3, 23);
}
</style>
<!-- Begin page -->
<div id="wrapper">
</head>
<!-- Topbar Start -->
<div class="navbar-custom">
<div class="container-fluid">
<ul class="list-unstyled topnav-menu float-right mb-0">
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
<li class="dropdown d-none d-lg-inline-block">
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i>
</a>
</li>
<li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<img src="<?php echo base_url(); ?>public/new_assets/images/avatar.png" alt="user-image" class="rounded-circle">
<span class="pro-user-name ml-1">
<?php echo $name; ?> <i class="mdi mdi-chevron-down"></i>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right profile-dropdown ">
<!-- item-->
<div class="dropdown-header noti-title">
<h6 class="text-overflow m-0"><?php echo "Welcome ".$name." !"; ?><?php //echo $role; ?></h6>
<!-- <h6 class="text-overflow m-0"><?php echo "Welcome ".$role_text." !"; ?><?php //echo $role; ?></h6> -->
</div>
<!-- item-->
<a href="<?php echo base_url(); ?>loadChangePass" class="dropdown-item notify-item">
<i class="ri-account-circle-line"></i>
<span>Change Password</span>
</a>
<!-- Begin page -->
<div id="wrapper">
<!-- item-->
<div class="dropdown-divider"></div>
<!-- Topbar Start -->
<div class="navbar-custom">
<div class="container-fluid">
<!-- item-->
<a href="<?php echo base_url(); ?>logout" class="dropdown-item notify-item">
<i class="ri-logout-box-line"></i>
<span>Logout</span>
</a>
<ul class="list-unstyled topnav-menu float-right mb-0">
<li class="dropdown d-none d-lg-inline-block">
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i>
</a>
</li>
<li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<img src="<?php echo base_url(); ?>public/new_assets/images/avatar.png" alt="user-image" class="rounded-circle">
<span class="pro-user-name ml-1">
<?php echo $name; ?> <i class="mdi mdi-chevron-down"></i>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right profile-dropdown ">
<!-- item-->
<div class="dropdown-header noti-title">
<h6 class="text-overflow m-0"><?php echo "Welcome " . $name . " !"; ?><?php //echo $role;
?></h6>
<!-- <h6 class="text-overflow m-0"><?php echo "Welcome " . $role_text . " !"; ?><?php //echo $role;
?></h6> -->
</div>
</li>
</ul>
<!-- LOGO -->
<div class="logo-box">
<a href="index.html" class="logo logo-dark text-center">
<span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/logo-sm-dark.png" alt="" height="24">
<!-- <span class="logo-lg-text-light">Minton</span> -->
</span>
<span class="logo-lg">
<img src="<?php echo base_url(); ?>public/new_assets/images/logo-dark.png" alt="" height="20">
<!-- <span class="logo-lg-text-light">M</span> -->
</span>
</a>
<a href="index.html" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
</span>
<span class="logo-lg">
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
</span>
</a>
</div>
<ul class="list-unstyled topnav-menu topnav-menu-left m-0">
<li>
<button class="button-menu-mobile waves-effect waves-light">
<i class="fe-menu"></i>
</button>
</li>
<li>
<!-- Mobile menu toggle (Horizontal Layout)-->
<a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
<div class="lines">
<span></span>
<span></span>
<span></span>
</div>
<!-- item-->
<a href="<?php echo base_url(); ?>loadChangePass" class="dropdown-item notify-item">
<i class="ri-account-circle-line"></i>
<span>Change Password</span>
</a>
<!-- End mobile menu toggle-->
</li>
</ul>
<div class="clearfix"></div>
<!-- item-->
<div class="dropdown-divider"></div>
<!-- item-->
<a href="<?php echo base_url(); ?>logout" class="dropdown-item notify-item">
<i class="ri-logout-box-line"></i>
<span>Logout</span>
</a>
</div>
</li>
</ul>
<!-- LOGO -->
<div class="logo-box">
<a href="index.html" class="logo logo-dark text-center">
<span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/logo-sm-dark.png" alt="" height="24">
<!-- <span class="logo-lg-text-light">Minton</span> -->
</span>
<span class="logo-lg">
<img src="<?php echo base_url(); ?>public/new_assets/images/logo-dark.png" alt="" height="20">
<!-- <span class="logo-lg-text-light">M</span> -->
</span>
</a>
<a href="index.html" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
</span>
<span class="logo-lg">
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
</span>
</a>
</div>
<ul class="list-unstyled topnav-menu topnav-menu-left m-0">
<li>
<button class="button-menu-mobile waves-effect waves-light">
<i class="fe-menu"></i>
</button>
</li>
<li>
<!-- Mobile menu toggle (Horizontal Layout)-->
<a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
<div class="lines">
<span></span>
<span></span>
<span></span>
</div>
</a>
<!-- End mobile menu toggle-->
</li>
</ul>
<div class="clearfix"></div>
</div>
<!-- end Topbar -->
</div>
<!-- end Topbar -->
<div class="topnav">
<div class="container-fluid">
<nav class="navbar navbar-light navbar-expand-lg topnav-menu">
<div class="topnav">
<div class="container-fluid">
<nav class="navbar navbar-light navbar-expand-lg topnav-menu">
<div class="collapse navbar-collapse" id="topnav-menu-content">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
aria-expanded="false">
<i class="ri-dashboard-line mr-1"></i> DASHBOARD
</a>
<!-- <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-dashboard" role="button"
<div class="collapse navbar-collapse" id="topnav-menu-content">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
aria-expanded="false">
<i class="ri-dashboard-line mr-1"></i>DASHBOARD</a>
<!-- <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-dashboard" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-dashboard-line mr-1"></i> DASHBOARD <div class="arrow-down"></div>
</a>
@ -411,141 +450,151 @@
<a href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" class="dropdown-item">Sales</a>
<a href="<?php echo base_url(); ?>sales_dashboard" class="dropdown-item">Sales</a>
</div> -->
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-file-paper-2-line mr-1"></i> SALES <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-hr">
<a href="<?php echo base_url(); ?>sales_invoice" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Invoice</a>
<a href="<?php echo base_url(); ?>dashboard" class="dropdown-item"><i class="ri-refresh-line align-middle mr-1"></i>Sync With Zoho Books</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-shopping-cart-2-line mr-1"></i> PURCHASE <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-purchase">
</li>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-requisition"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-pushpin-2-line align-middle mr-1"></i> Requisition <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-requisition">
<a href="<?php echo base_url(); ?>Requisition" class="dropdown-item">Raise Requisition </a>
<a href="<?php echo base_url(); ?>CreatePO" class="dropdown-item">Purchase Order From Requisition</a>
</div>
</div>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-align-justify align-middle mr-1"></i> Purchase order <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-po">
<a href="<?php echo base_url(); ?>purchaseorderListing" class="dropdown-item">Purchase Order List</a>
<a href="<?php echo base_url(); ?>PORelease" class="dropdown-item">Approve Purchase Order</a>
<a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
<a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
</div>
</div>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-inward"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-task-line align-middle mr-1"></i> Inward <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-inward">
<a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item">Inward Gate Register Entry</a>
<a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item">View Inward Gate Register</a>
</div>
</div>
<div class="dropdown">
<a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i> Non IGR / Expense</a>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-file-paper-2-line mr-1"></i> SALES <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-hr">
<a href="<?php echo base_url(); ?>sales_invoice" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Invoice</a>
<a href="<?php echo base_url(); ?>dashboard" class="dropdown-item"><i class="ri-refresh-line align-middle mr-1"></i>Sync With Zoho Books</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-shopping-cart-2-line mr-1"></i> PURCHASE <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-purchase">
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-requisition"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-pushpin-2-line align-middle mr-1"></i> Requisition <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-requisition">
<a href="<?php echo base_url(); ?>Requisition" class="dropdown-item">Raise Requisition </a>
<a href="<?php echo base_url(); ?>CreatePO" class="dropdown-item">Purchase Order From Requisition</a>
</div>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-contacts-book-line mr-1"></i> HR <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-hr">
<a href="<?php echo base_url(); ?>employeeListing" class="dropdown-item"><i class="ri-shield-user-line align-middle mr-1"></i> Employee Details</a>
<a href="<?php echo base_url(); ?>attendance" class="dropdown-item"><i class=" ri-time-line align-middle mr-1"></i> Attendance</a>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-payslip"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-secure-payment-line align-middle mr-1"></i> PaySlip <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-payslip">
<a href="<?php echo base_url(); ?>monthlypay" class="dropdown-item">Monthly Pay Information </a>
<a href="<?php echo base_url(); ?>ViewPay" class="dropdown-item">PaySlip Generator</a>
<!-- <a href="<?php echo base_url(); ?>PaysilpListing" class="dropdown-item">Edit Payslip</a> -->
<a href="<?php echo base_url(); ?>emppayListings" class="dropdown-item">Employee Loan Details</a>
</div>
</div>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-leave"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-calendar-times align-middle mr-1"></i> Leave <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-leave">
<a href="<?php echo base_url(); ?>publicholidays" class="dropdown-item">Public Holidays</a>
<a href="<?php echo base_url(); ?>leavereports" class="dropdown-item"> Reports</a>
</div>
</div>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-database-2-line align-middle mr-1"></i> OTHERS <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-others">
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-master"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-master">
<a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a>
<a href="<?php echo base_url(); ?>transporterListing" class="dropdown-item">Transporter Details</a>
<a href="<?php echo base_url(); ?>costListing" class="dropdown-item">Cost Details</a>
<a href="<?php echo base_url(); ?>assetListing" class="dropdown-item">Asset Details</a>
<a href="<?php echo base_url(); ?>companyview" class="dropdown-item">Business Settings</a>
<a href="<?php echo base_url(); ?>configlisting" class="dropdown-item">Config Details</a>
<a href="<?php echo base_url(); ?>departmentListing" class="dropdown-item">Department Details</a>
<a href="<?php echo base_url(); ?>rawmaterialListing" class="dropdown-item">Material Details</a>
<a href="<?php echo base_url(); ?>userListing" class="dropdown-item">Users</a>
</div>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-align-justify align-middle mr-1"></i> Purchase order <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-po">
<a href="<?php echo base_url(); ?>purchaseorderListing" class="dropdown-item">Purchase Order List</a>
<a href="<?php echo base_url(); ?>PORelease" class="dropdown-item">Approve Purchase Order</a>
<a href="<?php echo base_url(); ?>EmergencyPO" class="dropdown-item">Emergency Purchase Order </a>
<a href="<?php echo base_url(); ?>Report_pending_purchase" class="dropdown-item">Pending Purchase Order </a>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
</div>
</div>
</li>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-inward"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-task-line align-middle mr-1"></i> Inward <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-inward">
<a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item">Inward Gate Register Entry</a>
<a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item">View Inward Gate Register</a>
</div>
</div>
<div class="dropdown">
<a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i> Non IGR / Expense</a>
</div>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"
aria-expanded="false">
<i class="ri-keyboard-line mr-1"></i> REPORT LISTS
</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-hr" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-contacts-book-line mr-1"></i> HR <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-hr">
<a href="<?php echo base_url(); ?>employeeListing" class="dropdown-item"><i class="ri-shield-user-line align-middle mr-1"></i> Employee Details</a>
<a href="<?php echo base_url(); ?>attendance" class="dropdown-item"><i class=" ri-time-line align-middle mr-1"></i> Attendance</a>
</ul> <!-- end navbar-->
</div> <!-- end .collapsed-->
</nav>
</div> <!-- end container-fluid -->
</div> <!-- end topnav-->
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-payslip"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-secure-payment-line align-middle mr-1"></i> PaySlip <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-payslip">
<a href="<?php echo base_url(); ?>monthlypay" class="dropdown-item">Monthly Pay Information </a>
<a href="<?php echo base_url(); ?>ViewPay" class="dropdown-item">PaySlip Generator</a>
<!-- <a href="<?php echo base_url(); ?>PaysilpListing" class="dropdown-item">Edit Payslip</a> -->
<a href="<?php echo base_url(); ?>emppayListings" class="dropdown-item">Employee Loan Details</a>
<!-- ============================================================== -->
<!-- Start Page Content here -->
<!-- ============================================================== -->
</div>
</div>
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-leave"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-calendar-times align-middle mr-1"></i> Leave <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-leave">
<a href="<?php echo base_url(); ?>publicholidays" class="dropdown-item">Public Holidays</a>
<a href="<?php echo base_url(); ?>leavereports" class="dropdown-item"> Reports</a>
</div>
</div>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-database-2-line align-middle mr-1"></i> OTHERS <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-others">
<div class="dropdown">
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-master"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
</a>
<div class="dropdown-menu" aria-labelledby="topnav-master">
<!-- <a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a> -->
<a href="<?php echo base_url(); ?>transporterListing" class="dropdown-item">Transporter Details</a>
<a href="<?php echo base_url(); ?>costListing" class="dropdown-item">Cost Details</a>
<a href="<?php echo base_url(); ?>assetListing" class="dropdown-item">Asset Details</a>
<a href="<?php echo base_url(); ?>companyview" class="dropdown-item">Business Settings</a>
<a href="<?php echo base_url(); ?>configlisting" class="dropdown-item">Config Details</a>
<a href="<?php echo base_url(); ?>departmentListing" class="dropdown-item">Department Details</a>
<!-- <a href="<?php echo base_url(); ?>rawmaterialListing" class="dropdown-item">Material Details</a> -->
<a href="<?php echo base_url(); ?>userListing" class="dropdown-item">Users</a>
</div>
</div>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>supplierlisting" role="button" aria-expanded="false">
<i class="fas fa-truck mr-1" style="color: gray;"></i>Supplier
</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>rawmaterialListing" role="button" aria-expanded="false">
<i class="fas fa-cubes mr-1"></i>Material
</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"
aria-expanded="false">
<i class="ri-keyboard-line mr-1"></i> REPORT LISTS
</a>
</li>
</ul> <!-- end navbar-->
</div> <!-- end .collapsed-->
</nav>
</div> <!-- end container-fluid -->
</div> <!-- end topnav-->
<!-- ============================================================== -->
<!-- Start Page Content here -->
<!-- ============================================================== -->

2
app/Views/publicholidays.php
View File

@ -93,7 +93,7 @@
</table>
<p>&nbsp;</p>
<div class="row">
<div class="col-md-4" id="savebutton">
<div class="col-md-12 text-right" id="savebutton">
<input type="button" id="submit" value="Save" class="btn btn-success">
</div>
</div>