CHANGE_ALL_TABLE_CHECK
This commit is contained in:
parent
36ebd20d67
commit
9f7e028e41
@ -19,7 +19,8 @@ class Assetdetails_model extends Model
|
||||
$builder = $this->db->table('t_asset_details asd')
|
||||
->select('asd.*,dep.DepartmentName,sup.SupplierName')
|
||||
->join('t_departmentdetails dep', ' dep.DEPCode = asd.DEPCode', 'left')
|
||||
->join('t_supplierdetailsn sup', 'sup.SupplierID = asd.SupplierCode', 'left');
|
||||
->join('t_supplierdetailsn sup', 'sup.SupplierID = asd.SupplierCode', 'left')
|
||||
->orderBy('asd.CreatedDt', 'desc');
|
||||
|
||||
$query = $builder->get();
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ class Costcenter_model extends Model
|
||||
$builder = $this->db->table('t_costcenter_master as Cost')
|
||||
->select('Cost.id as id, Cost.CostCenterCode as code,Cost.CostCenterName as CostCenterName , Cost.ApprovedBy as ApprovedBy,Emp.FirstName as FirstName,Emp.Designation as Designation ,Cost.CreatedDate,Cost.IsActive,Cost.DeletedBy,Cost.DeletedBy')
|
||||
|
||||
->join('t_employee_details as Emp', 'Emp.EmpID=Cost.ApprovedBy');
|
||||
|
||||
->join('t_employee_details as Emp', 'Emp.EmpID=Cost.ApprovedBy')
|
||||
->orderBy('Cost.CreatedDate', 'desc');
|
||||
|
||||
$query =$builder->get();
|
||||
$result = $query->getResult();
|
||||
|
||||
@ -405,7 +405,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
|
||||
$builder->where('POMast.Status !=', PO_AMENDED);
|
||||
// $builder->orderBy('POMast.Status !=',PO_AMENDED);
|
||||
}
|
||||
$builder->orderBy('POMast.POID', 'desc');
|
||||
$builder->orderBy('POMast.PODate', 'desc');
|
||||
$query = $builder->get();
|
||||
|
||||
$result = $query->getResult();
|
||||
|
||||
@ -20,7 +20,7 @@ class Rawmaterialdetails_model extends Model
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('*')
|
||||
->where('IsActive', 1)
|
||||
->orderBy('CreatedDate','DESC');
|
||||
->orderBy('CreatedDate','desc');
|
||||
$query = $builder->get();
|
||||
$result = $query->getResult();
|
||||
return $result;
|
||||
|
||||
@ -90,15 +90,22 @@ class Requistion_model extends Model
|
||||
/* This function is used to get the Raw Material information
|
||||
* @return array $result : This is result of the query
|
||||
*/
|
||||
function getRequistionList($ReqNo,$IsArray='')
|
||||
function getRequistionList($ReqNo, $IsArray = '')
|
||||
{
|
||||
$result = $this->db->query("CALL P_GET_AllREQUISTION('".$ReqNo."')");
|
||||
// $result = $this->db-> query("CALL P_GET_AllREQUISTION('".$ReqNo."')") or die(mysql_error());
|
||||
if (!$result){return [];}
|
||||
|
||||
if($IsArray != ''){return $result->getResultArray();}
|
||||
else{return $result->getResult();}
|
||||
$result = $this->db->query("CALL P_GET_AllREQUISTION('".$ReqNo."')");
|
||||
if (!$result) {
|
||||
return [];
|
||||
}
|
||||
|
||||
if ($IsArray != '') {
|
||||
$data = $result->getResultArray(); // Fetch as an array
|
||||
return array_reverse($data); // Reverse the array and return
|
||||
} else {
|
||||
$data = $result->getResult(); // Fetch as an object array
|
||||
return array_reverse($data); // Reverse the array and return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This function is used to get Employee details based on Employee ID Selection
|
||||
|
||||
@ -19,7 +19,8 @@ class Supplier_model extends Model
|
||||
|
||||
$builder = $this->db->table('t_supplierdetailsn as BaseT')
|
||||
->select('BaseT.SupplierID, BaseT.SupplierName, BaseT.Address, BaseT.ContactNumber, BaseT.AlternateContactNumber,BaseT.EmailAddress,BaseT.Exiseregistration, BaseT.TIN, BaseT.PAN,,BaseT.GSTNO,BaseT.GSTRange,BaseT.CollectrateAddress,BaseT.UANumber,BaseT.CreatedOn,BaseT.PaymentID,pmt.PaymentTerms,BaseT.CSTDate,BaseT.IsActive') //,BaseT.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT,pmt.Details');
|
||||
->join('t_paymentterms as pmt', 'pmt.PaymentID = BaseT.PaymentID', 'left');
|
||||
->join('t_paymentterms as pmt', 'pmt.PaymentID = BaseT.PaymentID', 'left')
|
||||
->orderBy('BaseT.CreatedOn', 'desc'); // Adjust this column as needed
|
||||
|
||||
$query = $builder->get();
|
||||
|
||||
@ -173,7 +174,9 @@ class Supplier_model extends Model
|
||||
$builder = $this->db->table('t_transporter as t')
|
||||
->select('t.id,t.name,t_employee_details.FirstName as FirstName,t.created_on,t.isactive')
|
||||
->join('tbl_users', 'tbl_users.userId = t.created_by')
|
||||
->join('t_employee_details', 't_employee_details.EmpID=tbl_users.EmpID');
|
||||
->join('t_employee_details', 't_employee_details.EmpID=tbl_users.EmpID')
|
||||
->orderBy('t.created_on', 'desc');
|
||||
|
||||
$query =$builder->get();
|
||||
$result = $query->getResult();
|
||||
// echo $this->db->getLastQuery()->getQuery();die;
|
||||
|
||||
@ -23,6 +23,7 @@ class User_model extends Model
|
||||
->join('t_departmentdetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
|
||||
->join('tbl_users user', 'user.EmpID = EMP.EmpID')
|
||||
->join('tbl_roles role', 'user.roleId = role.roleId')
|
||||
->orderBy('user.createdDtm', 'desc')
|
||||
->where('user.isDeleted !=', 1);
|
||||
|
||||
$query = $builder->get();
|
||||
|
||||
@ -204,7 +204,7 @@ $(document).ready(function() {
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -214,7 +214,7 @@ $(document).ready(function() {
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -167,10 +167,10 @@
|
||||
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
|
||||
<div class="error" id="error"></div> -->
|
||||
</form>
|
||||
<table id="cc" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
|
||||
<table id="cc" class="table table-bordered table-hover" style="background-color:#fff;">
|
||||
|
||||
<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
|
||||
<thead style="background-color: #ddd;">
|
||||
<thead >
|
||||
<tr>
|
||||
<th style="text-align:center" >PO Date</th>
|
||||
<th style="text-align:center">PO No</th>
|
||||
|
||||
@ -5377,8 +5377,8 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
|
||||
<div class="box-body">
|
||||
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
|
||||
<thead style="background-color: #ddd;">
|
||||
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;">
|
||||
<thead >
|
||||
<tr>
|
||||
<th>SNo</th>
|
||||
<th>Requisition No</th>
|
||||
|
||||
@ -70,8 +70,8 @@
|
||||
</form>
|
||||
<div class="card-body">
|
||||
|
||||
<table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;">
|
||||
<thead style="background-color: #ddd;">
|
||||
<table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;">
|
||||
<thead >
|
||||
<tr>
|
||||
<th>Created Date</th>
|
||||
<th>Asset Code</th>
|
||||
@ -164,7 +164,7 @@ $(document).ready(function() {
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -184,9 +184,7 @@
|
||||
[10, 20, 30, 50, "All"]
|
||||
], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [
|
||||
[0, 'desc']
|
||||
], // Default ordering (column index 0, descending)
|
||||
order: [ ], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
<div class="card-body">
|
||||
|
||||
<table id="cost_listing" class="table dt-responsive nowrap w-100">
|
||||
<thead style="background-color: #ddd;">
|
||||
<thead >
|
||||
<tr>
|
||||
<th>Create Date</th>
|
||||
<th>Create Time</th>
|
||||
@ -227,9 +227,7 @@
|
||||
[10, 20, 30, 50, "All"]
|
||||
], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [
|
||||
[0, 'desc']
|
||||
], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -165,7 +165,7 @@
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -115,8 +115,8 @@
|
||||
</form>
|
||||
<div class="card-body">
|
||||
|
||||
<table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
|
||||
<thead style="background-color: #ddd;">
|
||||
<table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Created Date</th>
|
||||
<th >Emp ID</th>
|
||||
@ -197,7 +197,7 @@
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -81,8 +81,8 @@
|
||||
<div class="error" id="error"></div>
|
||||
</form>
|
||||
<div class="card-body">
|
||||
<table class="table table-bordered table-hover" id="expense_list_table" style="background-color:#fff;font-size:12px;">
|
||||
<thead style="background-color: #ddd;">
|
||||
<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">Expense Id</th> -->
|
||||
|
||||
@ -521,7 +521,7 @@ $(document).ready(function() {
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -172,7 +172,7 @@
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -218,7 +218,7 @@ $(document).ready(function() {
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -194,7 +194,7 @@
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -260,9 +260,7 @@
|
||||
[10, 20, 30, 50, "All"]
|
||||
], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [
|
||||
[0, 'desc']
|
||||
], // Default ordering (column index 0, descending)
|
||||
order: [ ], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
@ -194,7 +194,7 @@ $(document).ready(function() {
|
||||
pageLength: 10, // Default rows per page
|
||||
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
|
||||
responsive: true, // Responsive table
|
||||
order: [[0, 'desc']], // Default ordering (column index 0, descending)
|
||||
order: [], // Default ordering (column index 0, descending)
|
||||
language: {
|
||||
paginate: {
|
||||
next: '<i class="fas fa-angle-right"></i>', // Next button icon
|
||||
|
||||
Loading…
Reference in New Issue
Block a user