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

FIX_model table Replacement and IGR Module changes phase 1

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-07-25 06:35:43 +00:00
parent 02fe9d39ab
commit 2519bd8fd6
42 changed files with 2825 additions and 3263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Config/Routes.php
View File

@ -250,9 +250,9 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditStoreRequisition', 'Storere
// Application IGR Routes
$routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working
$routes->post('ViewIGR', 'Inwardgateregister::viewIGR');
$routes->get('ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working
$routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails');
$routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); // ADD IGR page - Working
$routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails');
$routes->post('deleteBillFile', 'Inwardgateregister::deleteBillFile');
@ -276,7 +276,6 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditOGR', 'Inwardgateregister::
// Application MRIR Routes
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditMRIR', 'MRIRcontroller::editmaterialinspectionreport');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewMRIR', 'MRIRcontroller::viewmaterialinspectionreport');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Viewigr', 'MRIRcontroller::viewinwardgateregister');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'Distribution', 'MRIRcontroller::viewmMaterialDistributionList');
// Application Store Routes

4
app/Controllers/Cashbook.php
View File

@ -1826,7 +1826,7 @@ class Cashbook extends BaseController
$Amount = $_GET['amount']; //paid amount
$igrno = $_GET['igrno'];
$balancetoclear = $_GET['balancetoclear'];
//for T_Bankreport IsActive//
//for t_bankreport IsActive//
$bankdebit = $_GET['debit'];
$mapped = $Amount + $balancetoclear;
@ -1902,7 +1902,7 @@ class Cashbook extends BaseController
//update Isactive field in T_Bankreport //////
//update Isactive field in t_bankreport //////
$mapped = $balancetoreceived + $amountreceived;
// if($credit==$mapped)
// {

2
app/Controllers/Emergencypurchaseorder.php
View File

@ -193,7 +193,7 @@ class Emergencypurchaseorder extends BaseController
$ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
$DescriptionOfPo = $this->request->getPost('emergdescofpo');
//create T_Requestion_Master
//create t_requestion_master
$Request = array('ReqType' => $POType, 'RequestedDept' => $RequestedBy, 'CostCenterCode' => $CostCenterName, 'Status' => $ReqStatus, 'Comments' => $RequistionComments, 'ReqDate' => $createddt, 'CreatedDate' => $createddt, 'CreatedBy' => $CreateBy, 'Schedule_Type' => $ServiceScheduleType, 'NumberOfService' => $ServiceServiceNo, 'Service_Period' => $ServiceScheduleOptions);
$Req = $this->requistion_model->addRequisition($Request);

242
app/Controllers/Inwardgateregister.php
View File

@ -45,17 +45,18 @@ class Inwardgateregister extends BaseController
}
function viewIGRDetails()
function viewIGR()
{
$this->global['pageTitle'] = 'Inward Gate Register Details';
$data['IGR'] = $this->inwardgateregister_model->igrListing();
$this->loadViews("viewIGRDetails", $this->global, $data, NULL);
$this->global['pageTitle'] = 'View Inward Gate Register';
$data['IGR'] = $this->inwardgateregister_model->ViewigrListing();
$this->loadViews("viewinwardgateregister", $this->global, $data, NULL);
// $this->global['pageTitle'] = 'Inward Gate Register Details';
// $data['IGR'] = $this->inwardgateregister_model->igrListing();
// $this->loadViews("viewIGRDetails", $this->global, $data, NULL);
}
function addinwardgateregister()
function addIGR()
{
$this->inwardgateregister_model = new inwardgateregister_model();
@ -193,7 +194,7 @@ class Inwardgateregister extends BaseController
function IGRITEM()
function getIGRLineItemDetails()
{
@ -210,7 +211,7 @@ class Inwardgateregister extends BaseController
function addloadfile()
{
$upfiles = '';
$lastinsertbillid = 0;
$pono = $this->request->getPost('PONO');
@ -245,20 +246,32 @@ class Inwardgateregister extends BaseController
$myfiles = array('PONO' => $pono, 'IGRNO' => $igr, 'FilePath' => $Picture);
$upfiles = $this->inwardgateregister_model->fileupload($myfiles);
//print_r($upfiles);
$lastinsertbillid = $this->inwardgateregister_model->fileupload($myfiles);
}
}
//echo 'filename'.$upfiles;
if ($upfiles > 0) {
echo "file updated successfully!";
if ($lastinsertbillid > 0) {
echo "File updated Successfully!-".$lastinsertbillid;
} else {
echo "File name already Exist";
}
}
function deleteBillFile(){
$deleteBillFile = '';
$Billno = $this->request->getPost('Billno');
$deleteBillFile = $this->inwardgateregister_model->deleteBillFile($Billno);
if ($deleteBillFile) {
echo "file deleted successfully!";
} else {
echo "file details not exist to delete";
}
}
function edituploadfile()
{
@ -548,203 +561,18 @@ echo "<script>
}
function addNewigr1()
{
#Step 1 IGR Details
$PONO = $this->request->getPost('PONO');
$DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo');
$DeliveryChellan = (string)$this->request->getPost('InvoiceDate');
$DeliveryChellanDate = get_date_time_format($DeliveryChellan);
$Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate');
$MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt);
$VehicleNo = $this->request->getPost('VehicleNo');
$DriverName = $this->request->getPost('DriverName');
$DriverMobileNumber = $this->request->getPost('DriverMobileNumber');
$CreatedBy = $this->session->get('userId');
$RowCount = $this->request->getPost('txtRowCount');
$createddt = get_current_date_time();
$IGRStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT;
$document = null;
$igr = array(); // For IGR Master
$paymentstatus = NO_PAIDIGR;
$constant = $this->request->getPost('hideconstants');
$arr = []; // For File to Save
$prefile = array();
$fileupdated_count = 0;
$fileupdated_name = [];
$igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus);
//Saving IGR details Here
$IGRNO = $this->inwardgateregister_model->addigrM($igr);
if($IGRNO){
#Step 2 File Details Gathering
if($constant){
for ($i = 1; $i <= $constant; $i++) {
$pathname = 'browseFiles' . $i;
$file = $this->request->getFile($pathname);
if ($file && $file->isValid()) {
$requestfilename = $file->getName();
if (!empty($requestfilename)) {
$files = str_replace(" ", "", $_FILES[$pathname]['name']);
$fcount = 0;
foreach ($prefile as $value) {
if ($value == $files) { $fcount++; }
}
if ($fcount == 0) {
if ($file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH.'public/uploads/Igrfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
$Picture = $file->getName();
$file->move($path,$Picture);
log_message('error', "File new" . $i . " uploaded successfully. File name: " . $requestfilename);
}
$arr[] = array($Picture);
}
$prefile[] = $files;
}
function viewIGRDetails()
{
} else {
log_message('error', "No file uploaded for new" . $i . " or there was an error uploading the file.");
}
}
#Step 2.1 Saving File Details
if (!empty($arr)) {
foreach ($arr as $ma) {
$index = 0;
foreach ($ma as $key => $value) {
$index++;
if ($index == 1) {
$filename = $value;
}
}
if (!empty($filename)) {
$myfile = array('FilePath' => $filename, 'PONO' => $PONO, 'IGRNO' => $IGRNO);
$fileupdated = $this->inwardgateregister_model->fileupload($myfile);
if ($fileupdated) {
$fileupdated_count++;
$fileupdated_name[] = $filename;
}
}
}
}
}
#Step 3 Updating OGR Details
$OGRStatus = $IGRStatus;
$check_OGRPO = $this->inwardgateregister_model->update_OGR($PONO, $OGRStatus);
// echo "step3";
// echo "uuu".(int)$check_OGRPO;
$IGRItemStatus = REQITEM_NEW;
$TotalPendingQty = '';
$TotalPendingQty = (int)$TotalPendingQty;
// echo "step4";
#Step 4 To Update the Date PO MASTER , Material Master , Historydetails and IGR line Item Details Updating OGR Details
for ($i = 1; $i <= (int)$RowCount; $i++) {
$MaterialCode = $this->request->getPost('MaterialCode' . $i);
$MaterialCode = $MaterialCode !== null && is_string($MaterialCode) ? trim($MaterialCode) : null;
$QuantityAsPerInvoice = $this->request->getPost('txtQuantityAsPerInvoice' . $i);
$QuantityAsPerInvoice = $QuantityAsPerInvoice !== null && is_string($QuantityAsPerInvoice) ? trim($QuantityAsPerInvoice) : null;
$OrderedQuantity = $this->request->getPost('OrderedQuantity' . $i);
$OrderedQuantity = $OrderedQuantity !== null && is_string($OrderedQuantity) ? trim($OrderedQuantity) : null;
$ReceivedQty = $this->request->getPost('txtReceivedQuantity' . $i);
$ReceivedQty = $ReceivedQty !== null && is_string($ReceivedQty) ? trim($ReceivedQty) : null;
$PendingQty = $this->request->getPost('txtPendingQty' . $i);
$TotalPendingQty = $TotalPendingQty + $PendingQty;
if (strlen($QuantityAsPerInvoice) > 0 && $QuantityAsPerInvoice != '0') {
$Remarks = $this->request->getPost('txtRemarks' . $i);
$ItemStatus = '';
if ($PendingQty == 0.00) {
$ItemStatus = $IGRStatus;
} else {
$ItemStatus = POLINEITEM_IGRPARTIAL_CREATED;
}
$CreatedBy = $this->session->get('userId');
$igrDetails = array('IGRNO' => $IGRNO, 'MaterialCode' => $MaterialCode, 'QuantityAsPerInvoice' => $QuantityAsPerInvoice, 'Remarks' => $Remarks, 'IGRItemStatus' => $IGRItemStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt);
$igrD = $this->inwardgateregister_model->addigrD($igrDetails);
$igrlineno = !empty($igrD) ? $igrD : '';
$itemvalue = '';
$SupplierId = '';
$polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO, $MaterialCode);
foreach ($polineitemvalue as $it) {
$itemvalue = $it->Rate;
$SupplierId = $it->SupplierID;
}
$historydetails = array('MaterialCode' => $MaterialCode, 'Transaction_type' => "Add", 'Ref_Type' => "IGR", 'Ref_No' => $igrlineno, 'Quantity' => $QuantityAsPerInvoice, 'CreatedBy' => $CreatedBy, 'CreatedOn' => $createddt, 'SupplierID' => $SupplierId, 'ItemValue' => $itemvalue);
$this->inwardgateregister_model->addmaterialhistory($historydetails);
$get_pre_qty = $this->inwardgateregister_model->get_CurrentQty($MaterialCode);
$av_qty = 0;
if (!empty($get_pre_qty)) {
foreach ($get_pre_qty as $gt) {
$av_qty = $gt->Current_stock;
}
}
$currentav_qty = $QuantityAsPerInvoice + $av_qty;
$current_qty = array('Current_stock' => $currentav_qty);
$this->inwardgateregister_model->addmaterialmaster($current_qty, $MaterialCode);
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO, $MaterialCode);
$ReceivedQuantity = 0.00;
if (count($Recqty) > 0) {
foreach ($Recqty as $key) {
$ReceivedQuantity = $key->ReceivedQuantity;
}
}
$totalReceivedqty = $ReceivedQuantity + $QuantityAsPerInvoice;
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt);
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONO, $MaterialCode);
}
}
$this->inwardgateregister_model->UpdatePOMaster($PONO, $CreatedBy);
#Step 6 Updating Pending Quantity IN PO Master amd Line Item Details.
if ($TotalPendingQty == 0.00) {
$Newstatus = array('Status' => $IGRStatus);
$this->inwardgateregister_model->POLineItemsupdatestatus($PONO, $Newstatus);
$this->inwardgateregister_model->pomasterupdatestatus($PONO, $Newstatus);
} else {
/*echo 'error' ;*/
}
#finally
$finalstatement = "Successfully Created IGR Number: $IGRNO \n";
if ($fileupdated_count > 0) {
$finalstatement .= "Number of files updated: $fileupdated_count \n";
$finalstatement .= "Files: \n " . implode('\n ', $fileupdated_name);
} else {
$finalstatement .= "No files to update";
}
} else {
$finalstatement = 'No data available to process IGR.';
}
$IGRNO = $this->request->getPost('id');
// Escape newlines and quotes for the JavaScript alert
$finalstatement = json_encode($finalstatement);
echo "<script>
alert('$finalstatement');
window.location.href='viewIGRDetails';
</script>";
$data = $this->inwardgateregister_model->viewigr($IGRNO);
// echo $IGRNO;
// print_r($data);die;
echo json_encode($data);
}
function ViewIGR()
{
$IGRNO = $this->request->getPost('id');
$data = $this->inwardgateregister_model->viewigr($IGRNO);
// echo $IGRNO;
// print_r($data);die;
echo json_encode($data);
}
function ViewIGRfile()
{
$IGRNO = $this->request->getPost('id');

15
app/Controllers/MRIRcontroller.php
View File

@ -144,21 +144,6 @@ class MRIRcontroller extends BaseController
$this->loadViews("materialinspectionreport", $this->global, $data, NULL);
}
/** Admin Login View IGR ... to Create the MRIR..... */
function viewinwardgateregister()
{
$this->global['pageTitle'] = 'View Inward Gate Register';
$data['IGR'] = $this->mrir_model->ViewigrListing();
$this->loadViews("viewinwardgateregister", $this->global, $data, NULL);
}
/* For View MRIR Screen (view folder - view page)*/
function viewmaterialinspectionreport()

4
app/Controllers/Payslip.php
View File

@ -578,7 +578,7 @@ class Payslip extends BaseController
$PF_Rate = $value->PF_Rate;
$ESI_Rate = $value->ESI_Rate;
$MonthIncentive = $value->MonthlyIncentives; //T_Monthly_Pay_Inputs,for change month
$MonthIncentive = $value->MonthlyIncentives; //t_monthly_pay_inputs,for change month
$Incentive = 0;
@ -734,7 +734,7 @@ class Payslip extends BaseController
$PF_Rate = $value->PF_Rate;
$ESI_Rate = $value->ESI_Rate;
$MonthIncentive = $value->MonthlyIncentives; //T_Monthly_Pay_Inputs,for change month
$MonthIncentive = $value->MonthlyIncentives; //t_monthly_pay_inputs,for change month
$Incentive = 0;

2
app/Controllers/Resinbatchcard.php
View File

@ -57,7 +57,7 @@ class Resinbatchcard extends BaseController
{
$igrno = $this->request->getPost('param1');
$sql = 'select IGRItemNo from T_IGR_Details where IGRNO = ?';
$sql = 'select IGRItemNo from t_igr_details where IGRNO = ?';
$res = $db->query($sql, array($igrno));
echo json_encode($res->result());
}

2
app/Controllers/User.php
View File

@ -98,7 +98,7 @@ class User extends BaseController
$data['capitalbud'] = $this->dahsboard_Model->capitalbud();
$data['typebal'] = $this->dahsboard_Model->typebal();
$data['typebal'] = [];// $this->dahsboard_Model->typebal();
/* HR DASHBOARD Controller Start*/

122
app/Models/Assetdetails_model.php
View File

@ -16,10 +16,10 @@ class Assetdetails_model extends Model
*/
function assetListing()
{
$builder = $this->db->table('T_Asset_Details asd')
$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_departmentdetails dep', ' dep.DEPCode = asd.DEPCode', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID = asd.SupplierCode', 'left');
$query = $builder->get();
@ -30,7 +30,7 @@ class Assetdetails_model extends Model
function getDepartment($Department = '')
{
$builder = $this->db->table('T_DepartmentDetails')
$builder = $this->db->table('t_departmentdetails')
->select('DEPCode,DepartmentName')
->where('IsActive', 1);
if ($Department != '') {
@ -43,7 +43,7 @@ class Assetdetails_model extends Model
function getSupplierName($SupplierID = '')
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierID, SupplierName')
->where('IsActive', 1);
if ($SupplierID != '') {
@ -56,11 +56,11 @@ class Assetdetails_model extends Model
function getpodetails($PO)
{
$builder = $this->db->table('T_PurchaseOrder_Master POM')
$builder = $this->db->table('t_purchaseorder_master POM')
->distinct()
->select('POM.PONO,POM.SupplierID,POL.MaterialCode,DeliveryDate,PODate,sup.SupplierName,POL.LineItemNo')
->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID')
->join('t_purchaseorder_lineitem POL', 'POL.PONO = POM.PONO')
->join('t_supplierdetailsn sup', 'sup.SupplierID = POM.SupplierID')
->where('POM.status', MRIR_APPROVED);
if (!empty($PO)) {
$builder->where('POM.PONO', $PO);
@ -71,11 +71,11 @@ class Assetdetails_model extends Model
}
function getPO($PO = '')
{
$builder = $this->db->table('T_PurchaseOrder_Master POM')
$builder = $this->db->table('t_purchaseorder_master POM')
->distinct()
->select(' POM.PONO'); //,DeliveryDate,PODate,sup.SupplierName,POM.SupplierID');
//->join ('T_PurchaseOrder_LineItem POL ',' POL.PONO = POM.PONO');
//->join ('T_SupplierDetailsN sup ',' sup.SupplierID = POM.SupplierID');
//->join ('t_purchaseorder_lineitem POL ',' POL.PONO = POM.PONO');
//->join ('t_supplierdetailsn sup ',' sup.SupplierID = POM.SupplierID');
$builder->where('POM.status', MRIR_APPROVED);
if (!empty($PO)) {
$builder->where('POM.PONO', $PO);
@ -86,15 +86,15 @@ class Assetdetails_model extends Model
}
function getlineitemre($line)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem POL')
$builder = $this->db->table('t_purchaseorder_lineitem POL')
->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID')
->join('T_Requestion_Master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('T_PurchaseOrder_Master POM', 'POM.PONO=POL.PONO', 'left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('T_Employee_Details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('T_DepartmentDetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('T_Revenue_Tax re', 're.LineItemNo = POL.LineItemNo', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID', 'left')
->join('t_requestion_master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left')
->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('t_employee_details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('t_departmentdetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('t_revenue_tax re', 're.LineItemNo = POL.LineItemNo', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID = POM.SupplierID', 'left')
->where('POL.LineItemNo', $line);
$query = $builder->get();
@ -105,15 +105,15 @@ class Assetdetails_model extends Model
function getlineitemser($line)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem POL')
$builder = $this->db->table('t_purchaseorder_lineitem POL')
->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID')
->join('T_Requestion_Master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('T_PurchaseOrder_Master POM', 'POM.PONO=POL.PONO', 'left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('T_Employee_Details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('T_DepartmentDetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('T_Service_Tax ser', 'ser.LineItemNo = POL.LineItemNo', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID', 'left')
->join('t_requestion_master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left')
->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('t_employee_details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('t_departmentdetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('t_service_tax ser', 'ser.LineItemNo = POL.LineItemNo', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID = POM.SupplierID', 'left')
->where('POL.LineItemNo', $line);
$query = $builder->get();
@ -123,15 +123,15 @@ class Assetdetails_model extends Model
}
function getlineitemimport($line)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem POL')
$builder = $this->db->table('t_purchaseorder_lineitem POL')
->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID')
->join('T_Requestion_Master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('T_PurchaseOrder_Master POM', 'POM.PONO=POL.PONO', 'left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('T_Employee_Details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('T_DepartmentDetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('T_Import_Tax ser', 'ser.LineItemNo = POL.LineItemNo', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID', 'left')
->join('t_requestion_master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left')
->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('t_employee_details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('t_departmentdetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('t_import_tax ser', 'ser.LineItemNo = POL.LineItemNo', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID = POM.SupplierID', 'left')
->where('POL.LineItemNo', $line);
$query = $builder->get();
@ -142,16 +142,16 @@ class Assetdetails_model extends Model
function getlineitemcap($line)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem POL')
$builder = $this->db->table('t_purchaseorder_lineitem POL')
->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,sum(ser.TotalValue+imp.TotalValue) as TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID')
->join('T_Requestion_Master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('T_PurchaseOrder_Master POM', 'POM.PONO=POL.PONO', 'left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('T_Employee_Details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('T_DepartmentDetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('T_Import_Tax imp', 'imp.LineItemNo = POL.LineItemNo', 'left')
->join('T_Service_Tax ser', 'ser.LineItemNo = POL.LineItemNo', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID', 'left')
->join('t_requestion_master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left')
->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')
->join('t_employee_details emp', 'emp.EmpID = req.Requestedby', 'left')
->join('t_departmentdetails dep', 'dep.DEPCode = emp.Departmentcode', 'left')
->join('t_import_tax imp', 'imp.LineItemNo = POL.LineItemNo', 'left')
->join('t_service_tax ser', 'ser.LineItemNo = POL.LineItemNo', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID = POM.SupplierID', 'left')
->where('POL.LineItemNo', $line);
$query = $builder->get();
@ -161,9 +161,9 @@ class Assetdetails_model extends Model
}
function gettyp($type)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem POL')
$builder = $this->db->table('t_purchaseorder_lineitem POL')
->select('POM.POType,POL.LineItemNo')
->join('T_PurchaseOrder_Master POM', 'POM.PONO=POL.PONO')
->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO')
->where('POL.LineItemNo', $type);
$query = $builder->get();
@ -176,7 +176,7 @@ class Assetdetails_model extends Model
*/
function getConfigValue($ConfigID, $ConfigValue = '')
{
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('ConfigValue')
->where('Config_id ', $ConfigID);
if ($ConfigValue != '') {
@ -198,7 +198,7 @@ class Assetdetails_model extends Model
$this->db->transBegin();
$this->db->table('T_Asset_Details')->insert($asset);
$this->db->table('t_asset_details')->insert($asset);
$affectedRows = $this->db->affectedRows();
@ -218,13 +218,13 @@ class Assetdetails_model extends Model
*/
function getAssetDetails($Asset_Code)
{
$builder = $this->db->table('T_Asset_Details Asset')
$builder = $this->db->table('t_asset_details Asset')
//echo $Asset_Code;
->select('Asset.*,POM.DeliveryDate,Dep.DepartmentName as DepartmentName,MM.MaterialName,MM.UOM,Supp.SupplierName as SupplierName')
->join('T_DepartmentDetails Dep', 'Asset.DEPCode = Dep.DEPCode', 'left')
->join('T_SupplierDetailsN Supp', 'Asset.SupplierCode = Supp.SupplierID', 'left')
->join('T_MaterialMaster MM ', 'MM.MaterialCode = Asset.MaterialCode', 'left')
->join('T_PurchaseOrder_Master POM', 'POM.PONO = Asset.PONO', 'left')
->join('t_departmentdetails Dep', 'Asset.DEPCode = Dep.DEPCode', 'left')
->join('t_supplierdetailsn Supp', 'Asset.SupplierCode = Supp.SupplierID', 'left')
->join('t_materialmaster MM ', 'MM.MaterialCode = Asset.MaterialCode', 'left')
->join('t_purchaseorder_master POM', 'POM.PONO = Asset.PONO', 'left')
->where('Asset.AssetCode', $Asset_Code);
@ -234,7 +234,7 @@ class Assetdetails_model extends Model
}
function editasset($asset, $Asset_Code)
{
$this->db->table('T_Asset_Details')
$this->db->table('t_asset_details')
->where('AssetCode', $Asset_Code)
->update($asset);
$count = $this->db->affectedRows();
@ -245,7 +245,7 @@ class Assetdetails_model extends Model
function viewasset($asset, $Asset_Code)
{
$this->db->table('T_Asset_Details')
$this->db->table('t_asset_details')
->where('AssetCode', $Asset_Code)
->update($asset);
$count = $this->db->affectedRows();
@ -253,15 +253,15 @@ class Assetdetails_model extends Model
}
function export_excel()
{
$builder = $this->db->table('T_Asset_Details as det')
$builder = $this->db->table('t_asset_details as det')
->select('det.AssetCode,det.AssetName,det.Description,dep.DepartmentName as DEPCode,det.Location,det.PONO,det.POLineItem,MM.MaterialName,det.Quantity,det.UserName,sup.SupplierName,det.DateOfPurchase,det.DateOfCommison,det.AssetValue,det.AssetStatus,det.IsActive,det.Remarks,emp.firstname,emp1.firstname as Updated_By')
->join('tbl_users as tbl', ' det.createdby = tbl.userid', 'left')
->join('T_DepartmentDetails as dep', 'dep.DEPCode=det.DEPCode', 'left')
->join('T_Employee_Details as emp', 'emp.empid=tbl.empid', 'left')
->join('T_SupplierDetailsN as sup', 'sup.SupplierID=det.SupplierCode', 'left')
->join('T_MaterialMaster MM ', 'MM.MaterialCode = det.MaterialCode', 'left')
->join('t_departmentdetails as dep', 'dep.DEPCode=det.DEPCode', 'left')
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
->join('t_supplierdetailsn as sup', 'sup.SupplierID=det.SupplierCode', 'left')
->join('t_materialmaster MM ', 'MM.MaterialCode = det.MaterialCode', 'left')
->join('tbl_users as tbl1', ' det.UpdatedBy = tbl1.userid', 'left')
->join('T_Employee_Details as emp1', 'emp1.empid=tbl1.empid', 'left');
->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid', 'left');
$query = $builder->get();
return $query->getResult();

350
app/Models/Batchcard_model.php
View File

@ -9,20 +9,20 @@ class Batchcard_model extends Model
function getEmplistforReport()
{
$builder = $this->db->table('T_Employee_Details')
->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.Departmentcode,T_DepartmentDetails.shortName')
->join('T_DepartmentDetails', 'T_Employee_Details.Departmentcode=T_DepartmentDetails.DEPCode')
$builder = $this->db->table('t_employee_details')
->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.Departmentcode,t_departmentdetails.shortName')
->join('t_departmentdetails', 't_employee_details.Departmentcode=t_departmentdetails.DEPCode')
//->join('ip_invoice_items','ip_invoices.invoice_number=ip_invoice_items.invoice_number')
//->join('ip_products','ip_invoice_items.item_product_id=ip_products.product_id')
//->join('ip_invoice_custom','ip_invoices.invoice_number=ip_invoice_custom.invoice_number and invoice_custom_fieldid=62')
->orderBy('T_Employee_Details.EmpID');
->orderBy('t_employee_details.EmpID');
$res = $builder->get();
return $res->getResult();
}
function getSupplierlist()
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierName,SupplierID');
$supp = $builder->get();
return $supp->getResult();
@ -30,11 +30,11 @@ class Batchcard_model extends Model
function Rawsupplier()
{
$builder = $this->db->table('T_PurchaseOrder_Master mas')
$builder = $this->db->table('t_purchaseorder_master mas')
->select('mas.SupplierID,sup.SupplierName,mmas.MaterialCode,mmas.MaterialName')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=mas.SupplierID')
->join('T_PurchaseOrder_LineItem line', 'line.PONO=mas.PONO')
->join('T_MaterialMaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->join('t_supplierdetailsn sup', 'sup.SupplierID=mas.SupplierID')
->join('t_purchaseorder_lineitem line', 'line.PONO=mas.PONO')
->join('t_materialmaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->where('Category', 'Raw Material')
->groupBy('SupplierID');
$supp = $builder->get();
@ -43,11 +43,11 @@ class Batchcard_model extends Model
function Consupplier()
{
$builder = $this->db->table('T_PurchaseOrder_Master mas')
$builder = $this->db->table('t_purchaseorder_master mas')
->select('mas.SupplierID,sup.SupplierName')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=mas.SupplierID')
->join('T_PurchaseOrder_LineItem line', 'line.PONO=mas.PONO')
->join('T_MaterialMaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->join('t_supplierdetailsn sup', 'sup.SupplierID=mas.SupplierID')
->join('t_purchaseorder_lineitem line', 'line.PONO=mas.PONO')
->join('t_materialmaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->where('Category', 'Consumables')
->groupBy('SupplierID');
$supp = $builder->get();
@ -56,11 +56,11 @@ class Batchcard_model extends Model
function Pacsupplier()
{
$builder = $this->db->table('T_PurchaseOrder_Master mas')
$builder = $this->db->table('t_purchaseorder_master mas')
->select('mas.SupplierID,sup.SupplierName')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=mas.SupplierID')
->join('T_PurchaseOrder_LineItem line', 'line.PONO=mas.PONO')
->join('T_MaterialMaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->join('t_supplierdetailsn sup', 'sup.SupplierID=mas.SupplierID')
->join('t_purchaseorder_lineitem line', 'line.PONO=mas.PONO')
->join('t_materialmaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->where('Category', 'Packing material')
->groupBy('SupplierID');
$supp = $builder->get();
@ -69,7 +69,7 @@ class Batchcard_model extends Model
function getStockValue()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,stock,stockdate');
$supp = $builder->get();
return $supp->getResult();
@ -104,9 +104,9 @@ class Batchcard_model extends Model
{
//echo "Model".$from.'-'.$to;
$builder = $this->db->table('T_hourly_batch_info')
->select('T_hourly_batch_info.*,T_Employee_Details.FirstName as F,T_Employee_Details.LastName as L')
->select('T_hourly_batch_info.*,t_employee_details.FirstName as F,t_employee_details.LastName as L')
->join('tbl_users', 'T_hourly_batch_info.checkedby=tbl_users.userId')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID');
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID');
if (!empty($hid)) {
$builder->where('hourlyid', $hid);
}
@ -145,9 +145,9 @@ class Batchcard_model extends Model
// ->select('*');
// $builder = $this->db->table('T_daily_batchcard_data');
// ->where('month(ddate)',$month);
$sql = 'select T_daily_batchcard_data.*,T_Employee_Details.FirstName,T_Employee_Details.LastName from T_daily_batchcard_data
$sql = 'select T_daily_batchcard_data.*,t_employee_details.FirstName,t_employee_details.LastName from T_daily_batchcard_data
join tbl_users on T_daily_batchcard_data.createdby = tbl_users.userId
join T_Employee_Details on T_Employee_Details.EmpID = tbl_users.EmpID
join t_employee_details on t_employee_details.EmpID = tbl_users.EmpID
where month(ddate) = ?';
$res = $this->db->query($sql, array($month));
return $res->getResult();
@ -280,8 +280,8 @@ class Batchcard_model extends Model
->select('BMD.*')
->select('CONCAT(ED1.FirstName, " - " , ED1.LastName) AS Approver_Name', FALSE)
->select('CONCAT(ED2.FirstName, " - " , ED2.LastName) AS Worker_Name', FALSE)
->join('T_Employee_Details ED1', 'ED1.EmpID = BMD.Approved_By', 'left')
->join('T_Employee_Details ED2', 'ED2.EmpID = BMD.WorkDone_By', 'left');
->join('t_employee_details ED1', 'ED1.EmpID = BMD.Approved_By', 'left')
->join('t_employee_details ED2', 'ED2.EmpID = BMD.WorkDone_By', 'left');
if ($fdate and $tdate != '') {
@ -329,8 +329,8 @@ class Batchcard_model extends Model
->select("CONCAT(ED1.FirstName, ' - ' , ED1.LastName) AS Approver_Name", FALSE)
->select("CONCAT(ED2.FirstName, ' - ' , ED2.LastName) AS Worker_Name", FALSE)
->join("T_Machine_Master mm", "bm.Machine_Code = mm.Machine_Code", "left")
->join("T_Employee_Details ED1", "bm.Approved_By = ED1.EmpID", "left")
->join("T_Employee_Details ED2", "bm.WorkDone_By = ED2.EmpID", "left")
->join("t_employee_details ED1", "bm.Approved_By = ED1.EmpID", "left")
->join("t_employee_details ED2", "bm.WorkDone_By = ED2.EmpID", "left")
->where("mm.Machines_Category = 'TRP'")
//AND DATE_FORMAT(bm.CreatedOn,'%Y-%m-%d') = '19-04-2018'
->where("DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y')", $date);
@ -349,8 +349,8 @@ class Batchcard_model extends Model
/** Machines History/Master */
function getdept_dtls()
{
$builder = $this->db->table('T_DepartmentDetails')
->select('T_DepartmentDetails.DEPCode,T_DepartmentDetails.shortName')
$builder = $this->db->table('t_departmentdetails')
->select('t_departmentdetails.DEPCode,t_departmentdetails.shortName')
->where('IsActive', 1);
$res = $builder->get();
return $res->getResult();
@ -358,7 +358,7 @@ class Batchcard_model extends Model
function getpono()
{
$builder = $this->db->table('T_PurchaseOrder_Master')
$builder = $this->db->table('t_purchaseorder_master')
->select('PONO')
->where('Status', 'ST026');
$res = $builder->get();
@ -368,15 +368,15 @@ class Batchcard_model extends Model
function getpo_dtls($pono)
{
// ->select('T_PurchaseOrder_Master.PONO,T_PurchaseOrder_Master.SupplierID,T_SupplierDetailsN.SupplierName,DATE_FORMAT(T_PurchaseOrder_Master.PODate,"%d-%m-%Y") as PO_Date');
// $builder = $this->db->table('T_PurchaseOrder_Master');
// ->join('T_SupplierDetailsN','T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID');
// ->select('t_purchaseorder_master.PONO,t_purchaseorder_master.SupplierID,t_supplierdetailsn.SupplierName,DATE_FORMAT(t_purchaseorder_master.PODate,"%d-%m-%Y") as PO_Date');
// $builder = $this->db->table('t_purchaseorder_master');
// ->join('t_supplierdetailsn','t_purchaseorder_master.SupplierID=t_supplierdetailsn.SupplierID');
// ->where('PONO',$pono);
// $res =$builder->get();
// return $res->getResult();
$sql = "select T_PurchaseOrder_Master.PONO,T_PurchaseOrder_Master.SupplierID,T_SupplierDetailsN.SupplierName,DATE_FORMAT(T_PurchaseOrder_Master.PODate,'%d-%m-%Y') as PO_Date
from T_PurchaseOrder_Master
join T_SupplierDetailsN on T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID
$sql = "select t_purchaseorder_master.PONO,t_purchaseorder_master.SupplierID,t_supplierdetailsn.SupplierName,DATE_FORMAT(t_purchaseorder_master.PODate,'%d-%m-%Y') as PO_Date
from t_purchaseorder_master
join t_supplierdetailsn on t_purchaseorder_master.SupplierID=t_supplierdetailsn.SupplierID
where PONO = ? ";
$res = $this->db->query($sql, array($pono));
return $res->getResult();
@ -419,7 +419,7 @@ class Batchcard_model extends Model
function insertvalueintoconfig($config)
{
$builder = $this->db->table('T_ConfigDetails');
$builder = $this->db->table('t_configdetails');
$builder->insert($config);
return TRUE;
}
@ -428,7 +428,7 @@ class Batchcard_model extends Model
function getmachineCategory($MaterialCategory = '')
{
$Config_ID = 'C028';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('Config_ID,ConfigValue')
->where('Config_id', $Config_ID);
if ($MaterialCategory != '') {
@ -530,20 +530,20 @@ class Batchcard_model extends Model
function checkMachineCategory($mc)
{
// $builder = $this->db->table('T_ConfigDetails')
// $builder = $this->db->table('t_configdetails')
// ->select('ConfigValue')
// ->where(Config_ID,'C023')
// ->like('ConfigValue',$mc);
// $query = $builder->get();
// //print_r($query->getResult());
// return $query->getResult();
// $builder = $this->db->table('T_MaterialMaster')
// $builder = $this->db->table('t_materialmaster')
// return $query = $builder->get();
// }
$temp[] = '';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->distinct()->select('ConfigValue')
->where('Config_ID', 'C028')
->like('ConfigValue', $mc);
@ -573,26 +573,26 @@ class Batchcard_model extends Model
{
$builder = $this->db->table('T_Machine_Master')
->select('T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,T_DepartmentDetails.DepartmentName')
->select('T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,t_departmentdetails.DepartmentName')
->select("DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn,'%d-%m-%Y') AS date", FALSE)
->select("DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn,'%l:%i %p') AS time", FALSE)
->select("CONCAT(ED1.FirstName, ' - ' , ED1.LastName) AS Approver_Name", FALSE)
->select("CONCAT(ED2.FirstName, ' - ' , ED2.LastName) AS Worker_Name", FALSE)
->join('T_Batchcard_MaintanceDetails', 'T_Batchcard_MaintanceDetails.Machine_Code=T_Machine_Master.Machine_Code')
->join('T_DepartmentDetails', 'T_DepartmentDetails.DEPCode=T_Machine_Master.Machines_Dept')
->join('T_Employee_Details ED1', 'ED1.EmpID = T_Batchcard_MaintanceDetails.Approved_By', 'left')
->join('T_Employee_Details ED2', 'ED2.EmpID = T_Batchcard_MaintanceDetails.WorkDone_By', 'left')
->join('t_departmentdetails', 't_departmentdetails.DEPCode=T_Machine_Master.Machines_Dept')
->join('t_employee_details ED1', 'ED1.EmpID = T_Batchcard_MaintanceDetails.Approved_By', 'left')
->join('t_employee_details ED2', 'ED2.EmpID = T_Batchcard_MaintanceDetails.WorkDone_By', 'left')
->where('T_Machine_Master.Machine_Code', $MachineCode);
$res = $builder->get();
return $res->getResult();
// $sql = "SELECT T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,
// T_DepartmentDetails.DepartmentName,
// t_departmentdetails.DepartmentName,
// DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn, '%d-%m-%Y') as date,
// DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn, '%l:%i %p') as time,
// FROM T_Machine_Master
// LEFT JOIN T_Batchcard_MaintanceDetails ON T_Batchcard_MaintanceDetails.Machine_Code=T_Machine_Master.Machine_Code
// LEFT JOIN T_DepartmentDetails ON T_DepartmentDetails.DEPCode=T_Machine_Master.Machines_Dept
// LEFT JOIN t_departmentdetails ON t_departmentdetails.DEPCode=T_Machine_Master.Machines_Dept
// WHERE T_Machine_Master.Machine_Code = '".$MachineCode."'" ;
// $res = $this->db->query($sql);
// return $res->getResult();
@ -609,19 +609,19 @@ class Batchcard_model extends Model
function get_consumablematerials()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName')
//->where('T_MaterialMaster.Category',Consumables)
->where('T_MaterialMaster.Category like', '%Consumable%');
//->where('t_materialmaster.Category',Consumables)
->where('t_materialmaster.Category like', '%Consumable%');
$supp = $builder->get();
return $supp->getResult();
}
function get_rawmaterials()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName,')
->where('T_MaterialMaster.Category like', '%Raw Material%');
->where('t_materialmaster.Category like', '%Raw Material%');
$supp = $builder->get();
return $supp->getResult();
@ -629,10 +629,10 @@ class Batchcard_model extends Model
function get_packmaterials()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName')
// ->where('T_MaterialMaster.Category',Packingmaterial);
->where('T_MaterialMaster.Category like', '%Packing%');
// ->where('t_materialmaster.Category',Packingmaterial);
->where('t_materialmaster.Category like', '%Packing%');
$supp = $builder->get();
return $supp->getResult();
}
@ -643,7 +643,7 @@ class Batchcard_model extends Model
$builder = $this->db->table('ip_products')
->select('product_id,product_name,product_description')
->join('ip_families', 'ip_families.family_id=ip_products.family_id')
// ->where('T_MaterialMaster.Category',Packingmaterial);
// ->where('t_materialmaster.Category',Packingmaterial);
->where('ip_families.family_name like', '%Reclam%');
$supp = $builder->get();
return $supp->getResult();
@ -651,9 +651,9 @@ class Batchcard_model extends Model
function getMaterial()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName,');
//->where('T_MaterialMaster.Category',Consumables);
//->where('t_materialmaster.Category',Consumables);
$supp = $builder->get();
return $supp->getResult();
}
@ -681,10 +681,10 @@ class Batchcard_model extends Model
$newdate = $year . '-' . $month . '-' . $nedt;
$subQuery = 'select T_MaterialMaster.MaterialName,T_Material_stock_history.MaterialCode,ifnull((select ifnull(sum(Quantity),0) as AddQty from T_Material_stock_history
$subQuery = 'select t_materialmaster.MaterialName,t_material_stock_history.MaterialCode,ifnull((select ifnull(sum(Quantity),0) as AddQty from t_material_stock_history
where Transaction_type = "Add" and MaterialCode=?),0) as Addqty,
ifnull((select ifnull(sum(Quantity),0) as ReduceQty from T_Material_stock_history where Transaction_type = "Reduce"
and MaterialCode=?),0) as ReduceQty from T_Material_stock_history join T_MaterialMaster on T_Material_stock_history.MaterialCode=T_MaterialMaster.MaterialCode where T_Material_stock_history.MaterialCode=?
ifnull((select ifnull(sum(Quantity),0) as ReduceQty from t_material_stock_history where Transaction_type = "Reduce"
and MaterialCode=?),0) as ReduceQty from t_material_stock_history join t_materialmaster on t_material_stock_history.MaterialCode=t_materialmaster.MaterialCode where t_material_stock_history.MaterialCode=?
and CreatedOn >= ? and CreatedOn<=? group by Addqty';
$query = $this->db->query($subQuery, array($MaterialCode, $MaterialCode, $MaterialCode, $startdate, $newdate));
@ -717,15 +717,15 @@ class Batchcard_model extends Model
$newdate = $year . '-' . $month . '-' . $nedt;
// $subQuery='select (select sum(Quantity) as AddQty from T_Material_stock_history where Transaction_type = "Add" and MaterialCode=?
// ) as Addqty,(select sum(Quantity) as ReduceQty from T_Material_stock_history where Transaction_type = "Reduce" and MaterialCode=?
// ) as ReduceQty from T_Material_stock_history where MaterialCode=? and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty';
// $subQuery='select (select sum(Quantity) as AddQty from t_material_stock_history where Transaction_type = "Add" and MaterialCode=?
// ) as Addqty,(select sum(Quantity) as ReduceQty from t_material_stock_history where Transaction_type = "Reduce" and MaterialCode=?
// ) as ReduceQty from t_material_stock_history where MaterialCode=? and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty';
$subQuery = 'select ifnull((select ifnull(sum(Quantity),0) as AddQty from T_Material_stock_history
$subQuery = 'select ifnull((select ifnull(sum(Quantity),0) as AddQty from t_material_stock_history
where Transaction_type = "Add" and MaterialCode=? and SupplierID=? ),0) as Addqty,
ifnull((select ifnull(sum(Quantity),0) as ReduceQty from T_Material_stock_history where Transaction_type = "Reduce"
and MaterialCode=? and SupplierID=? ),0) as ReduceQty from T_Material_stock_history where MaterialCode=?
ifnull((select ifnull(sum(Quantity),0) as ReduceQty from t_material_stock_history where Transaction_type = "Reduce"
and MaterialCode=? and SupplierID=? ),0) as ReduceQty from t_material_stock_history where MaterialCode=?
and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty';
$query = $this->db->query($subQuery, array($MaterialCode, $Supplier, $MaterialCode, $Supplier, $MaterialCode, $startdate, $newdate, $Supplier));
@ -736,11 +736,11 @@ class Batchcard_model extends Model
function GetMaterialHistory($AdjustmentId)
{
$builder = $this->db->table('T_Material_Adjustment')
->select('T_Material_Adjustment.*,SupplierName,MaterialName')
->join('T_SupplierDetailsN', "T_SupplierDetailsN.SupplierID=T_Material_Adjustment.SupplierID")
->join('T_MaterialMaster', "T_MaterialMaster.MaterialCode=T_Material_Adjustment.MaterialCode")
->where('T_Material_Adjustment.AdjustmentId', $AdjustmentId);
$builder = $this->db->table('t_material_adjustment')
->select('t_material_adjustment.*,SupplierName,MaterialName')
->join('t_supplierdetailsn', "t_supplierdetailsn.SupplierID=t_material_adjustment.SupplierID")
->join('t_materialmaster', "t_materialmaster.MaterialCode=t_material_adjustment.MaterialCode")
->where('t_material_adjustment.AdjustmentId', $AdjustmentId);
$supp = $builder->get();
return $supp->getResult();
@ -754,7 +754,7 @@ class Batchcard_model extends Model
{
$this->db->transStart();
$builder = $this->db->table('T_Material_Adjustment');
$builder = $this->db->table('t_material_adjustment');
$builder->insert($adjustmentaarray);
$insert_id = $this->db->insertID();
@ -762,7 +762,7 @@ class Batchcard_model extends Model
$this->db->transComplete();
if ($insert_id > 0) {
$subQuery = 'select max(AdjustmentId) as AdjustmentId from T_Material_Adjustment';
$subQuery = 'select max(AdjustmentId) as AdjustmentId from t_material_adjustment';
$query = $this->db->query($subQuery);
return $query->getResult();
@ -773,7 +773,7 @@ class Batchcard_model extends Model
function AddMaterialHistory($historytable)
{
$this->db->transStart();
$builder = $this->db->table('T_Material_stock_history');
$builder = $this->db->table('t_material_stock_history');
$builder->insert($historytable);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -784,14 +784,14 @@ class Batchcard_model extends Model
function insert_final_product($final_master)
{
$this->db->transStart();
$builder = $this->db->table('T_FinalProduct_Master');
$builder = $this->db->table('t_finalproduct_master');
$builder->insert($final_master);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
//print_r($insert_id);
if ($insert_id > 0) {
$subQuery = 'select max(FPId) as PId from T_FinalProduct_Master';
$subQuery = 'select max(FPId) as PId from t_finalproduct_master';
$query = $this->db->query($subQuery);
return $query->getResult();
@ -802,7 +802,7 @@ class Batchcard_model extends Model
function save_finalraw($rawarray)
{
$this->db->transStart();
$builder = $this->db->table('T_FinalProduct_RawMaterials');
$builder = $this->db->table('t_finalproduct_rawmaterials');
$builder->insert($rawarray);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -813,7 +813,7 @@ class Batchcard_model extends Model
function save_finalcon($conarray)
{
$this->db->transStart();
$builder = $this->db->table('T_FinalProduct_ConsumableMaterials');
$builder = $this->db->table('t_finalproduct_consumablematerials');
$builder->insert($conarray);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -823,7 +823,7 @@ class Batchcard_model extends Model
function save_finalpacking($packarray)
{
$this->db->transStart();
$builder = $this->db->table('T_FinalProduct_PackingMaterials');
$builder = $this->db->table('t_finalproduct_packingmaterials');
$builder->insert($packarray);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -836,7 +836,7 @@ class Batchcard_model extends Model
//print_r($coparray);
$this->db->transStart();
$builder = $this->db->table('T_FinalProduct_CoProduct_Materials');
$builder = $this->db->table('t_finalproduct_coproduct_materials');
$builder->insert($coparray);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -846,10 +846,10 @@ class Batchcard_model extends Model
function getAllMaterialAdjustments()
{
$builder = $this->db->table('T_Material_Adjustment')
->select('T_Material_Adjustment.*,SupplierName,MaterialName')
->join('T_SupplierDetailsN', 'T_Material_Adjustment.SupplierID = T_SupplierDetailsN.SupplierID')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode = T_Material_Adjustment.MaterialCode');
$builder = $this->db->table('t_material_adjustment')
->select('t_material_adjustment.*,SupplierName,MaterialName')
->join('t_supplierdetailsn', 't_material_adjustment.SupplierID = t_supplierdetailsn.SupplierID')
->join('t_materialmaster', 't_materialmaster.MaterialCode = t_material_adjustment.MaterialCode');
$res = $builder->get();
return $res->getResult();
}
@ -860,7 +860,7 @@ class Batchcard_model extends Model
function save_rawmaterialto_materialHistory($materialhistory)
{
$this->db->transStart();
$builder = $this->db->table('T_Material_stock_history');
$builder = $this->db->table('t_material_stock_history');
$builder->insert($materialhistory);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -870,10 +870,10 @@ class Batchcard_model extends Model
function getFinalProductDetaisl()
{
$builder = $this->db->table('T_FinalProduct_Master')
->select('T_FinalProduct_Master.*,product_name,product_description')
->join('ip_products', 'ip_products.product_id=T_FinalProduct_Master.MaterialCode')
->orderBy('T_FinalProduct_Master.FPId', 'desc');
$builder = $this->db->table('t_finalproduct_master')
->select('t_finalproduct_master.*,product_name,product_description')
->join('ip_products', 'ip_products.product_id=t_finalproduct_master.MaterialCode')
->orderBy('t_finalproduct_master.FPId', 'desc');
$res = $builder->get();
return $res->getResult();
}
@ -881,10 +881,10 @@ class Batchcard_model extends Model
function getmasterProductDetails($FPId)
{
$builder = $this->db->table('T_FinalProduct_Master')
->select('T_FinalProduct_Master.*,product_name,product_description')
->join('ip_products', 'ip_products.product_id=T_FinalProduct_Master.MaterialCode')
->where('T_FinalProduct_Master.FPId', $FPId);
$builder = $this->db->table('t_finalproduct_master')
->select('t_finalproduct_master.*,product_name,product_description')
->join('ip_products', 'ip_products.product_id=t_finalproduct_master.MaterialCode')
->where('t_finalproduct_master.FPId', $FPId);
$res = $builder->get();
return $res->getResult();
}
@ -893,11 +893,11 @@ class Batchcard_model extends Model
function getrawmaterialDetails($FPId)
{
$builder = $this->db->table('T_FinalProduct_RawMaterials')
->select('T_FinalProduct_RawMaterials.*,SupplierName,MaterialName')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_FinalProduct_RawMaterials.MaterialCode')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_FinalProduct_RawMaterials.SupplierID')
->where('T_FinalProduct_RawMaterials.FPId', $FPId);
$builder = $this->db->table('t_finalproduct_rawmaterials')
->select('t_finalproduct_rawmaterials.*,SupplierName,MaterialName')
->join('t_materialmaster', 't_materialmaster.MaterialCode=t_finalproduct_rawmaterials.MaterialCode')
->join('t_supplierdetailsn', 't_supplierdetailsn.SupplierID=t_finalproduct_rawmaterials.SupplierID')
->where('t_finalproduct_rawmaterials.FPId', $FPId);
$res = $builder->get();
return $res->getResult();
}
@ -905,11 +905,11 @@ class Batchcard_model extends Model
function getconsumaterialDetails($FPId)
{
$builder = $this->db->table('T_FinalProduct_ConsumableMaterials')
->select('T_FinalProduct_ConsumableMaterials.*,SupplierName,MaterialName')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_FinalProduct_ConsumableMaterials.MaterialCode')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_FinalProduct_ConsumableMaterials.SupplierID')
->where('T_FinalProduct_ConsumableMaterials.FPId', $FPId);
$builder = $this->db->table('t_finalproduct_consumablematerials')
->select('t_finalproduct_consumablematerials.*,SupplierName,MaterialName')
->join('t_materialmaster', 't_materialmaster.MaterialCode=t_finalproduct_consumablematerials.MaterialCode')
->join('t_supplierdetailsn', 't_supplierdetailsn.SupplierID=t_finalproduct_consumablematerials.SupplierID')
->where('t_finalproduct_consumablematerials.FPId', $FPId);
$res = $builder->get();
return $res->getResult();
}
@ -917,11 +917,11 @@ class Batchcard_model extends Model
function getpackagematerialDetails($FPId)
{
$builder = $this->db->table('T_FinalProduct_PackingMaterials')
->select('T_FinalProduct_PackingMaterials.*,SupplierName,MaterialName')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_FinalProduct_PackingMaterials.MaterialCode')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_FinalProduct_PackingMaterials.SupplierID')
->where('T_FinalProduct_PackingMaterials.FPId', $FPId);
$builder = $this->db->table('t_finalproduct_packingmaterials')
->select('t_finalproduct_packingmaterials.*,SupplierName,MaterialName')
->join('t_materialmaster', 't_materialmaster.MaterialCode=t_finalproduct_packingmaterials.MaterialCode')
->join('t_supplierdetailsn', 't_supplierdetailsn.SupplierID=t_finalproduct_packingmaterials.SupplierID')
->where('t_finalproduct_packingmaterials.FPId', $FPId);
$res = $builder->get();
return $res->getResult();
}
@ -929,10 +929,10 @@ class Batchcard_model extends Model
function getcoproductmaterial($FPId)
{
$subQuery = 'select T_FinalProduct_CoProduct_Materials.*,product_name
from T_FinalProduct_CoProduct_Materials
join ip_products on ip_products.product_id = T_FinalProduct_CoProduct_Materials.MaterialCode
where T_FinalProduct_CoProduct_Materials.FPId=?';
$subQuery = 'select t_finalproduct_coproduct_materials.*,product_name
from t_finalproduct_coproduct_materials
join ip_products on ip_products.product_id = t_finalproduct_coproduct_materials.MaterialCode
where t_finalproduct_coproduct_materials.FPId=?';
$query = $this->db->query($subQuery, array($FPId));
@ -943,14 +943,14 @@ class Batchcard_model extends Model
function update_final_product($final_master, $FPId)
{
//print_r($final_master);
$this->db->table('T_FinalProduct_Master')
$this->db->table('t_finalproduct_master')
->where('FPId', $FPId)
->update($final_master);
$aff = $this->db->affectedRows();
//return TRUE;
if ($aff > 0) {
$subQuery = 'select max(FPId) as FPId from T_FinalProduct_Master';
$subQuery = 'select max(FPId) as FPId from t_finalproduct_master';
$query = $this->db->query($subQuery, array());
@ -963,7 +963,7 @@ class Batchcard_model extends Model
function GetRawid($rawilneno)
{
$builder = $this->db->table('T_FinalProduct_RawMaterials')
$builder = $this->db->table('t_finalproduct_rawmaterials')
->select('*')->where('RawId', $rawilneno);
$query = $builder->get();
@ -975,7 +975,7 @@ class Batchcard_model extends Model
function Getconsuid($consuline)
{
$builder = $this->db->table('T_FinalProduct_ConsumableMaterials')
$builder = $this->db->table('t_finalproduct_consumablematerials')
->select('*')->where('ConId', $consuline);
$query = $builder->get();
@ -987,7 +987,7 @@ class Batchcard_model extends Model
{
$builder = $this->db->table('T_FinalProduct_PackingMaterials')
$builder = $this->db->table('t_finalproduct_packingmaterials')
->select('*')->where('PackId', $packlineId);
$query = $builder->get();
@ -998,7 +998,7 @@ class Batchcard_model extends Model
function Getcopid($coplineId)
{
$builder = $this->db->table('T_FinalProduct_CoProduct_Materials')
$builder = $this->db->table('t_finalproduct_coproduct_materials')
->select('*')
->where('CoId', $coplineId);
$query = $builder->get();
@ -1009,7 +1009,7 @@ class Batchcard_model extends Model
function update_finalraw($rawarray, $rawilneno)
{
$this->db->table('T_FinalProduct_RawMaterials')
$this->db->table('t_finalproduct_rawmaterials')
->where('RawId', $rawilneno)
->update($rawarray);
return TRUE;
@ -1019,7 +1019,7 @@ class Batchcard_model extends Model
function GetRawCheck($rawmaterial, $final_product_id)
{
$builder = $this->db->table('T_Material_stock_history')
$builder = $this->db->table('t_material_stock_history')
->select('*')->where('MaterialCode', $rawmaterial)
->where('Ref_No', $final_product_id)
->where('Ref_Type', FinalProduct);
@ -1031,7 +1031,7 @@ class Batchcard_model extends Model
function update_rawmaterialto_materialHistory($rawmaterialhistory, $rawmaterial, $FPID)
{
$this->db->table('T_Material_stock_history')
$this->db->table('t_material_stock_history')
->where('Ref_No', $FPID)
->where('MaterialCode', $rawmaterial)
->update($rawmaterialhistory);
@ -1042,7 +1042,7 @@ class Batchcard_model extends Model
function update_finalconsu($conarray, $consuline)
{
$this->db->table('T_FinalProduct_ConsumableMaterials')
$this->db->table('t_finalproduct_consumablematerials')
->where('ConId', $consuline)
->update($conarray);
@ -1055,7 +1055,7 @@ class Batchcard_model extends Model
function update_finalpacking($conarray, $packlineId)
{
$this->db->table('T_FinalProduct_PackingMaterials')
$this->db->table('t_finalproduct_packingmaterials')
->where('PackId', $packlineId)
->update($conarray);
@ -1067,7 +1067,7 @@ class Batchcard_model extends Model
function update_finalcoproduct($coparray, $coplineId)
{
$this->db->table('T_FinalProduct_CoProduct_Materials')
$this->db->table('t_finalproduct_coproduct_materials')
->where('CoId', $coplineId)
->update($coparray);
@ -1077,26 +1077,26 @@ class Batchcard_model extends Model
}
function getEditMaterialAdjustments($AdjustmentId)
{
$builder = $this->db->table('T_Material_Adjustment')
->select('T_Material_Adjustment.*,SupplierName,MaterialName,Description,AdjustmentId,ActualQuantity,T_Material_stock_history.Quantity,Ref_Type,Transaction_type')
->join('T_Material_stock_history', 'T_Material_Adjustment.AdjustmentId = T_Material_stock_history.Ref_No and T_Material_stock_history.Ref_Type="Adjust"')
->join('T_SupplierDetailsN', 'T_Material_Adjustment.SupplierID = T_SupplierDetailsN.SupplierID')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode = T_Material_Adjustment.MaterialCode')
->where('T_Material_Adjustment.AdjustmentId', $AdjustmentId);
$builder = $this->db->table('t_material_adjustment')
->select('t_material_adjustment.*,SupplierName,MaterialName,Description,AdjustmentId,ActualQuantity,t_material_stock_history.Quantity,Ref_Type,Transaction_type')
->join('t_material_stock_history', 't_material_adjustment.AdjustmentId = t_material_stock_history.Ref_No and t_material_stock_history.Ref_Type="Adjust"')
->join('t_supplierdetailsn', 't_material_adjustment.SupplierID = t_supplierdetailsn.SupplierID')
->join('t_materialmaster', 't_materialmaster.MaterialCode = t_material_adjustment.MaterialCode')
->where('t_material_adjustment.AdjustmentId', $AdjustmentId);
$res = $builder->get();
return $res->getResult();
}
function material_name()
{
$sql = "SELECT distinct MaterialName FROM T_MaterialMaster;";
$sql = "SELECT distinct MaterialName FROM t_materialmaster;";
$query = $this->db->query($sql);
return $query->getResult();
}
function getMaterial_history($prod, $frm, $t)
{
$sql = "SELECT msh.StockId,sd.SupplierName,mm.MaterialName,msh.Transaction_type,msh.Ref_Type,msh.Ref_No,msh.Quantity,msh.ItemValue,date_format(msh.UpdatedOn,'%d-%m-%Y') as updatedOn FROM T_Material_stock_history as msh
LEFT JOIN T_SupplierDetailsN as sd on sd.SupplierID=msh.SupplierID
LEFT JOIN T_MaterialMaster as mm on mm.MaterialCode=msh.MaterialCode
$sql = "SELECT msh.StockId,sd.SupplierName,mm.MaterialName,msh.Transaction_type,msh.Ref_Type,msh.Ref_No,msh.Quantity,msh.ItemValue,date_format(msh.UpdatedOn,'%d-%m-%Y') as updatedOn FROM t_material_stock_history as msh
LEFT JOIN t_supplierdetailsn as sd on sd.SupplierID=msh.SupplierID
LEFT JOIN t_materialmaster as mm on mm.MaterialCode=msh.MaterialCode
where msh.StockId != 'null' ";
if ($prod != '') {
@ -1119,7 +1119,7 @@ class Batchcard_model extends Model
//for update quantity stockhistory
function updateQuantityStockHistory($updatequantity, $id)
{
$this->db->table('T_Material_stock_history')
$this->db->table('t_material_stock_history')
->where('Ref_No', $id)
->where('Ref_Type', 'Adjust')
->update($updatequantity);
@ -1130,11 +1130,11 @@ class Batchcard_model extends Model
}
//created by TamilBala
//for update quantity T_Material_Adjustment
//for update quantity t_material_adjustment
function updateQuantityAdjusment($updatequantitydes, $id)
{
$this->db->table('T_Material_Adjustment')
$this->db->table('t_material_adjustment')
->where('AdjustmentId', $id)
->update($updatequantitydes);
@ -1142,10 +1142,10 @@ class Batchcard_model extends Model
return $r;
}
//created by TamilBala
//for update isactive T_Material_Adjustment
//for update isactive t_material_adjustment
function updateisactiveadjusment($Updateactive, $AdjustmentId)
{
$this->db->table('T_Material_Adjustment')
$this->db->table('t_material_adjustment')
->where('AdjustmentId', $AdjustmentId)
->update($Updateactive);
@ -1157,7 +1157,7 @@ class Batchcard_model extends Model
//for update isactive stockhistory
function updateisactiveastockhistory($Updateactive, $AdjustmentId)
{
$this->db->table('T_Material_stock_history')
$this->db->table('t_material_stock_history')
->where('Ref_No', $AdjustmentId)
->where('Ref_Type', 'Adjust')
->update($Updateactive);
@ -1174,11 +1174,11 @@ class Batchcard_model extends Model
// $subQuery ='select ip_products.product_id,ip_products.product_name,ip_invoices.invoice_id,ip_invoice_items.item_quantity,ip_invoice_items.item_price,ip_invoices.invoice_number as IDnumber,ip_invoices.receivedstatus as Type from ip_products join ip_invoice_items on ip_products.product_id = ip_invoice_items.item_product_id join ip_invoices on ip_invoice_items.invoice_id = ip_invoices.invoice_id
// join T_FinalProduct_Master on ip_products.product_id = T_FinalProduct_Master.MaterialCode where (ip_invoices.invoice_date_modified>=? and ip_invoices.invoice_date_modified<=? and ip_invoice_items.item_product_id=?) union
// join t_finalproduct_master on ip_products.product_id = t_finalproduct_master.MaterialCode where (ip_invoices.invoice_date_modified>=? and ip_invoices.invoice_date_modified<=? and ip_invoice_items.item_product_id=?) union
// select ip_products.product_id,ip_products.product_name,T_FinalProduct_Master.FPId,T_FinalProduct_Master.Quantity,T_FinalProduct_Master.Price,T_FinalProduct_Master.FPId as IDnumber,T_FinalProduct_Master.ProductType as Type from ip_products join ip_invoice_items on ip_products.product_id = ip_invoice_items.item_product_id
// join T_FinalProduct_Master on ip_products.product_id = T_FinalProduct_Master.MaterialCode where
// (T_FinalProduct_Master.ProductDate<=? and T_FinalProduct_Master.ProductDate>=? and T_FinalProduct_Master.MaterialCode=?) group by FPId';
// select ip_products.product_id,ip_products.product_name,t_finalproduct_master.FPId,t_finalproduct_master.Quantity,t_finalproduct_master.Price,t_finalproduct_master.FPId as IDnumber,t_finalproduct_master.ProductType as Type from ip_products join ip_invoice_items on ip_products.product_id = ip_invoice_items.item_product_id
// join t_finalproduct_master on ip_products.product_id = t_finalproduct_master.MaterialCode where
// (t_finalproduct_master.ProductDate<=? and t_finalproduct_master.ProductDate>=? and t_finalproduct_master.MaterialCode=?) group by FPId';
// $query = $this->db->query($subQuery,array($starting_date,$end_date,$product_id,$end_date,$starting_date,$product_id));
@ -1195,19 +1195,19 @@ class Batchcard_model extends Model
{
// $subQuery = 'select * from T_FinalProduct_History,ip_products.product_name
// join ip_products on T_FinalProduct_History.ProductCode = ip_products.product_id
// $subQuery = 'select * from t_finalproduct_history,ip_products.product_name
// join ip_products on t_finalproduct_history.ProductCode = ip_products.product_id
// where ProductCode=?
// and Transactiondate >= ? and Transactiondate <= ?';
$subQuery = 'select RefID,ProductCode,product_description,Quantity,Price,Transactiondate,TransactionType,product_name
from T_FinalProduct_History
join ip_products on ip_products.product_id= T_FinalProduct_History.ProductCode
from t_finalproduct_history
join ip_products on ip_products.product_id= t_finalproduct_history.ProductCode
where ProductCode=? and Transactiondate >= ? and Transactiondate <= ?';
// $subQuery='select FPId as RefID,product_id as ProductCode,Quantity,product_description,Price,ProductDate as Transactiondate,ProductType as TransactionType,product_name from T_FinalProduct_Master join ip_products on ip_products.product_id= T_FinalProduct_Master.MaterialCode where MaterialCode=? and ProductDate >= ? and ProductDate <= ?';
// $subQuery='select FPId as RefID,product_id as ProductCode,Quantity,product_description,Price,ProductDate as Transactiondate,ProductType as TransactionType,product_name from t_finalproduct_master join ip_products on ip_products.product_id= t_finalproduct_master.MaterialCode where MaterialCode=? and ProductDate >= ? and ProductDate <= ?';
$query = $this->db->query($subQuery, array($product_id, $starting_date, $end_date));
@ -1218,7 +1218,7 @@ class Batchcard_model extends Model
function SaveFinalHistory($final_history)
{
$this->db->transStart();
$builder = $this->db->table('T_FinalProduct_History');
$builder = $this->db->table('t_finalproduct_history');
$builder->insert($final_history);
$insert_id = $this->db->affectedRows();
@ -1230,7 +1230,7 @@ class Batchcard_model extends Model
function UpdateFinalHistory($final_history, $FPID, $rawmaterial)
{
//print_r($final_history);
$this->db->table('T_FinalProduct_History')
$this->db->table('t_finalproduct_history')
->where('RefID', $FPID)
->where('ProductCode', $rawmaterial)
->update($final_history);
@ -1240,8 +1240,8 @@ class Batchcard_model extends Model
function GetAvgPrice($MaterialCode, $date, $Supplier)
{
$subQuery = 'select AVG(Rate) as avg_rate from T_PurchaseOrder_LineItem
join T_PurchaseOrder_Master on T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO
$subQuery = 'select AVG(Rate) as avg_rate from t_purchaseorder_lineitem
join t_purchaseorder_master on t_purchaseorder_master.PONO=t_purchaseorder_lineitem.PONO
where MaterialCode = ? and SupplierID=?';
$query = $this->db->query($subQuery, array($MaterialCode, $Supplier));
@ -1257,13 +1257,13 @@ class Batchcard_model extends Model
//echo $MaterialCode;
$ltype = '%' . $type . '%';
//echo $ltype;
$builder = $this->db->table('T_PurchaseOrder_Master mas')
$builder = $this->db->table('t_purchaseorder_master mas')
->select('mas.SupplierID,sup.SupplierName,mmas.MaterialCode,mmas.MaterialName')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=mas.SupplierID')
->join('T_PurchaseOrder_LineItem line', 'line.PONO=mas.PONO')
->join('T_MaterialMaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->join('t_supplierdetailsn sup', 'sup.SupplierID=mas.SupplierID')
->join('t_purchaseorder_lineitem line', 'line.PONO=mas.PONO')
->join('t_materialmaster mmas', 'mmas.MaterialCode=line.MaterialCode')
->where('Category like', $ltype)
// ->where('T_MaterialMaster.Category like','%Raw Material%');
// ->where('t_materialmaster.Category like','%Raw Material%');
->where('mmas.MaterialCode', $MaterialCode)
->groupBy('SupplierID');
$supp = $builder->get();
@ -1289,7 +1289,7 @@ class Batchcard_model extends Model
THEN concat(YEAR(MaterialRcvdDate), '-',YEAR(MaterialRcvdDate)+1)
ELSE concat(YEAR(MaterialRcvdDate)-1,'-', YEAR(MaterialRcvdDate))
END AS financial_year
FROM T_IGR_Master
FROM t_igr_master
GROUP BY financial_year";
$query = $this->db->query($sql);
return $query->getResult();
@ -1328,10 +1328,10 @@ class Batchcard_model extends Model
SUM(IF(p.Transaction_type='Add',p.Quantity,0)) AS Addition,
SUM(IF(p.Transaction_type='Reduce',p.Quantity,0)) AS Reduce,
SUM((IF(p.Transaction_type='Add',p.Quantity,0))-(IF(p.Transaction_type='Reduce',p.Quantity,0))) AS AvailableStock,ROUND(AVG(Rate),2) as Avg_rate,ROUND(AVG(ItemValue),2) as Final_avg
FROM T_Material_stock_history AS p
LEFT JOIN T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
FROM t_material_stock_history AS p
LEFT JOIN t_materialmaster mm on mm.MaterialCode = p.MaterialCode
LEFT JOIN ip_products ip on ip.product_id=p.MaterialCode
LEFT JOIN T_PurchaseOrder_LineItem pol on pol.MaterialCode = mm.MaterialCode";
LEFT JOIN t_purchaseorder_lineitem pol on pol.MaterialCode = mm.MaterialCode";
if ($search['month'] == '' && $startyr == '') {
@ -1342,7 +1342,7 @@ class Batchcard_model extends Model
$subquery .= " LEFT JOIN (select StockId,pp.MaterialCode mc,
SUM((IF(pp.Transaction_type='Add',Quantity,0))-(IF(pp.Transaction_type='Reduce',Quantity,0)))
AS OpeningStock
FROM T_Material_stock_history AS pp
FROM t_material_stock_history AS pp
where pp.CreatedOn < '" . $fromdate . "'
GROUP BY pp.MaterialCode
) as opens on opens.mc = p.MaterialCode";
@ -1355,7 +1355,7 @@ class Batchcard_model extends Model
$subquery .= " LEFT JOIN (select StockId,pq.MaterialCode mc,
SUM((IF(pq.Transaction_type='Add',Quantity,0))-(IF(pq.Transaction_type='Reduce',Quantity,0)))
AS OpeningStock
FROM T_Material_stock_history AS pq
FROM t_material_stock_history AS pq
where month(pq.CreatedOn) < '" . $search['month'] . "'
GROUP BY pq.MaterialCode
) as opens on opens.mc = p.MaterialCode";
@ -1367,7 +1367,7 @@ class Batchcard_model extends Model
$subquery .= " LEFT JOIN (select StockId,pq.MaterialCode mc,
SUM((IF(pq.Transaction_type='Add',Quantity,0))-(IF(pq.Transaction_type='Reduce',Quantity,0)))
AS OpeningStock
FROM T_Material_stock_history AS pq
FROM t_material_stock_history AS pq
where date(pq.CreatedOn) < '" . $currentyr . '-' . $search['month'] . "-01'
GROUP BY pq.MaterialCode
) as opens on opens.mc = p.MaterialCode";
@ -1378,7 +1378,7 @@ class Batchcard_model extends Model
$subquery .= " LEFT JOIN (select StockId,pq.MaterialCode mc,
SUM((IF(pq.Transaction_type='Add',Quantity,0))-(IF(pq.Transaction_type='Reduce',Quantity,0)))
AS OpeningStock
FROM T_Material_stock_history AS pq
FROM t_material_stock_history AS pq
where date(pq.CreatedOn) < '" . $startyr . "-03-31'
GROUP BY pq.MaterialCode
) as opens on opens.mc = p.MaterialCode";
@ -1470,8 +1470,8 @@ class Batchcard_model extends Model
SUM(IF(p.Transaction_type='Reduce',Quantity,0)) AS Reduce,
SUM((IF(p.Transaction_type='Add',Quantity,0))-(IF(p.Transaction_type='Reduce',Quantity,0))) AS AvailableStock
FROM
T_Material_stock_history AS p
LEFT JOIN T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
t_material_stock_history AS p
LEFT JOIN t_materialmaster mm on mm.MaterialCode = p.MaterialCode
LEFT JOIN ip_products ip on ip.product_id=p.MaterialCode
LEFT JOIN ip_invoices inv on inv.invoice_id=p.Ref_No
where p.MaterialCode='" . $search['materialcode'] . "'";
@ -1526,19 +1526,19 @@ class Batchcard_model extends Model
public function Delete_ProductBatchCard($FPId)
{
$this->db->table('T_FinalProduct_ConsumableMaterials')->delete(['FPId' => $FPId]);
$this->db->table('t_finalproduct_consumablematerials')->delete(['FPId' => $FPId]);
$this->db->table('T_FinalProduct_CoProduct_Materials')->delete(['FPId' => $FPId]);
$this->db->table('t_finalproduct_coproduct_materials')->delete(['FPId' => $FPId]);
$this->db->table('T_FinalProduct_History')->delete(['RefID' => $FPId]);
$this->db->table('t_finalproduct_history')->delete(['RefID' => $FPId]);
$this->db->table('T_FinalProduct_Master')->delete(['FPId' => $FPId]);
$this->db->table('t_finalproduct_master')->delete(['FPId' => $FPId]);
$this->db->table('T_FinalProduct_PackingMaterials')->delete(['FPId' => $FPId]);
$this->db->table('t_finalproduct_packingmaterials')->delete(['FPId' => $FPId]);
$this->db->table('T_FinalProduct_RawMaterials')->delete(['FPId' => $FPId]);
$this->db->table('t_finalproduct_rawmaterials')->delete(['FPId' => $FPId]);
$this->db->table('T_Material_stock_history')->delete(['Ref_No' => $FPId]);
$this->db->table('t_material_stock_history')->delete(['Ref_No' => $FPId]);
return true;
}

262
app/Models/Cashbook_model.php
View File

@ -35,7 +35,7 @@ class Cashbook_model extends Model
}
// function addcashbook($bankcash1)
// {
// $builder = $this->db->table('T_Bankmappingcashbook');
// $builder = $this->db->table('t_bankmappingcashbook');
// $builder->insert($bankcash1);
// $r = $this->db->affectedRows();
// return $r;
@ -43,10 +43,10 @@ class Cashbook_model extends Model
// function amountpaidcashbook()
// {
// $builder = $this->db->table('t_income_expense')
// ->select('t_accountcode.namea,total,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*')
// ->select('t_accountcode.namea,total,cashtype,t_employee_details.FirstName,t_employee_details.LastName,t_income_expense.*')
// ->join('t_accountcode','t_income_expense.account_code=t_accountcode.code','left');
// ->join('tbl_users','t_income_expense.Created_By=tbl_users.userId','left');
// ->join('T_Employee_Details','tbl_users.EmpID=T_Employee_Details.EmpID','left');
// ->join('t_employee_details','tbl_users.EmpID=t_employee_details.EmpID','left');
// ->where('t_income_expense.IsActive',1);
// ->where('t_income_expense.account_code !=','ADV001');
// ->groupBy('t_income_expense.account_code');
@ -58,10 +58,10 @@ class Cashbook_model extends Model
{
// echo $i;
$builder = $this->db->table('t_income_expense')
->select('t_accountcode.name,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*')
->select('t_accountcode.name,cashtype,t_employee_details.FirstName,t_employee_details.LastName,t_income_expense.*')
->join('t_accountcode', 't_income_expense.account_code=t_accountcode.code', 'left')
->join('tbl_users', 't_income_expense.Created_By=tbl_users.userId', 'left')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID', 'left')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID', 'left')
->where('t_income_expense.IsActive', 1)
// ->where('t_income_expense.account_code !=','ADV001');
// ->where('t_income_expense.account_code !=','0013');
@ -76,10 +76,10 @@ class Cashbook_model extends Model
function getIncomeExpense($firstyear, $secondyear, $frmdt, $todt)
{
$builder = $this->db->table('t_income_expense')
->select('t_accountcode.name,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*')
->select('t_accountcode.name,cashtype,t_employee_details.FirstName,t_employee_details.LastName,t_income_expense.*')
->join('t_accountcode', 't_income_expense.account_code=t_accountcode.code', 'left')
->join('tbl_users', 't_income_expense.Created_By=tbl_users.userId', 'left')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID', 'left')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID', 'left')
->where('t_income_expense.IsActive', 1)
->where('t_income_expense.account_code !=', 'ADV001')
->where('t_income_expense.account_code !=', '0013');
@ -103,10 +103,10 @@ class Cashbook_model extends Model
{
// echo $i;
$builder = $this->db->table('t_income_expense')
->select('t_accountcode.name,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*')
->select('t_accountcode.name,cashtype,t_employee_details.FirstName,t_employee_details.LastName,t_income_expense.*')
->join('t_accountcode', 't_income_expense.account_code=t_accountcode.code', 'left')
->join('tbl_users', 't_income_expense.Created_By=tbl_users.userId', 'left')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID', 'left')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID', 'left')
->where('t_income_expense.IsActive', 1)
->where('t_income_expense.account_code', 'ADV001')
->orWhere('t_income_expense.account_code', '0013')
@ -121,10 +121,10 @@ class Cashbook_model extends Model
function getAdvance($firstyear, $secondyear, $frmdt, $todt)
{
$builder = $this->db->table('t_income_expense')
->select('t_accountcode.name,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*')
->select('t_accountcode.name,cashtype,t_employee_details.FirstName,t_employee_details.LastName,t_income_expense.*')
->join('t_accountcode', 't_income_expense.account_code=t_accountcode.code', 'left')
->join('tbl_users', 't_income_expense.Created_By=tbl_users.userId', 'left')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID', 'left')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID', 'left')
->where('t_income_expense.IsActive', 1)
->where('t_income_expense.account_code', 'ADV001')
->orWhere('t_income_expense.account_code', '0013');
@ -159,7 +159,7 @@ class Cashbook_model extends Model
}
function getCompany()
{
$builder = $this->db->table('T_Company_Details');
$builder = $this->db->table('t_company_details');
$query = $builder->get();
return $query->getResult();
}
@ -189,11 +189,11 @@ class Cashbook_model extends Model
{
// echo $i;
$builder = $this->db->table('t_income_expense')
->select('T_SupplierDetailsN.SupplierName,t_accountcode.name,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*')
->select('t_supplierdetailsn.SupplierName,t_accountcode.name,cashtype,t_employee_details.FirstName,t_employee_details.LastName,t_income_expense.*')
->join('t_accountcode', 't_income_expense.account_code=t_accountcode.code', 'left')
->join('tbl_users', 't_income_expense.Created_By=tbl_users.userId', 'left')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID', 'left')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=t_income_expense.Supplier_id')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID', 'left')
->join('t_supplierdetailsn', 't_supplierdetailsn.SupplierID=t_income_expense.Supplier_id')
->orderBy("date", "desc")
->whereIn('t_accountcode.code', [AReceipt, Apayment]);
if (!empty($i)) {
@ -208,7 +208,7 @@ class Cashbook_model extends Model
{
$sql = "SELECT ie.*,br.*,br.ID,ie.totalbankamount,ac.name,ie.id,date_format(ie.date,'%d-%m-%Y')as date FROM t_income_expense ie
LEFT JOIN t_accountcode ac on ac.code=ie.account_code
LEFT JOIN T_bankreport br on br.ID=ie.bankid
LEFT JOIN t_bankreport br on br.ID=ie.bankid
WHERE ie.id = ?";
$query = $this->db->query($sql, array($sid));
@ -247,7 +247,7 @@ class Cashbook_model extends Model
function bankfiledata($filedataupload)
{
$builder = $this->db->table('T_bankreport')
$builder = $this->db->table('t_bankreport')
->select('reportdate,Narration,Balance')
->where('reportdate', $filedataupload['reportdate'])
->where('Narration', $filedataupload['Narration'])
@ -257,7 +257,7 @@ class Cashbook_model extends Model
if ($query->getNumRows()() > 0) {
return true;
} else {
$builder = $this->db->table('T_bankreport');
$builder = $this->db->table('t_bankreport');
$builder->insert($filedataupload);
$res = $this->db->affectedRows();
return $res;
@ -267,14 +267,14 @@ class Cashbook_model extends Model
function balance($balance)
{
$builder = $this->db->table('T_bankbalance');
$builder = $this->db->table('t_bankbalance');
$builder->insert($balance);
}
function getbalancedetails()
{
$subquery = "SELECT openingbalance,closingbalance FROM T_bankbalance WHERE balance_keyid in (SELECT MAX(balance_keyid) FROM T_bankbalance)";
$subquery = "SELECT openingbalance,closingbalance FROM t_bankbalance WHERE balance_keyid in (SELECT MAX(balance_keyid) FROM t_bankbalance)";
$query = $this->db->query($subquery);
return $query->getResult();
}
@ -289,7 +289,7 @@ class Cashbook_model extends Model
CASE WHEN MONTH(reportdate)>=4 THEN
concat(YEAR(reportdate), '-',YEAR(reportdate)+1)
ELSE concat(YEAR(reportdate)-1,'-', YEAR(reportdate)) END AS financial_year
FROM T_bankreport
FROM t_bankreport
GROUP BY financial_year";
$query = $this->db->query($sql);
return $query->getResult();
@ -302,7 +302,7 @@ GROUP BY financial_year";
CASE WHEN MONTH(reportdate)>=4 THEN
concat(YEAR(reportdate), '-',YEAR(reportdate)+1)
ELSE concat(YEAR(reportdate)-1,'-', YEAR(reportdate)) END AS financial_year
FROM T_bankreport
FROM t_bankreport
GROUP BY financial_year";
$query = $this->db->query($sql);
return $query->getResult();
@ -328,7 +328,7 @@ GROUP BY financial_year";
CASE WHEN MONTH(MaterialRcvdDate)>=4 THEN
concat(YEAR(MaterialRcvdDate), '-',YEAR(MaterialRcvdDate)+1)
ELSE concat(YEAR(MaterialRcvdDate)-1,'-', YEAR(MaterialRcvdDate)) END AS financial_year
FROM T_IGR_Master
FROM t_igr_master
GROUP BY financial_year";
$query = $this->db->query($sql);
return $query->getResult();
@ -341,7 +341,7 @@ GROUP BY financial_year";
CASE WHEN MONTH(reportdate)>=4 THEN
concat(YEAR(reportdate), '-',YEAR(reportdate)+1)
ELSE concat(YEAR(reportdate)-1,'-', YEAR(reportdate)) END AS financial_year
FROM T_bankreport
FROM t_bankreport
GROUP BY financial_year";
$query = $this->db->query($sql);
return $query->getResult();
@ -364,7 +364,7 @@ GROUP BY financial_year";
function bankstatement($fdate, $tdate, $fa, $aa)
{
$sql = "SELECT *,date_format(reportdate,'%d-%m-%Y')as date,tie.total,date_format(valuedate,'%d-%m-%Y')as valuedate from T_bankreport as br LEFT JOIN t_income_expense as tie on tie.bankid=br.ID where br.reportdate !=0 ";
$sql = "SELECT *,date_format(reportdate,'%d-%m-%Y')as date,tie.total,date_format(valuedate,'%d-%m-%Y')as valuedate from t_bankreport as br LEFT JOIN t_income_expense as tie on tie.bankid=br.ID where br.reportdate !=0 ";
if ($fa and $aa != '') {
@ -390,7 +390,7 @@ GROUP BY financial_year";
function cleareddebitbalance()
{
$sql = "SELECT SUM(Balancetocleared) as debit FROM T_bankreport where Clearbalance >'0'";
$sql = "SELECT SUM(Balancetocleared) as debit FROM t_bankreport where Clearbalance >'0'";
$query = $this->db->query($sql);
return $query->getResult();
@ -398,7 +398,7 @@ GROUP BY financial_year";
function clearedcreditbalance()
{
$sql = "SELECT SUM(cbalancetocleared) as credit FROM T_bankreport where cclearbalance >'0'";
$sql = "SELECT SUM(cbalancetocleared) as credit FROM t_bankreport where cclearbalance >'0'";
$query = $this->db->query($sql);
return $query->getResult();
@ -522,7 +522,7 @@ GROUP BY financial_year";
->select('iva.invoice_id,iva.invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_name,ic.client_id,BI.balancetoreceived,BI.amountreceived')
->join('ip_invoices iv', 'iva.invoice_id = iv.invoice_id')
->join('ip_clients ic', 'iv.client_id = ic.client_id', 'left')
->join('T_Bankinvoicereport BI', 'iv.invoice_number = BI.invoiceno and BI.IsActive= 1', 'left')
->join('t_bankinvoicereport BI', 'iv.invoice_number = BI.invoiceno and BI.IsActive= 1', 'left')
->where('iv.invoice_status_id', '2')
->where('iv.receivedstatus !=', 'ST065');
// ->where('BI.IsActive',1);
@ -714,7 +714,7 @@ GROUP BY financial_year";
function receivedamount($Customer, $fdate, $tdate)
{
// $status='ST065';
$builder = $this->db->table('T_Bankinvoicereport BI')
$builder = $this->db->table('t_bankinvoicereport BI')
// ->distinct()
->select('BI.balancetoreceived,BI.amountreceived');
//->where('BI.IsActive',1);
@ -759,7 +759,7 @@ GROUP BY financial_year";
function debitimage($igrno, $pono)
{
$builder = $this->db->table('T_PurchaseOrder_BillUpload')
$builder = $this->db->table('t_purchaseorder_billupload')
->select('*')
->where('IGRNO != "" ')
->where('IGRNO', $igrno)
@ -774,13 +774,13 @@ GROUP BY financial_year";
function debitpolistfilter($supplierID, $fa, $aa, $m, $fdate, $tdate)
{
$builder = $this->db->table('T_Bankmappingpo bm')->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.Totalpoamount,bm.Podate,bm.BankDate,
$builder = $this->db->table('t_bankmappingpo bm')->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.Totalpoamount,bm.Podate,bm.BankDate,
bm.Balancetopay,bm.Amountpaid,bm.IGRNO,bm.IGRLineItemNo,br.Balancetocleared,br.Clearbalance,
inward.FilePath as igrfile,bu.FilePath as pofile')
// ->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo')
->join('T_Inwardgateregister_fileupload inward', 'inward.IGRNO =bm.IGRNO', 'left')
->join('T_PurchaseOrder_BillUpload bu', 'bm.PONO=bu.PONO', 'left')
->join('T_bankreport br', 'br.ID=bm.mid', 'left')
// ->join('t_igr_details igr','igr.IGRItemNo=bm.IGRLineItemNo')
->join('t_inwardgateregister_fileupload inward', 'inward.IGRNO =bm.IGRNO', 'left')
->join('t_purchaseorder_billupload bu', 'bm.PONO=bu.PONO', 'left')
->join('t_bankreport br', 'br.ID=bm.mid', 'left')
->where('bm.SupplierID', $supplierID)
->where('bm.IsActive', 1)
// ->where('igr.BankStatus !=',ST072)
@ -813,7 +813,7 @@ GROUP BY financial_year";
function igrmastersingle($igrno, $pono)
{
$builder = $this->db->table('T_IGR_Master')->distinct()
$builder = $this->db->table('t_igr_master')->distinct()
->select('IGRNO,file,PONO as pono');
if (!empty($igrno) && !empty($pono)) {
$builder->where('PONO', $pono);
@ -830,7 +830,7 @@ GROUP BY financial_year";
}
function igrmastermultiple($igrno, $pono)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload')->distinct()
$builder = $this->db->table('t_inwardgateregister_fileupload')->distinct()
->select('BillNo,IGRNO,FilePath,PONO');
if (!empty($igrno) && !empty($pono)) {
$builder->where('PONO', $pono);
@ -846,7 +846,7 @@ GROUP BY financial_year";
}
function igrmastermultiple1($igrno, $pono)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload')->select('BillNo,IGRNO,FilePath,PONO')
$builder = $this->db->table('t_inwardgateregister_fileupload')->select('BillNo,IGRNO,FilePath,PONO')
// if(!empty($igrno) && !empty($pono)){
// ->where('PONO',$pono);
->where('IGRNO', $igrno);
@ -861,11 +861,11 @@ GROUP BY financial_year";
}
function debitpolist($bankid)
{
$builder = $this->db->table('T_Bankmappingpo bp')->select('bp.id,bp.mid,igrm.MaterialRcvdDate,bp.PONO,bp.Suppliername,bp.Totalpoamount,br.Debit,bp.Balancetopay,bp.Amountpaid,bp.IGRNO,bp.IGRLineItemNo,igrm.file,bu.FilePath,inward.FilePath as Fpath,bp.IsActive')
->join('T_IGR_Master igrm', 'bp.IGRNO = igrm.IGRNO', 'left')
->join('T_PurchaseOrder_BillUpload bu', 'bu.PONO = bp.PONO', 'left')
->join('T_Inwardgateregister_fileupload inward', 'inward.IGRNO =igrm.IGRNO', 'left')
->join('T_bankreport br', 'br.ID=bp.mid')
$builder = $this->db->table('t_bankmappingpo bp')->select('bp.id,bp.mid,igrm.MaterialRcvdDate,bp.PONO,bp.Suppliername,bp.Totalpoamount,br.Debit,bp.Balancetopay,bp.Amountpaid,bp.IGRNO,bp.IGRLineItemNo,igrm.file,bu.FilePath,inward.FilePath as Fpath,bp.IsActive')
->join('t_igr_master igrm', 'bp.IGRNO = igrm.IGRNO', 'left')
->join('t_purchaseorder_billupload bu', 'bu.PONO = bp.PONO', 'left')
->join('t_inwardgateregister_fileupload inward', 'inward.IGRNO =igrm.IGRNO', 'left')
->join('t_bankreport br', 'br.ID=bp.mid')
->where('bp.IsActive', 1)
->where('bp.mid', (int)$bankid)
// ->where('igrde.BankStatus !=','ST072');
@ -880,9 +880,9 @@ GROUP BY financial_year";
function creditinvoicelist($bankid)
{
$builder = $this->db->table('T_Bankmappingiv bm')->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,
$builder = $this->db->table('t_bankmappingiv bm')->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,
bm.balancetoreceived,bm.amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared,bm.IsActive')
->join('T_bankreport br', 'br.ID=bm.bankid')
->join('t_bankreport br', 'br.ID=bm.bankid')
->where('bm.bankid', (int)$bankid)
->where('bm.IsActive', 1)
->groupBy('bm.ID');
@ -895,12 +895,12 @@ GROUP BY financial_year";
}
function creditinvoicelistfilter($clientid, $fdate, $tdate, $fa, $aa, $m)
{
$builder = $this->db->table('T_Bankmappingiv bm')
$builder = $this->db->table('t_bankmappingiv bm')
->select('bm.ID,bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,
bm.balancetoreceived,bm.amountreceived,br.cclearbalance,br.cbalancetocleared,bm.BankDate')
->join('ip_invoices iv', 'iv.invoice_number=bm.invoiceno')
->join('ip_clients ic', 'ic.client_name = bm.customername', 'left')
->join('T_bankreport br', 'br.ID = bm.bankid')
->join('t_bankreport br', 'br.ID = bm.bankid')
->where('bm.IsActive', 1)
->where('bm.customerid', $clientid)
->where('iv.receivedstatus !=', 'ST066');
@ -931,7 +931,7 @@ GROUP BY financial_year";
$builder = $this->db->table('ip_invoice_amounts iva')->select('iva.invoice_id,iva.invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_id,ic.client_name,BI.balancetoreceived,BI.amountreceived')
->join('ip_invoices iv', 'iva.invoice_id = iv.invoice_id')
->join('ip_clients ic', 'iv.client_id = ic.client_id', 'left')
->join('T_Bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->join('t_bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->where('iv.invoice_status_id', '2')
->where('iv.receivedstatus', 'ST066')
->where('ic.client_id', $client);
@ -958,7 +958,7 @@ GROUP BY financial_year";
//for cashbook edit screen and update bankreport//
function invoiceamonut($bankid)
{
$builder = $this->db->table('T_Bankmappingiv bm')->select('sum(bm.amountreceived)as amountreceived')
$builder = $this->db->table('t_bankmappingiv bm')->select('sum(bm.amountreceived)as amountreceived')
->where('bm.bankid', (int)$bankid)
->where('bm.IsActive', 1);
//->groupBy('bm.ID');
@ -968,7 +968,7 @@ GROUP BY financial_year";
//for cashbook edit screen and update bankreport//
function poamonut($bankid)
{
$builder = $this->db->table('T_Bankmappingpo')
$builder = $this->db->table('t_bankmappingpo')
->select('sum(Amountpaid)as amountpaid')
->where('mid', $bankid)
->where('IsActive', 1);
@ -992,7 +992,7 @@ GROUP BY financial_year";
$builder = $this->db->table('t_income_expense as ie')
->select('ie.date,ie.bankid,ie.cashtype,ie.amounttype,ie.total,ac.name,totalbankamount,ie.id,sd.SupplierName')
->join('t_accountcode ac ', 'ac.code = ie.account_code', 'left')
->join('T_SupplierDetailsN sd ', 'sd.SupplierID = ie.Supplier_id', 'left')
->join('t_supplierdetailsn sd ', 'sd.SupplierID = ie.Supplier_id', 'left')
->where('ie.account_code', $accountcode)
->where('ie.amounttype', 'DEBIT')
->where('ie.IsActive', 1);
@ -1049,7 +1049,7 @@ GROUP BY financial_year";
$builder = $this->db->table('t_income_expense as ie')
->select('ie.date,ie.bankid,ie.cashtype,ie.amounttype,ie.total,ac.name,totalbankamount,ie.id,sd.SupplierName')
->join('t_accountcode ac ', 'ac.code = ie.account_code', 'left')
->join('T_SupplierDetailsN sd ', 'sd.SupplierID = ie.Supplier_id', 'left')
->join('t_supplierdetailsn sd ', 'sd.SupplierID = ie.Supplier_id', 'left')
->where('ie.account_code', $accountcode)
->where('ie.amounttype', 'CREDIT')
->where('ie.IsActive', 1);
@ -1143,7 +1143,7 @@ GROUP BY financial_year";
}
function newcashbook()
{
$builder = $this->db->table('T_Bankmappingcashbook')
$builder = $this->db->table('t_bankmappingcashbook')
->select('cdate,mid,btype,amount,boption,mappingamount,totalamount,amounttype,alreadycreditpaid');
//->where('mid',$bankid);
@ -1154,9 +1154,9 @@ GROUP BY financial_year";
function debitlistpo($pono)
{
$builder = $this->db->table('T_Bankmappingpo as bmp')
$builder = $this->db->table('t_bankmappingpo as bmp')
->select('bmp.mid,bmp.PONO,bmp.IGRLineItemNo,bmp.Amountpaid,br.Narration')
->join('T_bankreport br', 'br.ID = bmp.mid')
->join('t_bankreport br', 'br.ID = bmp.mid')
->where('bmp.PONO', $pono)
->where('bmp.IsActive', 1);
$query = $builder->get();
@ -1165,9 +1165,9 @@ GROUP BY financial_year";
function creditlistinv($invno)
{
$builder = $this->db->table('T_Bankmappingiv as bmp')
$builder = $this->db->table('t_bankmappingiv as bmp')
->select('bmp.bankid,bmp.invoiceno,bmp.amountreceived,br.Narration')
->join('T_bankreport br', 'br.ID = bmp.bankid')
->join('t_bankreport br', 'br.ID = bmp.bankid')
->where('invoiceno', $invno)
->where('bmp.IsActive', 1);
//->groupBy('invoiceno');
@ -1177,7 +1177,7 @@ GROUP BY financial_year";
function getsupplier()
{
$builder = $this->db->table('T_SupplierDetailsN')->select('SupplierName,SupplierID');
$builder = $this->db->table('t_supplierdetailsn')->select('SupplierName,SupplierID');
//->join('t_accountcode','t_income_expense.account_code=t_accountcode.code')
//->where('t_income_expense.id')
$r = $builder->get();
@ -1188,7 +1188,7 @@ GROUP BY financial_year";
{
$temp[] = '';
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->distinct()
->select('SupplierID,SupplierName')
->like('SupplierName', $mer);
@ -1205,7 +1205,7 @@ GROUP BY financial_year";
function getsupp_dtls($s)
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('GSTNO')
->where('SupplierName', $s);
$r = $builder->get();
@ -1224,7 +1224,7 @@ GROUP BY financial_year";
}
function invoicedata($invoicedata)
{
$builder = $this->db->table('T_Bankinvoicereport');
$builder = $this->db->table('t_bankinvoicereport');
$builder->insert($invoicedata);
// ->where('PONO',$pono);
$res = $this->db->affectedRows();
@ -1232,28 +1232,28 @@ GROUP BY financial_year";
}
function bankporeportdata($igrdata)
{
$builder = $this->db->table('T_Bankporeport');
$builder = $this->db->table('t_bankporeport');
$builder->insert($igrdata);
$res = $this->db->affectedRows();
return $res;
}
// function invicedata($invoicedata)
// {
// $builder = $this->db->table('T_Bankinvoicereport');
// $builder = $this->db->table('t_bankinvoicereport');
// $builder->insert($invoicedata);
// $res = $this->db->affectedRows();
// return $res;
// }
function mappingpo($igrdata1)
{
$builder = $this->db->table('T_Bankmappingpo');
$builder = $this->db->table('t_bankmappingpo');
$builder->insert($igrdata1);
$res = $this->db->affectedRows();
return $res;
}
function mappinginvoice($invoicedata)
{
$builder = $this->db->table('T_Bankmappingiv');
$builder = $this->db->table('t_bankmappingiv');
$builder->insert($invoicedata);
$res = $this->db->affectedRows();
return $res;
@ -1262,7 +1262,7 @@ GROUP BY financial_year";
public function getigrno($igrno)
{
$builder = $this->db->table('T_Bankporeport')
$builder = $this->db->table('t_bankporeport')
->select('igrno')
->where('IGRNO', $igrno);
$query = $builder->get();
@ -1272,7 +1272,7 @@ GROUP BY financial_year";
public function invoiceupdate($invid)
{
$builder = $this->db->table('T_Bankinvoicereport')
$builder = $this->db->table('t_bankinvoicereport')
->select('invoiceno')
->where('invoiceno', $invid);
$query = $builder->get();
@ -1282,7 +1282,7 @@ GROUP BY financial_year";
public function bankid($pono)
{
$builder = $this->db->table('T_Bankporeport')
$builder = $this->db->table('t_bankporeport')
->select('PONO')
->where('PONO ', $pono);
$query = $builder->get();
@ -1292,7 +1292,7 @@ GROUP BY financial_year";
public function cashbankupdate($cashbookstatus, $bankid)
{
// echo $bankid;
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->where('ID', $bankid)
->update($cashbookstatus);
return TRUE;
@ -1300,21 +1300,21 @@ GROUP BY financial_year";
function cashcreditupdate($cashbookstatus1, $bankid)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->where('ID', $bankid)
->update($cashbookstatus1);
return TRUE;
}
public function bankupdate($bankdata, $bankid)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->where('ID', $bankid)
->update($bankdata);
return TRUE;
}
public function bankcreditupdate($bankcreditdata, $bankid)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->where('ID', $bankid)
->update($bankcreditdata);
return TRUE;
@ -1322,7 +1322,7 @@ GROUP BY financial_year";
public function getearlyamount($igrno)
{
$builder = $this->db->table('T_Bankporeport')
$builder = $this->db->table('t_bankporeport')
->select('Amountpaid')
->where('IGRNO ', $igrno);
$query = $builder->get();
@ -1332,7 +1332,7 @@ GROUP BY financial_year";
public function getearlyamountcredit($invid)
{
$builder = $this->db->table('T_Bankinvoicereport')
$builder = $this->db->table('t_bankinvoicereport')
->select('amountreceived')
->where('invoiceno ', $invid);
$query = $builder->get();
@ -1342,7 +1342,7 @@ GROUP BY financial_year";
public function getearlymappingiv($invid)
{
$builder = $this->db->table('T_Bankmappingiv')
$builder = $this->db->table('t_bankmappingiv')
->select('sum(amountreceived) as amountreceived')
->where('invoiceno', $invid)
->where('IsActive', 1);
@ -1352,7 +1352,7 @@ GROUP BY financial_year";
}
public function getalreadypaid($bankid)
{
$builder = $this->db->table('T_bankreport')->select('Clearbalance')
$builder = $this->db->table('t_bankreport')->select('Clearbalance')
->where('ID ', $bankid);
$query = $builder->get();
@ -1360,7 +1360,7 @@ GROUP BY financial_year";
}
public function getalreadyreceived($bankid)
{
$builder = $this->db->table('T_bankreport')->select('cclearbalance')
$builder = $this->db->table('t_bankreport')->select('cclearbalance')
->where('ID ', $bankid);
$query = $builder->get();
@ -1369,7 +1369,7 @@ GROUP BY financial_year";
public function bankporeportupdate($igrdata, $igrno)
{
$this->db->table('T_Bankporeport')
$this->db->table('t_bankporeport')
->where('IGRNO', $igrno)
->update($igrdata);
@ -1379,7 +1379,7 @@ GROUP BY financial_year";
{
//print_r($invoicedata);
//print_r($invid);
$this->db->table('T_Bankinvoicereport')
$this->db->table('t_bankinvoicereport')
->where('invoiceno', $invid)
->update($invoicedata);
@ -1388,14 +1388,14 @@ GROUP BY financial_year";
function paided($supplierid, $fa, $aa, $m, $fdate, $tdate)
{
$builder = $this->db->table('T_Bankmappingpo bm')
$builder = $this->db->table('t_bankmappingpo bm')
->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.Totalpoamount,bm.Podate,bm.BankDate,
bm.Balancetopay,bm.Amountpaid,bm.IGRNO,bm.IGRLineItemNo,br.Balancetocleared,br.Clearbalance,
inward.FilePath as igrfile,bu.FilePath pofile')
//->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo')
->join('T_Inwardgateregister_fileupload inward', 'inward.IGRNO =bm.IGRNO', 'left')
->join('T_PurchaseOrder_BillUpload bu', 'bm.PONO=bu.PONO', 'left')
->join('T_bankreport br', 'br.ID=bm.mid', 'left')
//->join('t_igr_details igr','igr.IGRItemNo=bm.IGRLineItemNo')
->join('t_inwardgateregister_fileupload inward', 'inward.IGRNO =bm.IGRNO', 'left')
->join('t_purchaseorder_billupload bu', 'bm.PONO=bu.PONO', 'left')
->join('t_bankreport br', 'br.ID=bm.mid', 'left')
->where('bm.SupplierID', $supplierid)
->where('bm.IsActive', 1)
// ->where('igr.BankStatus !=',ST072);
@ -1426,10 +1426,10 @@ GROUP BY financial_year";
}
function amountpaidsupplierwise()
{
$builder = $this->db->table('T_Bankmappingpo bm')
$builder = $this->db->table('t_bankmappingpo bm')
->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.SupplierID,bm.Totalpoamount,bm.Podate,
bm.Balancetopay,sum(bm.Amountpaid) as Amountpaid,bm.IGRNO,bm.IGRLineItemNo')
//->join('T_IGR_Details igr','igr.IGRItemNo=bm.IGRLineItemNo')
//->join('t_igr_details igr','igr.IGRItemNo=bm.IGRLineItemNo')
->where('bm.IsActive', 1)
// ->where('igr.BankStatus !=',ST072)
->groupBy('bm.SupplierID');
@ -1533,7 +1533,7 @@ GROUP BY financial_year";
function amountpaidsupplierwisefilter($fa, $aa, $m, $fdate, $tdate)
{
$builder = $this->db->table('T_Bankmappingpo bm')
$builder = $this->db->table('t_bankmappingpo bm')
->select('bm.id,bm.mid,bm.PONO,bm.Suppliername,bm.SupplierID,sum(bm.Totalpoamount)as Totalpoamount,
bm.Balancetopay,sum(bm.Amountpaid) as Amountpaid,bm.Podate,bm.IGRLineItemNo,bm.BankDate')
->where('bm.IsActive', 1);
@ -1567,11 +1567,11 @@ GROUP BY financial_year";
// function unpaided()
// {
// // ->select('igd.IGRNO,igd.IGRItemNo,pom.PONO,sm.SupplierName');
// // $builder = $this->db->table('T_IGR_Details igd');
// // ->join('T_IGR_Master igm','igm.IGRNO=igd.IGRNO');
// // ->join('T_PurchaseOrder_LineItem poli','igm.PONO= poli.PONO and igd.MaterialCode=poli.MaterialCode');
// // ->join('T_PurchaseOrder_Master pom','pom.PONO=poli.PONO');
// // ->join('T_SupplierDetailsN sm','sm.SupplierID=pom.SupplierID');
// // $builder = $this->db->table('t_igr_details igd');
// // ->join('t_igr_master igm','igm.IGRNO=igd.IGRNO');
// // ->join('t_purchaseorder_lineitem poli','igm.PONO= poli.PONO and igd.MaterialCode=poli.MaterialCode');
// // ->join('t_purchaseorder_master pom','pom.PONO=poli.PONO');
// // ->join('t_supplierdetailsn sm','sm.SupplierID=pom.SupplierID');
// // ->where('igd.BankStatus','ST072');
// // $query =$builder->get();
// // $result = $query->getResult();
@ -1580,11 +1580,11 @@ GROUP BY financial_year";
// }
function received($clientid, $fdate, $tdate, $fa, $aa, $m)
{
$builder = $this->db->table('T_Bankmappingiv bm')
$builder = $this->db->table('t_bankmappingiv bm')
->select('bm.indate,bm.BankDate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,bm.customerid,
bm.balancetoreceived,bm.amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared,bm.IsActive')
->join('ip_invoices iv', 'iv.invoice_number=bm.invoiceno')
->join('T_bankreport br', 'br.ID=bm.bankid')
->join('t_bankreport br', 'br.ID=bm.bankid')
->where('bm.IsActive', 1)
->where('bm.customerid', $clientid)
->where('iv.receivedstatus !=', 'ST066');
@ -1610,10 +1610,10 @@ GROUP BY financial_year";
function creditinvoicesupplierwise()
{
$builder = $this->db->table('T_Bankmappingiv bm')
$builder = $this->db->table('t_bankmappingiv bm')
->select('bm.indate,bm.invoiceno,bm.customername,bm.totinvoiceamount,bm.bankid,ic.client_id,bm.customerid as customerid,
bm.balancetoreceived,sum(bm.amountreceived)as amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared')
->join('T_bankreport br', 'br.ID=bm.bankid')
->join('t_bankreport br', 'br.ID=bm.bankid')
->join('ip_invoices iv', 'iv.invoice_number=bm.invoiceno')
->join('ip_clients ic', 'ic.client_name=bm.customername', 'left')
->where('bm.IsActive', 1)
@ -1624,11 +1624,11 @@ GROUP BY financial_year";
}
function creditinvoicewisefilter($fdate, $tdate, $fa, $aa, $m)
{
$builder = $this->db->table('T_Bankmappingiv bm')
$builder = $this->db->table('t_bankmappingiv bm')
->select('bm.indate,bm.BankDate,bm.invoiceno,bm.customername,bm.customerid as customerid,bm.totinvoiceamount,bm.bankid,ic.client_id,
bm.balancetoreceived,sum(bm.amountreceived)as amountreceived,bm.ID,br.Credit,br.cclearbalance,br.cbalancetocleared')
->join('ip_invoices iv', 'iv.invoice_number=bm.invoiceno')
->join('T_bankreport br', 'br.ID=bm.bankid')
->join('t_bankreport br', 'br.ID=bm.bankid')
->join('ip_clients ic', 'ic.client_name=bm.customername', 'left')
->where('bm.IsActive', 1)
->where('iv.receivedstatus !=', 'ST066');
@ -1666,7 +1666,7 @@ GROUP BY financial_year";
->select('iva.invoice_id,iva.invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_name,BI.balancetoreceived,BI.amountreceived,ic.client_id')
->join('ip_invoices iv', 'iva.invoice_id = iv.invoice_id', 'left')
->join('ip_clients ic', 'iv.client_id = ic.client_id', 'left')
->join('T_Bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->join('t_bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->where('iv.receivedstatus', 'ST066')
->where('iv.invoice_status_id', '2')
->where('ic.client_id', $clientname);
@ -1698,7 +1698,7 @@ GROUP BY financial_year";
->select('iva.invoice_id,sum(iva.invoice_total)as invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_id,ic.client_name,BI.balancetoreceived,sum(BI.amountreceived)as amountreceived')
->join('ip_invoices iv', 'iva.invoice_id = iv.invoice_id', 'left')
->join('ip_clients ic', 'iv.client_id = ic.client_id', 'left')
->join('T_Bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->join('t_bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->where('iv.receivedstatus', 'ST066')
->where('iv.invoice_status_id', '2')
->groupBy('ic.client_name');
@ -1712,7 +1712,7 @@ GROUP BY financial_year";
->select('iva.invoice_id,sum(iva.invoice_total)as invoice_total,iv.invoice_date_created,iv.invoice_number,iva.invoice_paid,ic.client_id,ic.client_name,BI.balancetoreceived,sum(BI.amountreceived)as amountreceived')
->join('ip_invoices iv', 'iva.invoice_id = iv.invoice_id', 'left')
->join('ip_clients ic', 'iv.client_id = ic.client_id', 'left')
->join('T_Bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->join('t_bankinvoicereport BI', ' iv.invoice_number =BI.invoiceno', 'left')
->where('iv.receivedstatus', 'ST066')
->where('iv.invoice_status_id', '2');
@ -1748,7 +1748,7 @@ GROUP BY financial_year";
// function podetailstatus($podetails,$pono)
// {
// echo $igrdetails;
// $this->db->table('T_PurchaseOrder_Master')
// $this->db->table('t_purchaseorder_master')
// ->where('PONO',$pono);
// ->update($podetails);
// $r = ->affectedRows();
@ -1765,7 +1765,7 @@ GROUP BY financial_year";
}
function igrstatus($igrmaster, $igrno)
{
$this->db->table('T_IGR_Master')
$this->db->table('t_igr_master')
->where('IGRNO', $igrno)
->update($igrmaster);
$count = $this->db->affectedRows();
@ -1809,7 +1809,7 @@ GROUP BY financial_year";
}
function deletemapping($Bankid, $updateamount, $updatebalancetoclear, $Status)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->set('Clearbalance', $updateamount)
->set('Balancetocleared', $updatebalancetoclear)
->set('Status', $Status)
@ -1820,7 +1820,7 @@ GROUP BY financial_year";
}
function updatebankreportiv($bankid, $bankstatement)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->where('ID', $bankid)
->update($bankstatement);
$count = $this->db->affectedRows();
@ -1828,7 +1828,7 @@ GROUP BY financial_year";
}
function IGRStatusUpdate($igrno, $PaymentStatus)
{
$this->db->table('T_IGR_Master')
$this->db->table('t_igr_master')
->set('Paymentstatus', $PaymentStatus)
->where('IGRNO', $igrno)
->update();
@ -1837,7 +1837,7 @@ GROUP BY financial_year";
}
function deleteBankmappingpo($id, $IsActive)
{
$this->db->table('T_Bankmappingpo')
$this->db->table('t_bankmappingpo')
->set('IsActive', $IsActive)
->where('id', $id)
->update();
@ -1847,11 +1847,11 @@ GROUP BY financial_year";
// function updatemappingamount($igrno,$amountpaid)
// {
// $sql="update T_Bankmappingpo set Balancetopay=$amountpaid+Balancetopay where IGRLineItemNo='$igrno' and
// $sql="update t_bankmappingpo set Balancetopay=$amountpaid+Balancetopay where IGRLineItemNo='$igrno' and
// IsActive='1'";
// $query = ->query($sql);
// return $query->getResult();
// $this->db->table('T_Bankmappingpo')
// $this->db->table('t_bankmappingpo')
// // ->set('Balancetopay',$amountpaid+'Balancetopay');
// // //->set('Balancetopay',$amountpaid);
// // ->where('IGRLineItemNo',$igrno);
@ -1872,7 +1872,7 @@ GROUP BY financial_year";
function deletemappinginvoice($mappingid, $IsActive)
{
$this->db->table('T_Bankmappingiv')
$this->db->table('t_bankmappingiv')
->set('IsActive', $IsActive)
->where('ID', $mappingid)
->update();
@ -1884,7 +1884,7 @@ GROUP BY financial_year";
// ->set('balancetoreceived',$amountreceived+'balancetoreceived');
// ->where('invoiceno',$invoiceno);
// ->where('IsActive',1);
// ->update('T_Bankmappingiv');
// ->update('t_bankmappingiv');
// $query =$builder->get();
// print_r(this->db->last_query());
// $r = ->affectedRows();
@ -1893,7 +1893,7 @@ GROUP BY financial_year";
function updateBankporeport($igrno, $balancetopayupdate, $amountpaidupdate, $IsAct)
{
$this->db->table('T_Bankporeport')
$this->db->table('t_bankporeport')
->set('Balancetopay', $balancetopayupdate)
->set('Amountpaid', $amountpaidupdate)
->set('IsActive', $IsAct)
@ -1906,7 +1906,7 @@ GROUP BY financial_year";
function updatebankinvoicereport($invoiceno, $balancetoreceivedupdate, $amountreceivedupdate, $IsAct)
{
$this->db->table('T_Bankinvoicereport')
$this->db->table('t_bankinvoicereport')
->set('balancetoreceived', $balancetoreceivedupdate)
->set('amountreceived', $amountreceivedupdate)
->set('IsActive', $IsAct)
@ -1918,85 +1918,85 @@ GROUP BY financial_year";
}
function gettotalbankmappingpo($id)
{
$builder = $this->db->table('T_Bankmappingpo')
$builder = $this->db->table('t_bankmappingpo')
->select('sum(Amountpaid)as Amountpaid')
->where('id', $id)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function gettotalbankmappingpocount($igrno)
{
$builder = $this->db->table('T_Bankmappingpo')
$builder = $this->db->table('t_bankmappingpo')
->select('count(Amountpaid)as countAmountpaid')
->where('IGRNO', $igrno)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function gettotalbankmappinginvoicecount($invoiceno)
{
$builder = $this->db->table('T_Bankmappingiv')
$builder = $this->db->table('t_bankmappingiv')
->select('count(amountreceived)as countamountreceived')
->where('invoiceno', $invoiceno)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function gettotalbankpoamount($igrno)
{
$builder = $this->db->table('T_Bankporeport')
$builder = $this->db->table('t_bankporeport')
->select('Amountpaid,Balancetopay')
->where('IGRNO', $igrno)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function gettotalbankreceivedamount($invoiceno)
{
$builder = $this->db->table('T_Bankinvoicereport')
$builder = $this->db->table('t_bankinvoicereport')
->select('amountreceived,balancetoreceived')
->where('invoiceno', $invoiceno)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function gettotalbankporeport($igrno)
{
$builder = $this->db->table('T_Bankporeport')->select('Amountpaid')
$builder = $this->db->table('t_bankporeport')->select('Amountpaid')
->where('IGRLineItemNo', $igrno)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function getlatestamount($mappingid, $invoiceno)
{
$builder = $this->db->table('T_Bankmappingiv')
$builder = $this->db->table('t_bankmappingiv')
->select('min(balancetoreceived)as balancetoreceived')
->where('ID', $mappingid)
->where('invoiceno', $invoiceno)
->where('IsActive', 1);
//->groupBy('T_Bankmappingpo.IGRLineItemNo');
//->groupBy('t_bankmappingpo.IGRLineItemNo');
$query = $builder->get();
return $query->getResult();
}
function getlatest($invoiceno)
{
$sql = "select ID,balancetoreceived from T_Bankmappingiv where invoiceno='$invoiceno' and
ID in(select max(ID) from T_Bankmappingiv group by invoiceno)";
$sql = "select ID,balancetoreceived from t_bankmappingiv where invoiceno='$invoiceno' and
ID in(select max(ID) from t_bankmappingiv group by invoiceno)";
$query = $this->db->query($sql);
return $query->getResult();
}
function deletecashbookdata($Bankid, $updatebankamount, $clearbalance)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->set('Clearbalance', $clearbalance)
->set('Balancetocleared', $updatebankamount)
->where('ID', $Bankid)
@ -2007,7 +2007,7 @@ GROUP BY financial_year";
}
function deletecashbookdatacredit($Bankid, $updateclearbalance, $updatebalancetoclear)
{
$this->db->table('T_bankreport')
$this->db->table('t_bankreport')
->set('cclearbalance', $updateclearbalance)
->set('cbalancetocleared', $updatebalancetoclear)
->where('ID', $Bankid)

26
app/Models/Companydetails_model.php
View File

@ -15,7 +15,7 @@ class Companydetails_model extends Model
//inserted data into companydetails table//
function Companyadd($Company)
{
$builder = $this->db->table('T_Company_Details');
$builder = $this->db->table('t_company_details');
$builder->insert($Company);
$res = $this->db->affectedRows();
return $res;
@ -55,7 +55,7 @@ class Companydetails_model extends Model
function Updatecompany($Comp, $CompID)
{
$this->db->table('T_Company_Details')
$this->db->table('t_company_details')
->where('CompID', $CompID)
->update($Comp);
$res = $this->db->affectedRows();
@ -65,7 +65,7 @@ class Companydetails_model extends Model
function checkPhotoExists($Pic)
{
$builder = $this->db->table('T_Company_Details')
$builder = $this->db->table('t_company_details')
->select('ProfilePic')
->where($Pic);
$query = $builder->get();
@ -77,11 +77,11 @@ class Companydetails_model extends Model
// updated by //
function companylisting()
{
$builder = $this->db->table('T_Company_Details com')
$builder = $this->db->table('t_company_details com')
->select('com.*,emp.firstname,pmt.PaymentTerms')
->join('T_PaymentTerms pmt', 'com.paymentID = pmt.PaymentID', 'left')
->join('t_paymentterms pmt', 'com.paymentID = pmt.PaymentID', 'left')
->join('tbl_users as tbl', ' com.createdby = tbl.userid', 'left')
->join('T_Employee_Details as emp', 'emp.empid=tbl.empid', 'left');
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left');
$query = $builder->get();
$result = $query->getResult();
return $result;
@ -92,14 +92,14 @@ class Companydetails_model extends Model
// {
// $ConfigID = 'C009';
// ->select('ConfigValue');
// $builder = $this->db->table('T_ConfigDetails');
// $builder = $this->db->table('t_configdetails');
// $this->db->where('Config_ID ',$ConfigID );
// $query =$builder->get();
// return $query->getResult();
// }
function getPaymentTerms()
{
$builder = $this->db->table('T_PaymentTerms')->select('*');
$builder = $this->db->table('t_paymentterms')->select('*');
$query = $builder->get();
$result = $query->getResult();
return $result;
@ -110,7 +110,7 @@ class Companydetails_model extends Model
function getfilename($Configvalue = '')
{
$ConfigID = 'C025';
$builder = $this->db->table('T_ConfigDetails')->select('ConfigValue')
$builder = $this->db->table('t_configdetails')->select('ConfigValue')
->where('Config_ID ', $ConfigID);
$query = $builder->get();
return $query->getResult();
@ -121,7 +121,7 @@ class Companydetails_model extends Model
function getBankDetails()
{
$builder = $this->db->table('T_Bank_Details')->select('*');
$builder = $this->db->table('t_bank_details')->select('*');
$query = $builder->get();
$result = $query->getResult();
@ -135,7 +135,7 @@ class Companydetails_model extends Model
$bankifsc = $Bank['IFSC'];
$count = 0;
$builder = $this->db->table('T_Bank_Details')->select('count(*) as count')
$builder = $this->db->table('t_bank_details')->select('count(*) as count')
->where('Bank_name', $bankname)
->where('IFSC', $bankifsc);
@ -150,12 +150,12 @@ class Companydetails_model extends Model
if ($count == 0) {
$builder = $this->db->table('T_Bank_Details');
$builder = $this->db->table('t_bank_details');
$builder->insert($Bank);
$res = $this->db->affectedRows();
return $res;
} elseif ($count == 1) {
$this->db->table('T_Bank_Details')
$this->db->table('t_bank_details')
->where('Bank_name', $bankname)
->where('IFSC', $bankifsc)
->update($Bank);

36
app/Models/Config_model.php
View File

@ -16,10 +16,10 @@ class Config_model extends Model
*/
function Configlisting()
{
$builder = $this->db->table('T_ConfigMaster as Config')
$builder = $this->db->table('t_configmaster as Config')
->select('Config.Config_ID, Config.ConfigName ,Config.Comments,Config.CreatedDate')
// ->join('T_ConfigDetails as Con','Con.Config_ID=Config.Config_ID')
// ->join('t_configdetails as Con','Con.Config_ID=Config.Config_ID')
->orderBy('Config.CreatedDate', 'desc');
//->orderBy('hourlyid','desc');
@ -37,12 +37,12 @@ class Config_model extends Model
public function addconfigmaster($config)
{
$this->db->transStart();
$builder = $this->db->table('T_ConfigMaster');
$builder = $this->db->table('t_configmaster');
$builder->insert($config);
$aff_row = $this->db->affectedRows();
$this->db->transComplete();
$sql = 'SELECT MAX(Config_ID) as Config_ID FROM T_ConfigMaster';
$sql = 'SELECT MAX(Config_ID) as Config_ID FROM t_configmaster';
$row = $this->db->query($sql)->getRow();
$res = ($aff_row && $row !== null) ? $row->Config_ID : 0;
@ -57,7 +57,7 @@ class Config_model extends Model
{
//print_r($configvalue);
$this->db->transStart();
$builder = $this->db->table('T_ConfigDetails');
$builder = $this->db->table('t_configdetails');
$builder->insert($configvalue);
$res = $this->db->affectedRows();
$this->db->transComplete();
@ -71,8 +71,8 @@ class Config_model extends Model
function GetBudgetTypeNotinCostCenter($CostCenterCode, $ConfigID)
{
$subQuery = 'select ConfigValue from T_ConfigDetails Bud where ConfigValue not in
(select BudgetType from T_CostCenter_Budget where CostCenterCode=? and BudgetYear=(select max(BudgetYear) from T_CostCenter_Budget)) and Config_ID=?';
$subQuery = 'select ConfigValue from t_configdetails Bud where ConfigValue not in
(select BudgetType from t_costcenter_budget where CostCenterCode=? and BudgetYear=(select max(BudgetYear) from t_costcenter_budget)) and Config_ID=?';
$query = $this->db->query($subQuery, array($CostCenterCode, $ConfigID));
@ -84,9 +84,9 @@ class Config_model extends Model
function GetConfigCenterMaster($ConfigID = '')
{
$builder = $this->db->table('T_ConfigMaster')
$builder = $this->db->table('t_configmaster')
->select('*')
//->join('T_ConfigDetails con','con.Config_ID = COM.Config_ID','left')
//->join('t_configdetails con','con.Config_ID = COM.Config_ID','left')
->where('Config_ID', $ConfigID);
$query = $builder->get();
@ -97,9 +97,9 @@ class Config_model extends Model
function GetConfigCenterDetails($ConfigID = '')
{
//echo $ConfigID ;die();
$builder = $this->db->table('T_ConfigMaster COM')
$builder = $this->db->table('t_configmaster COM')
->select('*')
->join('T_ConfigDetails con', 'con.Config_ID = COM.Config_ID', 'left')
->join('t_configdetails con', 'con.Config_ID = COM.Config_ID', 'left')
->where('COM.Config_ID', $ConfigID);
$query = $builder->get();
@ -109,7 +109,7 @@ class Config_model extends Model
function updateconfig($config, $Configid)
{
$this->db->table('T_ConfigMaster')
$this->db->table('t_configmaster')
->where('Config_ID', $Configid)
->update($config);
@ -118,7 +118,7 @@ class Config_model extends Model
}
function updateconfigdetails($configval, $Key)
{
$this->db->table('T_ConfigDetails')
$this->db->table('t_configdetails')
->where('Key', $Key)
->update($configval);
$res = $this->db->affectedRows();
@ -129,7 +129,7 @@ class Config_model extends Model
function EditBudget($Budget)
{
$this->db->transStart();
$builder = $this->db->table('T_CostCenter_Budget');
$builder = $this->db->table('t_costcenter_budget');
$builder->insert($Budget);
@ -142,17 +142,17 @@ class Config_model extends Model
function DeleteBudget($BudgetType = '', $BudgetYear = '', $CostCenterCode = '')
{
$this->db->table('T_CostCenter_Budget')->delete(['BudgetType' => $BudgetType, 'BudgetYear' => $BudgetYear, 'CostCenterCode' => $CostCenterCode]);
$this->db->table('t_costcenter_budget')->delete(['BudgetType' => $BudgetType, 'BudgetYear' => $BudgetYear, 'CostCenterCode' => $CostCenterCode]);
}
function DeleteDepartment($DepCode = '', $CostCode = '')
{
$this->db->table('T_CostCenter_Departments')->delete(['DEPCode' => $DepCode, 'CostCenterCode' => $CostCode]);
$this->db->table('t_costcenter_departments')->delete(['DEPCode' => $DepCode, 'CostCenterCode' => $CostCode]);
}
function checkDeptCostExists($DepCode = '', $CostCode = '')
{
$builder = $this->db->table('T_CostCenter_Departments')
$builder = $this->db->table('t_costcenter_departments')
->select('CostCenterCode,DEPCode')
->where('DEPCode', $DepCode)
->where('CostCenterCode', $CostCode);
@ -171,7 +171,7 @@ class Config_model extends Model
*/
function getConfigValue($ConfigID)
{
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('ConfigValue')
->where('Config_id ', $ConfigID);
$query = $builder->get();

94
app/Models/Costcenter_model.php
View File

@ -15,10 +15,10 @@ class Costcenter_model extends Model
*/
function CostListing()
{
$builder = $this->db->table('T_CostCenter_Master as Cost')
$builder = $this->db->table('t_costcenter_master as Cost')
->select('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');
$query =$builder->get();
@ -35,7 +35,7 @@ class Costcenter_model extends Model
function saveCostCenter($Cost)
{
$this->db->transStart();
$builder = $this->db->table('T_CostCenter_Master');
$builder = $this->db->table('t_costcenter_master');
$builder->insert($Cost);
$insert_id = $this->db->affectedRows();
@ -47,7 +47,7 @@ function saveCostCenter($Cost)
function getFiscalYear()
{
$builder = $this->db->table('T_Company_Details')
$builder = $this->db->table('t_company_details')
->select('year(FiscalYearStartOn) as StartYear,year(FiscalYearEndsOn) as EndYear');
$query =$builder->get();
@ -57,7 +57,7 @@ function saveCostCenter($Cost)
function addCostCenterDepartment($Dept)
{
$this->db->transStart();
$builder = $this->db->table('T_CostCenter_Departments');
$builder = $this->db->table('t_costcenter_departments');
$builder->insert($Dept);
$insert_id = $this->db->affectedRows();
@ -71,7 +71,7 @@ function saveCostCenter($Cost)
function addBudget($Budget)
{
$this->db->transStart();
$builder = $this->db->table('T_CostCenter_Budget');
$builder = $this->db->table('t_costcenter_budget');
$builder->insert($Budget);
$insert_id = $this->db->affectedRows();
@ -83,7 +83,7 @@ function saveCostCenter($Cost)
function getApproverName()
{
$builder = $this->db->table('T_Employee_Details')
$builder = $this->db->table('t_employee_details')
->select('EmpID,FirstName,LastName,Designation')
->where('Departmentcode ', 'DEP10');
@ -114,11 +114,11 @@ function saveCostCenter($Cost)
*/
function GetCostCenterMaster($CostCenterCode)
{
$builder = $this->db->table('T_CostCenter_Master Cost')
$builder = $this->db->table('t_costcenter_master Cost')
->select('Cost.CostCenterCode,Cost.CostCenterName,Cost.ApprovedBy,emp.FirstName,emp.Designation,max(BudgetYear) as BudYear' )
->join('T_Employee_Details emp', 'emp.EmpID = Cost.ApprovedBy')
->join('T_CostCenter_Budget Bud', ' Bud.CostCenterCode = Cost.CostCenterCode')
->join('t_employee_details emp', 'emp.EmpID = Cost.ApprovedBy')
->join('t_costcenter_budget Bud', ' Bud.CostCenterCode = Cost.CostCenterCode')
->where('Cost.CostCenterCode', $CostCenterCode);
$query =$builder->get();
@ -132,9 +132,9 @@ function saveCostCenter($Cost)
*/
function GetCostCenterDepartment($CostCenterCode)
{
$builder = $this->db->table('T_CostCenter_Departments Dept')
$builder = $this->db->table('t_costcenter_departments Dept')
->select('Dept.DEPCode,Det.DepartmentName')
->join('T_DepartmentDetails Det', 'Det.DEPCode = Dept.DEPCode')
->join('t_departmentdetails Det', 'Det.DEPCode = Dept.DEPCode')
->where('Dept.CostCenterCode', $CostCenterCode);
$query =$builder->get();
@ -148,7 +148,7 @@ function saveCostCenter($Cost)
function GetBudgetYear($CostCenterCode)
{
$subQuery = 'select BudgetYear from T_CostCenter_Budget where CostCenterCode=? ';
$subQuery = 'select BudgetYear from t_costcenter_budget where CostCenterCode=? ';
$query = $this->db->query($subQuery, array($CostCenterCode));
@ -163,8 +163,8 @@ function saveCostCenter($Cost)
function GetCostCenterBudget($CostCenterCode)
{
$subQuery = 'select BudgetType,BudgetYear,BudgetAmount,Remarks from T_CostCenter_Budget where CostCenterCode=? and
BudgetYear=(select max(BudgetYear) from T_CostCenter_Budget where CostCenterCode=?)';
$subQuery = 'select BudgetType,BudgetYear,BudgetAmount,Remarks from t_costcenter_budget where CostCenterCode=? and
BudgetYear=(select max(BudgetYear) from t_costcenter_budget where CostCenterCode=?)';
$query = $this->db->query($subQuery, array($CostCenterCode,$CostCenterCode));
@ -179,8 +179,8 @@ function saveCostCenter($Cost)
function GetCostBudgetTypeByYear($CostCenterCode,$ConfigID,$Year)
{
$subQuery = 'select ConfigValue from T_ConfigDetails Bud where ConfigValue not in
(select BudgetType from T_CostCenter_Budget where CostCenterCode=? and BudgetYear=?) and Config_ID=? ';
$subQuery = 'select ConfigValue from t_configdetails Bud where ConfigValue not in
(select BudgetType from t_costcenter_budget where CostCenterCode=? and BudgetYear=?) and Config_ID=? ';
$query = $this->db->query($subQuery, array($CostCenterCode,$Year,$ConfigID));
@ -196,7 +196,7 @@ function saveCostCenter($Cost)
function GetCostCenterBudgetByYear($CostCenterCode,$Year)
{
$subQuery = 'select BudgetType,BudgetYear,BudgetAmount,Remarks from T_CostCenter_Budget where CostCenterCode=? and
$subQuery = 'select BudgetType,BudgetYear,BudgetAmount,Remarks from t_costcenter_budget where CostCenterCode=? and
budgetyear=?';
@ -213,9 +213,9 @@ function saveCostCenter($Cost)
function GetDepartmentNotinCostCenter($CostCenterCode)
{
$subQuery = 'select Dept.DEPCode,Dept.DepartmentName from T_DepartmentDetails Dept
$subQuery = 'select Dept.DEPCode,Dept.DepartmentName from t_departmentdetails Dept
where Dept.DEPCode not in
(select DEPCode from T_CostCenter_Departments where CostCenterCode=?) order by Dept.DEPCode asc';
(select DEPCode from t_costcenter_departments where CostCenterCode=?) order by Dept.DEPCode asc';
$query = $this->db->query($subQuery, array($CostCenterCode));
@ -228,10 +228,10 @@ function saveCostCenter($Cost)
function getDepartmentnotadded($Empid)
{
$subQuery = 'select Dept.DEPCode,Dept.DepartmentName from T_DepartmentDetails Dept
left join T_AccessDepartments Ass on Ass.Departmentcode= Dept.DEPCode
$subQuery = 'select Dept.DEPCode,Dept.DepartmentName from t_departmentdetails Dept
left join t_accessdepartments Ass on Ass.Departmentcode= Dept.DEPCode
where Dept.DEPCode not in
(select Ass.Departmentcode from T_AccessDepartments Ass where EmpID=?) group by Dept.DEPCode';
(select Ass.Departmentcode from t_accessdepartments Ass where EmpID=?) group by Dept.DEPCode';
$query = $this->db->query($subQuery, array($Empid));
@ -242,9 +242,9 @@ where Dept.DEPCode not in
function getaccessDept($Empid)
{
$builder = $this->db->table('T_AccessDepartments Ass')
$builder = $this->db->table('t_accessdepartments Ass')
->select('Ass.Departmentcode as AssDep,Dep.DepartmentName')
->join('T_DepartmentDetails Dep', 'Dep.DEPCode = Ass.Departmentcode','left')
->join('t_departmentdetails Dep', 'Dep.DEPCode = Ass.Departmentcode','left')
->where('EmpID ',$Empid);
$query =$builder->get();
@ -261,8 +261,8 @@ where Dept.DEPCode not in
function GetBudgetTypeNotinCostCenter($CostCenterCode,$ConfigID)
{
$subQuery = 'select ConfigValue from T_ConfigDetails Bud where ConfigValue not in
(select BudgetType from T_CostCenter_Budget where CostCenterCode=? and BudgetYear=(select max(BudgetYear) from T_CostCenter_Budget)) and Config_ID=?';
$subQuery = 'select ConfigValue from t_configdetails Bud where ConfigValue not in
(select BudgetType from t_costcenter_budget where CostCenterCode=? and BudgetYear=(select max(BudgetYear) from t_costcenter_budget)) and Config_ID=?';
$query = $this->db->query($subQuery, array($CostCenterCode,$ConfigID));
@ -273,7 +273,7 @@ where Dept.DEPCode not in
function EditCost($Cost,$CostCenterCode)
{
$this->db->table('T_CostCenter_Master')
$this->db->table('t_costcenter_master')
->where('CostCenterCode',$CostCenterCode)
->update($Cost);
return TRUE;
@ -283,7 +283,7 @@ where Dept.DEPCode not in
function EditBudget($Budget)
{
$this->db->transStart();
$builder = $this->db->table('T_CostCenter_Budget');
$builder = $this->db->table('t_costcenter_budget');
$builder->insert($Budget);
$insert_id = $this->db->affectedRows();
@ -295,17 +295,17 @@ where Dept.DEPCode not in
function DeleteBudget($BudgetType='',$BudgetYear='',$CostCenterCode ='')
{
$this->db->table('T_CostCenter_Budget')->delete(['BudgetType' => $BudgetType, 'BudgetYear' => $BudgetYear, 'CostCenterCode' => $CostCenterCode]);
$this->db->table('t_costcenter_budget')->delete(['BudgetType' => $BudgetType, 'BudgetYear' => $BudgetYear, 'CostCenterCode' => $CostCenterCode]);
}
function DeleteDepartment($DepCode='',$CostCode='')
{
$this->db->table('T_CostCenter_Departments')->delete(['DEPCode' => $DepCode, 'CostCenterCode' => $CostCode]);
$this->db->table('t_costcenter_departments')->delete(['DEPCode' => $DepCode, 'CostCenterCode' => $CostCode]);
}
function checkDeptCostExists($DepCode='',$CostCode='')
{
$builder = $this->db->table('T_CostCenter_Departments')
$builder = $this->db->table('t_costcenter_departments')
->select('CostCenterCode,DEPCode')
->where('DEPCode',$DepCode)
->where('CostCenterCode',$CostCode);
@ -319,7 +319,7 @@ where Dept.DEPCode not in
function checkCostDetailsExists($Code='',$CostName='')
{
$builder = $this->db->table('T_CostCenter_Master')
$builder = $this->db->table('t_costcenter_master')
->select('CostCenterCode')
->where('CostCenterCode',$Code);
if ($CostName != '')
@ -338,12 +338,12 @@ where Dept.DEPCode not in
}
/* *//**
* This function is used to get the Department details from T_DepartmentDetails
* This function is used to get the Department details from t_departmentdetails
* @return array $result : This is result of the query
*/
function getDepartment()
{
$builder = $this->db->table('T_DepartmentDetails')
$builder = $this->db->table('t_departmentdetails')
->select('DEPCode, DepartmentName')
->where('IsActive =', 1);
$query =$builder->get();
@ -356,7 +356,7 @@ where Dept.DEPCode not in
*/
function getConfigValue($ConfigID )
{
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('ConfigValue')
->where('Config_id ',$ConfigID );
$query =$builder->get();
@ -367,28 +367,28 @@ where Dept.DEPCode not in
function export_excel(){
$where = null;
$builder = $this->db->table('T_CostCenter_Master as bud')
$builder = $this->db->table('t_costcenter_master as bud')
->select('Mas.*,bud.*,emp.firstname,emp1.firstname as Updated_By')//count(dep.DEPCode) AS ctvalue');
->select('sum(distinct case when Mas.budgettype="CAPITAL" then budgetamount else 0 end) as capital',FALSE)
->select('sum(distinct case when Mas.budgettype="REVENUE" then budgetamount else 0 end) as revenue',FALSE)
->select('sum(distinct case when Mas.budgettype="SERVICE" then budgetamount else 0 end) as service',FALSE)
->select('sum(distinct case when Mas.budgettype="IMPORT" then budgetamount else 0 end) as import',FALSE)
->select('GROUP_CONCAT(distinct part.DepartmentName) as DepartmentName')
->join('T_CostCenter_Budget as Mas','Mas.CostCenterCode=bud.CostCenterCode','left')
->join('T_CostCenter_Departments as dep',' dep.CostCenterCode=Mas.CostCenterCode','left')
->join('T_DepartmentDetails as part','part.DEPCode=dep.DEPCode','left')
->join('t_costcenter_budget as Mas','Mas.CostCenterCode=bud.CostCenterCode','left')
->join('t_costcenter_departments as dep',' dep.CostCenterCode=Mas.CostCenterCode','left')
->join('t_departmentdetails as part','part.DEPCode=dep.DEPCode','left')
->groupBy(array('bud.CostCenterCode','Mas.BudgetYear'))
->join('tbl_users as tbl',' bud.createdby = tbl.userid','left')
->join('T_Employee_Details as emp', 'emp.empid=tbl.empid','left')
->join('t_employee_details as emp', 'emp.empid=tbl.empid','left')
->join('tbl_users as tbl1',' bud.UpdatedBy = tbl1.userid','left')
->join('T_Employee_Details as emp1', 'emp1.empid=tbl1.empid','left')
->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid','left')
->where('Mas.BudgetYear !=""');
return $builder->get()->getResultArray();
}
//get exist budget year details
function CheckExistBudget($BudgetType,$BudgetYear,$CostCode){
$builder = $this->db->table('T_CostCenter_Budget')
$builder = $this->db->table('t_costcenter_budget')
->select('CostCenterCode')
->where('CostCenterCode',$CostCode)
->where('BudgetType',$BudgetType)
@ -407,7 +407,7 @@ where Dept.DEPCode not in
//update budget
function updateBudget($Budget,$BudgetType,$BudgetYear,$CostCode)
{
$this->db->table('T_CostCenter_Budget')
$this->db->table('t_costcenter_budget')
->where('CostCenterCode',$CostCode)
->where('BudgetType',$BudgetType)
->where('BudgetYear',$BudgetYear)
@ -419,9 +419,9 @@ where Dept.DEPCode not in
{
$tables = [
'T_CostCenter_Master',
'T_CostCenter_Budget',
'T_CostCenter_Departments'
't_costcenter_master',
't_costcenter_budget',
't_costcenter_departments'
];

478
app/Models/Dashboard_model.php
View File

File diff suppressed because it is too large Load Diff

12
app/Models/Department_model.php
View File

@ -13,7 +13,7 @@ class Department_model extends Model
// function departmentListingCount($searchText = '')
// {
// ->select('BaseT.DepartmentID, 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.PaymentTerms,BaseT.PaymentDays,BaseT.PayableAT');
// $builder = $this->db->table('T_DepartmentDetails as BaseT');
// $builder = $this->db->table('t_departmentdetails as BaseT');
// //->join('tbl_users as users', 'users.userId = BaseT.userId','left');
// //->join('T_SupplierDetails as ID', 'ID.DepartmentID = BaseT.DepartmentID','left');
// if(!empty($searchText)) {
@ -50,7 +50,7 @@ class Department_model extends Model
*/
function departmentListing()
{
$builder = $this->db->table('T_DepartmentDetails as BaseT')
$builder = $this->db->table('t_departmentdetails as BaseT')
->select('BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept, BaseT.IsActive')
->orderBy("BaseT.DEPCode", "asc");
$query =$builder->get();
@ -84,7 +84,7 @@ class Department_model extends Model
function savedepartment($department)
{
$builder = $this->db->table('T_DepartmentDetails');
$builder = $this->db->table('t_departmentdetails');
$builder->insert($department);
$SID = $this->db->affectedRows();
@ -96,7 +96,7 @@ function savedepartment($department)
function getdepcode()
{
//$limit = 12;
$builder = $this->db->table('T_DepartmentDetails')
$builder = $this->db->table('t_departmentdetails')
->distinct()
->select('DEPCode, DepartmentName')
->where('IsActive =', 1);
@ -113,7 +113,7 @@ function getdepcode()
*/
function getDeptInfo($DEPCode='')
{
$builder = $this->db->table('T_DepartmentDetails')
$builder = $this->db->table('t_departmentdetails')
->select('*')
->where('DEPCode', $DEPCode);
$query =$builder->get();
@ -124,7 +124,7 @@ function getdepcode()
function Updatedepartment($department, $DEPCode)
{
$this->db->table('T_DepartmentDetails')
$this->db->table('t_departmentdetails')
->where('DEPCode', $DEPCode)
->update($department);
$res = $this->db->affectedRows();

38
app/Models/Employeedetails_model.php
View File

@ -16,9 +16,9 @@ class Employeedetails_model extends Model
*/
function employeeListing()
{
$builder = $this->db->table('T_Employee_Details Emp')
$builder = $this->db->table('t_employee_details Emp')
->select(' Emp.*,Dep.DepartmentName as DepartmentName')
->join('T_DepartmentDetails Dep', 'Emp.Departmentcode = Dep.DEPCode', 'left')
->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode', 'left')
->orderBy("Emp.EmpID", "asc");
$query = $builder->get();
@ -45,7 +45,7 @@ class Employeedetails_model extends Model
function getConfigValue($ConfigID)
{
$builder = $this->db->table('T_ConfigDetails')->select('ConfigValue')
$builder = $this->db->table('t_configdetails')->select('ConfigValue')
->where('Config_id ', $ConfigID);
$query = $builder->get();
@ -54,13 +54,13 @@ class Employeedetails_model extends Model
/* */
/**
* This function is used to get the Department details from T_DepartmentDetails
* This function is used to get the Department details from t_departmentdetails
* @return array $result : This is result of the query
*/
function getDepartment()
{
$builder = $this->db->table('T_DepartmentDetails')
$builder = $this->db->table('t_departmentdetails')
->select('DEPCode, DepartmentName')
->where('IsActive =', 1);
$query = $builder->get();
@ -76,7 +76,7 @@ class Employeedetails_model extends Model
function addNewemployee($Employee)
{
$builder = $this->db->table('T_Employee_Details');
$builder = $this->db->table('t_employee_details');
$builder->insert($Employee);
$EmpID = $this->db->affectedRows();
@ -87,7 +87,7 @@ class Employeedetails_model extends Model
function UpdateEmployee($Emp, $EmpID)
{
$this->db->table('T_Employee_Details')
$this->db->table('t_employee_details')
->where('EmpID', $EmpID)
->update($Emp);
$res = $this->db->affectedRows();
@ -97,9 +97,9 @@ class Employeedetails_model extends Model
function viewemployee($EmpID)
{
$builder = $this->db->table('T_Employee_Details AS Emp')->select('Emp.*,Dep.DepartmentName as DepartmentName')
$builder = $this->db->table('t_employee_details AS Emp')->select('Emp.*,Dep.DepartmentName as DepartmentName')
->join('T_DepartmentDetails Dep', 'Emp.Departmentcode = Dep.DEPCode', 'left')
->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode', 'left')
->where('Emp.EmpID', $EmpID);
$query = $builder->get();
@ -123,7 +123,7 @@ class Employeedetails_model extends Model
function checkMailExists($email = '', $Empid = '')
{
$builder = $this->db->table('T_Employee_Details')->select('EmailId')
$builder = $this->db->table('t_employee_details')->select('EmailId')
->where('EmailId', $email);
if ($Empid != '') {
$builder->where('EmpID !=', $Empid);
@ -138,7 +138,7 @@ class Employeedetails_model extends Model
function checkAadharExists($AadharNo, $Empid = '')
{
$builder = $this->db->table('T_Employee_Details')->select('AadharNo')
$builder = $this->db->table('t_employee_details')->select('AadharNo')
->where('AadharNo', $AadharNo);
if ($Empid != '') {
$builder->where('EmpID !=', $Empid);
@ -152,7 +152,7 @@ class Employeedetails_model extends Model
function checkPANExists($PANNo, $Empid = '')
{
$builder = $this->db->table('T_Employee_Details')->select('PANNo')
$builder = $this->db->table('t_employee_details')->select('PANNo')
->where('PANNo', $PANNo);
if ($Empid != '') {
$builder->where('EmpID !=', $Empid);
@ -167,7 +167,7 @@ class Employeedetails_model extends Model
function checkPhotoExists($Pic)
{
$builder = $this->db->table('T_Employee_Details')->select('ProfilePic')->where($Pic);
$builder = $this->db->table('t_employee_details')->select('ProfilePic')->where($Pic);
$query = $builder->get();
@ -178,7 +178,7 @@ class Employeedetails_model extends Model
function getEmployeeCount()
{
$builder = $this->db->table('T_Employee_Details')
$builder = $this->db->table('t_employee_details')
->select('count(*) as EmpCount')->where('IsActive ', 1);
$query = $builder->get();
return $query->getResult();
@ -186,7 +186,7 @@ class Employeedetails_model extends Model
function getBankDetails()
{
$builder = $this->db->table('T_Bank_Details')->select('*');
$builder = $this->db->table('t_bank_details')->select('*');
$query = $builder->get();
$result = $query->getResult();
return $result;
@ -195,13 +195,13 @@ class Employeedetails_model extends Model
function export_excel()
{
$builder = $this->db->table('T_Employee_Details as det')
$builder = $this->db->table('t_employee_details as det')
->select(' det.*,Dep.DepartmentName as DepartmentName,det.firstname,emp1.firstname as UpdatedByName,emp1.firstname as CreatedByName')
->join('T_DepartmentDetails Dep', 'det.Departmentcode = Dep.DEPCode', 'left')
->join('t_departmentdetails Dep', 'det.Departmentcode = Dep.DEPCode', 'left')
->join('tbl_users as tbl', ' det.createdby = tbl.userid', 'left')
->join('T_Employee_Details as emp', 'emp.empid=tbl.empid', 'left')
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
->join('tbl_users as tbl1', ' det.UpdatedBy = tbl1.userid', 'left')
->join('T_Employee_Details as emp1', 'emp1.empid=tbl1.empid', 'left');
->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid', 'left');
return $builder->get()->getResultArray();
}
}

26
app/Models/Emppaydate_model.php
View File

@ -15,9 +15,9 @@ class Emppaydate_model extends Model
*/
function emppayListing()
{
$builder = $this->db->table('T_Emp_Pay_Data')
->select('T_Emp_Pay_Data.*,T_Employee_Details.FirstName,T_Employee_Details.LastName')
->join('T_Employee_Details','T_Emp_Pay_Data.EmpID=T_Employee_Details.EmpID');
$builder = $this->db->table('t_emp_pay_data')
->select('t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName')
->join('t_employee_details','t_emp_pay_data.EmpID=t_employee_details.EmpID');
$query =$builder->get();
$result = $query->getResult();
return $result;
@ -25,7 +25,7 @@ class Emppaydate_model extends Model
function deleteEmployeePay($EmpID)
{
$query = $this->db->table('T_Emp_Pay_Data')->delete(['EmpID' => $EmpID]);
$query = $this->db->table('t_emp_pay_data')->delete(['EmpID' => $EmpID]);
return $query;
}
@ -36,7 +36,7 @@ class Emppaydate_model extends Model
function addNewemppay($emppay)
{
$this->db->transStart();
$builder = $this->db->table('T_Emp_Pay_Data');
$builder = $this->db->table('t_emp_pay_data');
$builder->insert($emppay);
$paydataid = $this->db->insertId();
@ -49,7 +49,7 @@ class Emppaydate_model extends Model
function addLoanInfo($dataarray,$string)
{
if($string == 'add'){
$builder = $this->db->table('T_Loan_Master');
$builder = $this->db->table('t_loan_master');
$builder->insert($dataarray);
$loanid = $this->db->affectedRows();
@ -59,7 +59,7 @@ class Emppaydate_model extends Model
{
$loanid = $dataarray['Loan_ID'];
$this->db->table('T_Loan_Master')
$this->db->table('t_loan_master')
->where('Loan_ID',$loanid)
->update($dataarray);
@ -69,10 +69,10 @@ class Emppaydate_model extends Model
}
function getUserInfo($paydataid)
{
$sql = 'select T_Emp_Pay_Data.Pay_Data_ID,T_Emp_Pay_Data.EmpID as PAYEMPID,T_Emp_Pay_Data.Basic_Pay,T_Emp_Pay_Data.HRA_Rate,T_Emp_Pay_Data.Allowances,T_Emp_Pay_Data.Food_Allowances,T_Emp_Pay_Data.Incentives,T_Emp_Pay_Data.PF_Rate,T_Emp_Pay_Data.ESI_Rate,T_Emp_Pay_Data.HRA_Amount,T_Emp_Pay_Data.TotalSalary,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Loan_Master.*from T_Emp_Pay_Data
join T_Employee_Details on T_Emp_Pay_Data.EmpID=T_Employee_Details.EmpID
left join T_Loan_Master on T_Emp_Pay_Data.EmpID=T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
where T_Emp_Pay_Data.Pay_Data_ID = ?;';
$sql = 'select t_emp_pay_data.Pay_Data_ID,t_emp_pay_data.EmpID as PAYEMPID,t_emp_pay_data.Basic_Pay,t_emp_pay_data.HRA_Rate,t_emp_pay_data.Allowances,t_emp_pay_data.Food_Allowances,t_emp_pay_data.Incentives,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate,t_emp_pay_data.HRA_Amount,t_emp_pay_data.TotalSalary,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.*from t_emp_pay_data
join t_employee_details on t_emp_pay_data.EmpID=t_employee_details.EmpID
left join t_loan_master on t_emp_pay_data.EmpID=t_loan_master.EmpID and t_loan_master.is_Active = 1
where t_emp_pay_data.Pay_Data_ID = ?;';
$query = $this->db->query($sql,array($paydataid));
return $query->getResult();
@ -85,7 +85,7 @@ class Emppaydate_model extends Model
$paydateid=$emppaydatas['Pay_Data_ID'];
//echo $paydateid;
//print_r($emppaydatas);die();
$this->db->table('T_Emp_Pay_Data')
$this->db->table('t_emp_pay_data')
->where('Pay_Data_ID', $paydateid)
->update($emppaydatas);
@ -95,7 +95,7 @@ class Emppaydate_model extends Model
function viewemppay($emppaydata, $paydateid)
{
$this->db->table('T_Emp_Pay_Data')
$this->db->table('t_emp_pay_data')
->where('Pay_Data_ID', $paydateid)
->update($emppaydata);

14
app/Models/Inprocess_model.php
View File

@ -53,13 +53,13 @@ class Inprocess_model extends Model
function getEmplistforReport()
{
$builder = $this->db->table('T_Employee_Details')->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.Departmentcode,T_DepartmentDetails.shortName')
$builder = $this->db->table('t_employee_details')->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.Departmentcode,t_departmentdetails.shortName')
->join('T_DepartmentDetails','T_Employee_Details.Departmentcode=T_DepartmentDetails.DEPCode')
->join('t_departmentdetails','t_employee_details.Departmentcode=t_departmentdetails.DEPCode')
//->join('ip_invoice_items','ip_invoices.invoice_number=ip_invoice_items.invoice_number');
//->join('ip_products','ip_invoice_items.item_product_id=ip_products.product_id');
//->join('ip_invoice_custom','ip_invoices.invoice_number=ip_invoice_custom.invoice_number and invoice_custom_fieldid=62');
->orderBy('T_Employee_Details.EmpID');
->orderBy('t_employee_details.EmpID');
$query =$builder->get();
return $query->getResult();
@ -108,11 +108,11 @@ class Inprocess_model extends Model
function getIndividualInprocessReportData($reportid)
{
$builder = $this->db->table('T_Inprocess_Testreport_Master')->select('T_Inprocess_Testreport_Master.*,ip_clients.client_name,ip_products.product_name,ip_products.product_description,T_Employee_Details.FirstName,T_Employee_Details.LastName')
$builder = $this->db->table('T_Inprocess_Testreport_Master')->select('T_Inprocess_Testreport_Master.*,ip_clients.client_name,ip_products.product_name,ip_products.product_description,t_employee_details.FirstName,t_employee_details.LastName')
->join('ip_clients','T_Inprocess_Testreport_Master.customerid=ip_clients.client_id')
->join('ip_products','T_Inprocess_Testreport_Master.productid=ip_products.product_id')
->join('tbl_users','T_Inprocess_Testreport_Master.createdby=tbl_users.userid')
->join('T_Employee_Details','tbl_users.EmpID=T_Employee_Details.EmpID')
->join('t_employee_details','tbl_users.EmpID=t_employee_details.EmpID')
->where('T_Inprocess_Testreport_Master.masterreport_id',$reportid);
$res =$builder->get();
@ -141,8 +141,8 @@ class Inprocess_model extends Model
$reportdata['masterreportafs'] = $res1->getResult();
$builder = $this->db->table('T_Company_Details')
->select('T_Company_Details.CompanyName,T_Company_Details.Address,T_Company_Details.ProfilePic');
$builder = $this->db->table('t_company_details')
->select('t_company_details.CompanyName,t_company_details.Address,t_company_details.ProfilePic');
//->where('testreport_id',$reportid);
$res1 = $builder->get();
$reportdata['company'] = $res1->getResult();

335
app/Models/Inwardgateregister_model.php
View File

@ -33,7 +33,7 @@ class Inwardgateregister_model extends Model
// //unlink("public/uploads/BillFiles/".$oldfile);//this deletes the file on particular folder too
// }
$this->db->table('T_Inwardgateregister_fileupload')
$this->db->table('t_inwardgateregister_fileupload')
->set('FilePath', $Picture)
->where('BillNo', $bill)
->update();
@ -45,7 +45,7 @@ class Inwardgateregister_model extends Model
function getfies($igr)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload')->select('*')
$builder = $this->db->table('t_inwardgateregister_fileupload')->select('*')
->where('IGRNO', $igr);
@ -56,27 +56,35 @@ class Inwardgateregister_model extends Model
function fileupload($myfiles)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload');
$builder = $this->db->table('t_inwardgateregister_fileupload');
$builder->insert($myfiles);
$myfile = $this->db->affectedRows();
return $myfile;
$aff = $this->db->affectedRows();
return $aff > 0 ? $this->db->insertID() : 0;
}
function deleteBillFile($billno)
{
$deleteBillFile = array('Isactive' => 0);
$this->db->table('t_inwardgateregister_fileupload')
->where('BillNo', $billno)
->update($deleteBillFile);
return TRUE;
}
/*------------------------------------------------------------*/
function addMaterialStockHistory($MaterialstockHistoryadd)
{
$this->db->transStart();
$builder = $this->db->table('T_Material_stock_history');
$builder = $this->db->table('t_material_stock_history');
$builder->insert($MaterialstockHistoryadd);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
//print_r($insert_id);
if ($insert_id > 0) {
$subQuery = 'select * from T_Material_stock_history';
$subQuery = 'select * from t_material_stock_history';
$query = $this->db->query($subQuery);
@ -87,9 +95,9 @@ class Inwardgateregister_model extends Model
/*------------------------------------------------------------*/
// function igrListing()
// {
// $builder = $this->db->table('T_IGR_Master igr')->select('igr.*,PO.DeliveryDate,sup.SupplierName,igr.file');
// ->join('T_PurchaseOrder_Master PO','igr.PONO = PO.PONO');
// ->join('T_SupplierDetailsN` sup','PO.SupplierID = sup.SupplierID');
// $builder = $this->db->table('t_igr_master igr')->select('igr.*,PO.DeliveryDate,sup.SupplierName,igr.file');
// ->join('t_purchaseorder_master PO','igr.PONO = PO.PONO');
// ->join('t_supplierdetailsn` sup','PO.SupplierID = sup.SupplierID');
// ->orderBy('igr.CreatedDate','desc');
// $query =$builder->get();
// $result = $query->getResult();
@ -98,12 +106,12 @@ class Inwardgateregister_model extends Model
function igrListing()
{
$builder = $this->db->table('T_IGR_Master igr')
$builder = $this->db->table('t_igr_master igr')
->select('igr.*,PO.DeliveryDate,sup.SupplierName,fileup.FilePath,igr.file,PO.POType')
->join('T_PurchaseOrder_Master PO', 'igr.PONO = PO.PONO')
->join('T_Inwardgateregister_fileupload fileup', ' igr.IGRNO = fileup.IGRNO', 'left')
->join('T_SupplierDetailsN` sup', 'PO.SupplierID = sup.SupplierID')
->orderBy('igr.CreatedDate','desc')
->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
->join('t_inwardgateregister_fileupload fileup', ' igr.IGRNO = fileup.IGRNO', 'left')
->join('t_supplierdetailsn` sup', 'PO.SupplierID = sup.SupplierID')
->orderBy('igr.IGRID','desc')
->groupBy('igr.IGRNO', 'desc');
$query = $builder->get();
$result = $query->getResult();
@ -114,7 +122,7 @@ class Inwardgateregister_model extends Model
function viewIGRFile($IGRNO)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload')
$builder = $this->db->table('t_inwardgateregister_fileupload')
->distinct()->select('*') //BillNo,IGRNO,FilePath,PONO
->where('IGRNO', $IGRNO);
@ -127,10 +135,10 @@ class Inwardgateregister_model extends Model
function viewIGRFile1($IGRNO)
{
$builder = $this->db->table('T_IGR_Master igrm')
$builder = $this->db->table('t_igr_master igrm')
->distinct()->select('igrm.file,igrm.PONO as pono') //BillNo,IGRNO,FilePath,PONO
//->join('T_Inwardgateregister_fileupload igrf','igrm.IGRNO = igrf.IGRNO','left')
//->join('T_IGR_Details igrd','igrm.IGRNO = igrd.IGRNO','left');
//->join('t_inwardgateregister_fileupload igrf','igrm.IGRNO = igrf.IGRNO','left')
//->join('t_igr_details igrd','igrm.IGRNO = igrd.IGRNO','left');
->where('igrm.IGRNO', $IGRNO);
$query = $builder->get();
@ -144,13 +152,13 @@ class Inwardgateregister_model extends Model
function getpurchaseorder()
{
$builder = $this->db->table('T_PurchaseOrder_Master POM')
$builder = $this->db->table('t_purchaseorder_master POM')
->distinct()->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address,POM.status,OGR_Status,POM.PODate,POM.IsOpenOrder,POM.CreatedDate,POM.POType')
->select("IF(POM.PODate IS NOT NULL, DATE_FORMAT(POM.PODate, '%Y-%m-%d'), NULL) AS formatted_PODate")
->select("IF(POM.IsOpenOrder IS NULL OR POM.IsOpenOrder = '', 0, POM.IsOpenOrder) AS formatted_IsOpenOrder")
->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO')
->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID')
->join('T_OGR_Master OGM ', 'POM.PONO = OGM.PONO_INV', 'left')
->join('t_purchaseorder_lineitem POL', 'POL.PONO = POM.PONO')
->join('t_supplierdetailsn sup', 'POM.SupplierID = sup.SupplierID')
->join('t_ogr_master OGM ', 'POM.PONO = OGM.PONO_INV', 'left')
->where('POM.POType !=', SERVICE)
->where('POM.Status', PO_RELEASED)
->orWhere('POM.Status',REQITEM_Emergency_PO_CREATED)
@ -171,13 +179,13 @@ class Inwardgateregister_model extends Model
{
$subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM
FROM T_PurchaseOrder_Master POM
LEFT JOIN T_PurchaseOrder_LineItem POL ON POL.PONO = POM.PONO
LEFT JOIN T_IGR_Master IGM ON IGM.PONO = POL.PONO
LEFT JOIN T_IGR_Details igr ON igr.MaterialCode = POL.MaterialCode AND IGM.PONO = POL.PONO
LEFT JOIN T_MaterialMaster MM ON MM.MaterialCode = POL.MaterialCode
LEFT JOIN T_MRIR_Master MRM ON POM.PONO = MRM.PONO
LEFT JOIN T_MRIR_Details MRD ON MRM.MRIRNO = MRD.MRIRNO AND POL.MaterialCode = MRD.MaterialCode
FROM t_purchaseorder_master POM
LEFT JOIN t_purchaseorder_lineitem POL ON POL.PONO = POM.PONO
LEFT JOIN t_igr_master IGM ON IGM.PONO = POL.PONO
LEFT JOIN t_igr_details igr ON igr.MaterialCode = POL.MaterialCode AND IGM.PONO = POL.PONO
LEFT JOIN t_materialmaster MM ON MM.MaterialCode = POL.MaterialCode
LEFT JOIN t_mrir_master MRM ON POM.PONO = MRM.PONO
LEFT JOIN t_mrir_details MRD ON MRM.MRIRNO = MRD.MRIRNO AND POL.MaterialCode = MRD.MaterialCode
WHERE POM.PONO = ? GROUP BY POL.MaterialCode';
$query = $this->db->query($subQuery, [$PO]);
@ -186,10 +194,10 @@ class Inwardgateregister_model extends Model
return $query->getResult();
/*
$builder = $this->db->table('T_PurchaseOrder_Master POM')
$builder = $this->db->table('t_purchaseorder_master POM')
->select('POM.PONO,POL.MaterialCode,POL.Quantity,POL.PONO,MM.MaterialName,MM.UOM')
->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO','left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = POL.MaterialCode','left')
->join('t_purchaseorder_lineitem POL', 'POL.PONO = POM.PONO','left')
->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode','left')
->where('POM.PONO',$PO )
->where('POL.Status !=',POLINEITEM_IGR_CREATED );
$query =$builder->get();
@ -199,7 +207,7 @@ class Inwardgateregister_model extends Model
public function igr_history($hsty_arr) {
$this->db->transStart();
$builder = $this->db->table('T_IGR_History');
$builder = $this->db->table('t_igr_history');
$builder->insert($hsty_arr);
$this->db->transComplete();
if ($this->db->transStatus() === FALSE) {
@ -212,7 +220,7 @@ class Inwardgateregister_model extends Model
function get_igr_history($col,$IGR,$IGRITEM = null)
{
$builder = $this->db->table('T_IGR_History Hist')
$builder = $this->db->table('t_igr_history Hist')
->select("Hist.*");
$builder->where('Hist.field', $col);
if($IGR){
@ -233,14 +241,14 @@ class Inwardgateregister_model extends Model
{
// print_r($igrM);die;
$this->db->transStart();
$builder = $this->db->table('T_IGR_Master');
$builder = $this->db->table('t_igr_master');
$builder->insert($igrM);
$YesIAmAffected = $this->db->affectedRows();
$this->db->transComplete();
$result = [];
if ($YesIAmAffected > 0) {
$result = $this->db->table('T_IGR_Master')
$result = $this->db->table('t_igr_master')
->select('IGRNO')
->orderBy('CreatedDate', 'desc')
->get()
@ -255,12 +263,12 @@ class Inwardgateregister_model extends Model
function addigrD($igrD)
{
$this->db->transStart();
$builder = $this->db->table('T_IGR_Details');
$builder = $this->db->table('t_igr_details');
$builder->insert($igrD);
$aff_row = $this->db->affectedRows();
$this->db->transComplete();
$result = $this->db->table('T_IGR_Details')
$result = $this->db->table('t_igr_details')
->select('IGRItemNo')
->orderBy('CreatedDate', 'desc')
->get()
@ -276,7 +284,7 @@ class Inwardgateregister_model extends Model
{
$this->db->transStart();
$builder = $this->db->table('T_Material_stock_history');
$builder = $this->db->table('t_material_stock_history');
$builder->insert($historydetails);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -287,7 +295,7 @@ class Inwardgateregister_model extends Model
function addmaterialmaster($current_qty, $MaterialCode)
{
$this->db->table('T_MaterialMaster')
$this->db->table('t_materialmaster')
->where('MaterialCode', $MaterialCode)
->update($current_qty);
@ -298,8 +306,8 @@ class Inwardgateregister_model extends Model
function get_CurrentQty($MaterialCode)
{
$builder = $this->db->table('T_MaterialMaster')->select('Current_stock')
->where('T_MaterialMaster.MaterialCode', $MaterialCode);
$builder = $this->db->table('t_materialmaster')->select('Current_stock')
->where('t_materialmaster.MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
@ -309,14 +317,29 @@ class Inwardgateregister_model extends Model
function getitemvalue($pono, $MaterialCode)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('Rate,SupplierID')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO')
->where('T_PurchaseOrder_LineItem.PONO', $pono)
$builder = $this->db->table('t_purchaseorder_lineitem')->select('Rate,SupplierID')
->join('t_purchaseorder_master', 't_purchaseorder_master.PONO=t_purchaseorder_lineitem.PONO')
->where('t_purchaseorder_lineitem.PONO', $pono)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function ViewigrListing()
{
$builder = $this->db->table('t_igr_master igr')
->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType')
->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
->join('t_supplierdetailsn` sup', 'PO.SupplierID = sup.SupplierID')
->where('igr.IGRStatus !=', MRIR_CREATED)
->where('PO.IsQualityChkReqired', 1)
->orderBy('igr.CreatedDate', 'desc');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function viewigr($IGRNO)
@ -326,14 +349,14 @@ class Inwardgateregister_model extends Model
// ->select('igrd.Remarks','igrd.IGRItemStatus','igrd.CancelNote','igrd.BankStatus')
// ->select('MM.MaterialName,MM.UOM,sup.Address,sup.SupplierName,POM.ServiceDescription,POL.Quantity,POM.POType')
$builder = $this->db->table('T_IGR_Master igr')
$builder = $this->db->table('t_igr_master igr')
->distinct()
->select('igr.IGRNO,igr.*,igrd.*,MM.MaterialName,MM.UOM,sup.Address,sup.SupplierName,POM.ServiceDescription,POL.Quantity,POM.POType')
->join('T_IGR_Details igrd', 'igrd.IGRNO = igr.IGRNO')
->join('T_PurchaseOrder_Master POM', 'igr.PONO = POM.PONO')
->join('T_PurchaseOrder_LineItem POL', 'igr.PONO = POL.PONO and POL.MaterialCode=igrd.MaterialCode ')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID')
->join('T_MaterialMaster MM', 'MM.MaterialCode = igrd.MaterialCode')
->join('t_igr_details igrd', 'igrd.IGRNO = igr.IGRNO')
->join('t_purchaseorder_master POM', 'igr.PONO = POM.PONO')
->join('t_purchaseorder_lineitem POL', 'igr.PONO = POL.PONO and POL.MaterialCode=igrd.MaterialCode ')
->join('t_supplierdetailsn sup', 'sup.SupplierID = POM.SupplierID')
->join('t_materialmaster MM', 'MM.MaterialCode = igrd.MaterialCode')
->where('igr.IGRNO', $IGRNO);
$query = $builder->get();
@ -346,7 +369,7 @@ class Inwardgateregister_model extends Model
function UpdatePOLineItem($LineItem, $PONO, $MaterialCode)
{
$this->db->table('T_PurchaseOrder_LineItem')
$this->db->table('t_purchaseorder_lineitem')
->where('PONO', $PONO)
->where('MaterialCode', $MaterialCode)
->update($LineItem);
@ -356,7 +379,7 @@ class Inwardgateregister_model extends Model
function UpdateMRIROUTQty($mrirarray, $MRIRNO, $MaterialCode)
{
$this->db->table('T_MRIR_Details')
$this->db->table('t_mrir_details')
->where('MaterialCode', $MaterialCode)
->update($mrirarray);
return TRUE;
@ -365,7 +388,7 @@ class Inwardgateregister_model extends Model
function UpdatePOMasterOGRStatus($pono, $POMasterStatuss)
{
$this->db->table('T_PurchaseOrder_Master')
$this->db->table('t_purchaseorder_master')
->where('PONO', $pono)
->update($POMasterStatuss);
return TRUE;
@ -375,14 +398,14 @@ class Inwardgateregister_model extends Model
function update_OGR($PONO, $status)
{
$builder = $this->db->table('T_OGR_Master')->select('*')
$builder = $this->db->table('t_ogr_master')->select('*')
->where('PONO_INV', $PONO);
$query = $builder->get();
if ($query->getNumRows() != 0) {
$ogrstatus = array('Status' => $status);
$this->db->table('T_OGR_Master')
$this->db->table('t_ogr_master')
->where('PONO_INV', $PONO)
->update($ogrstatus);
}
@ -391,7 +414,7 @@ class Inwardgateregister_model extends Model
function UpdatePOMaster($PONO, $updatedBy)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('*')
$builder = $this->db->table('t_purchaseorder_lineitem')->select('*')
->where('PONO', $PONO)
->where('Status !=', IGR_CREATED);
@ -400,7 +423,7 @@ class Inwardgateregister_model extends Model
if ($query->getNumRows() == 0) {
$POStatus = array('status' => IGR_CREATED, 'UpdateBY' => $updatedBy);
$this->db->table('T_PurchaseOrder_Master')
$this->db->table('t_purchaseorder_master')
->where('PONO', $PONO)
->update($POStatus);
}
@ -409,7 +432,7 @@ class Inwardgateregister_model extends Model
function UpdateOGRMasterOGRStatus($OGRNO)
{
$builder = $this->db->table('T_OGR_Details')->select('*')
$builder = $this->db->table('t_ogr_details')->select('*')
->where('OGRNO', $OGRNO)
->where('Status !=', OGR_PARTIAL_COMPLETE);
@ -417,7 +440,7 @@ class Inwardgateregister_model extends Model
$OGRStatus = ($query->getNumRows() == 0) ? array('status' => OGR_PARTIAL_COMPLETE) : array('status' => OGR_COMPLETE);
$this->db->table('T_OGR_Master')
$this->db->table('t_ogr_master')
->where('OGRNO', $OGRNO)
->update($OGRStatus);
}
@ -426,14 +449,14 @@ class Inwardgateregister_model extends Model
function UpdateMRIRMasterOGRStatus($MRIRNO, $OGRNO)
{
$builder = $this->db->table('T_OGR_Details')->select('*')
$builder = $this->db->table('t_ogr_details')->select('*')
->where('OGRNO', $OGRNO)
->where('Status !=', OGR_PARTIAL_COMPLETE);
$query = $builder->get();
$OGRStatus = ($query->getNumRows() == 0) ? array('OGRstatus' => OGR_PARTIAL_COMPLETE) : array('OGRstatus' => OGR_COMPLETE);
$this->db->table('T_MRIR_Master')
$this->db->table('t_mrir_master')
->where('MRIRNO', $MRIRNO)
->update($OGRStatus);
}
@ -443,14 +466,14 @@ class Inwardgateregister_model extends Model
function updateogrpomaster($pono)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('*')
$builder = $this->db->table('t_purchaseorder_lineitem')->select('*')
->where('PONO', $pono)
->where('OGR_Status !=', 'ST064');
$query = $builder->get();
$POStatus = ($query->getNumRows() == 0) ?? array('status' => 'ST063');
$this->db->table('T_PurchaseOrder_Master')
$this->db->table('t_purchaseorder_master')
->where('PONO', $pono)
->update($POStatus);
}
@ -459,7 +482,7 @@ class Inwardgateregister_model extends Model
function getPOLineItemReceivedQty($PONO, $MaterialCode)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('ReceivedQuantity')
$builder = $this->db->table('t_purchaseorder_lineitem')->select('ReceivedQuantity')
->where('PONO', $PONO)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
@ -472,7 +495,7 @@ class Inwardgateregister_model extends Model
function GetMRIROutQty($MRIRNO, $MaterialCode)
{
$builder = $this->db->table('T_MRIR_Details')->select('Ogr_Out_Qty')
$builder = $this->db->table('t_mrir_details')->select('Ogr_Out_Qty')
->where('MRIRNO', $MRIRNO)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
@ -493,7 +516,7 @@ class Inwardgateregister_model extends Model
function getSupplier()
{
$subQuery = 'select SupplierID,SupplierName from T_SupplierDetailsN';
$subQuery = 'select SupplierID,SupplierName from t_supplierdetailsn';
$query = $this->db->query($subQuery);
return $query->getResult();
@ -502,7 +525,7 @@ class Inwardgateregister_model extends Model
function getstoredmaterialcode()
{
$subQuery = 'select MaterialCode,MaterialName from T_MaterialMaster';
$subQuery = 'select MaterialCode,MaterialName from t_materialmaster';
$query = $this->db->query($subQuery);
return $query->getResult();
}
@ -511,13 +534,13 @@ class Inwardgateregister_model extends Model
function getOGRData()
{
$builder = $this->db->table('T_OGR_Master')
->select('T_OGR_Master.*,T_OGR_Details.*,T_SupplierDetailsN.SupplierName,sup.SupplierName as Servicesupplier')
->join('T_OGR_Details', 'T_OGR_Details.OGRNO=T_OGR_Master.OGRNO')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV', 'left')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_PurchaseOrder_Master.SupplierID', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=T_OGR_Details.SupplierID', 'left')
->groupBy('T_OGR_Master.OGRNO');
$builder = $this->db->table('t_ogr_master')
->select('t_ogr_master.*,t_ogr_details.*,t_supplierdetailsn.SupplierName,sup.SupplierName as Servicesupplier')
->join('t_ogr_details', 't_ogr_details.OGRNO=t_ogr_master.OGRNO')
->join('t_purchaseorder_master', 't_purchaseorder_master.PONO=t_ogr_master.PONO_INV', 'left')
->join('t_supplierdetailsn', 't_supplierdetailsn.SupplierID=t_purchaseorder_master.SupplierID', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID=t_ogr_details.SupplierID', 'left')
->groupBy('t_ogr_master.OGRNO');
//$this->db->where();
$query = $builder->get();
@ -529,15 +552,15 @@ class Inwardgateregister_model extends Model
function getOGRDataforedit($OGRNO)
{
$builder = $this->db->table('T_OGR_Master')
->select('T_OGR_Master.*,T_SupplierDetailsN.SupplierName,T_OGR_Details.*,sup.SupplierName as ServiceSupname,T_MaterialMaster.MaterialName as Matname,Remark')
->join('T_OGR_Details', 'T_OGR_Details.OGRNO=T_OGR_Master.OGRNO')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV', 'left')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_PurchaseOrder_Master.SupplierID', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=T_OGR_Details.SupplierID', 'left')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_OGR_Details.MaterialCode', 'left')
->where('T_OGR_Master.OGRNO', $OGRNO);
//$this->db->groupBy('T_OGR_Master.OGRNO');
$builder = $this->db->table('t_ogr_master')
->select('t_ogr_master.*,t_supplierdetailsn.SupplierName,t_ogr_details.*,sup.SupplierName as ServiceSupname,t_materialmaster.MaterialName as Matname,Remark')
->join('t_ogr_details', 't_ogr_details.OGRNO=t_ogr_master.OGRNO')
->join('t_purchaseorder_master', 't_purchaseorder_master.PONO=t_ogr_master.PONO_INV', 'left')
->join('t_supplierdetailsn', 't_supplierdetailsn.SupplierID=t_purchaseorder_master.SupplierID', 'left')
->join('t_supplierdetailsn sup', 'sup.SupplierID=t_ogr_details.SupplierID', 'left')
->join('t_materialmaster', 't_materialmaster.MaterialCode=t_ogr_details.MaterialCode', 'left')
->where('t_ogr_master.OGRNO', $OGRNO);
//$this->db->groupBy('t_ogr_master.OGRNO');
$query = $builder->get();
@ -550,17 +573,17 @@ class Inwardgateregister_model extends Model
function getOGRlineDataforedit($OGRNO, $MRIRNO)
{
$builder = $this->db->table('T_OGR_Details')
->select('T_OGR_Details.*,MaterialName,ActualQuantityReceived,Quantity,QuantityRejected')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_OGR_Details.MaterialCode')
->join('T_OGR_Master', 'T_OGR_Master.OGRNO=T_OGR_Details.OGRNO')
->join('T_MRIR_Master', 'T_MRIR_Master.PONO=T_OGR_Master.PONO_INV', 'left')
->join('T_MRIR_Details', 'T_MRIR_Details.MRIRNO=T_MRIR_Master.MRIRNO and T_MRIR_Details.MaterialCode=T_OGR_Details.MaterialCode')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_MRIR_Master.PONO')
->join('T_PurchaseOrder_LineItem', 'T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO and T_OGR_Details.MaterialCode=T_PurchaseOrder_LineItem.MaterialCode')
->where('T_OGR_Details.OGRNO', $OGRNO)
->where('T_MRIR_Details.MRIRNO', $MRIRNO)
->groupBy('T_OGR_Details.MaterialCode');
$builder = $this->db->table('t_ogr_details')
->select('t_ogr_details.*,MaterialName,ActualQuantityReceived,Quantity,QuantityRejected')
->join('t_materialmaster', 't_materialmaster.MaterialCode=t_ogr_details.MaterialCode')
->join('t_ogr_master', 't_ogr_master.OGRNO=t_ogr_details.OGRNO')
->join('t_mrir_master', 't_mrir_master.PONO=t_ogr_master.PONO_INV', 'left')
->join('t_mrir_details', 't_mrir_details.MRIRNO=t_mrir_master.MRIRNO and t_mrir_details.MaterialCode=t_ogr_details.MaterialCode')
->join('t_purchaseorder_master', 't_purchaseorder_master.PONO=t_mrir_master.PONO')
->join('t_purchaseorder_lineitem', 't_purchaseorder_master.PONO=t_purchaseorder_lineitem.PONO and t_ogr_details.MaterialCode=t_purchaseorder_lineitem.MaterialCode')
->where('t_ogr_details.OGRNO', $OGRNO)
->where('t_mrir_details.MRIRNO', $MRIRNO)
->groupBy('t_ogr_details.MaterialCode');
$query = $builder->get();
@ -586,9 +609,9 @@ class Inwardgateregister_model extends Model
function getPOmrir($PONO)
{
$builder = $this->db->table('T_MRIR_Master')->select('MRIRNO')
->where('T_MRIR_Master.PONO', $PONO)
->where('T_MRIR_Master.OGRstatus !=', OGR_COMPLETE);
$builder = $this->db->table('t_mrir_master')->select('MRIRNO')
->where('t_mrir_master.PONO', $PONO)
->where('t_mrir_master.OGRstatus !=', OGR_COMPLETE);
// ->where('Status !=',IGR_CREATED);
$query = $builder->get();
@ -603,9 +626,9 @@ class Inwardgateregister_model extends Model
{
/// echo $supplierId;
$subQuery = 'select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
where T_PurchaseOrder_Master.SupplierID=? and (T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=?) group by T_PurchaseOrder_Master.PONO';
$subQuery = 'select t_purchaseorder_master.PONO from t_purchaseorder_master
join t_mrir_master on t_mrir_master.PONO= t_purchaseorder_master.PONO
where t_purchaseorder_master.SupplierID=? and (t_purchaseorder_master.Status=? or t_purchaseorder_master.Status=? or t_purchaseorder_master.Status=? or t_purchaseorder_master.Status=? or t_purchaseorder_master.Status=? or t_purchaseorder_master.Status=? or t_purchaseorder_master.Status=?) group by t_purchaseorder_master.PONO';
//$query= $this->db->query($subQuery, array($supplierId,ST044,PO,ST063));
$query = $this->db->query($subQuery, array($supplierId, ST044, PO, PO_RELEASED, IGR_CREATED, MRIR_CREATED, PARTIAL_MRIRAPPROVED, OGR_COMPLETE, OGR_PARTIAL_COMPLETE, OGR_CREATED));
@ -616,17 +639,17 @@ class Inwardgateregister_model extends Model
function getPODetails($PONO)
{
$subQuery = 'select distinct T_PurchaseOrder_Master.PONO,T_PurchaseOrder_LineItem.MaterialCode,
T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,
T_MRIR_Details.QuantityRejected,MaterialName,balance_Qty
from T_PurchaseOrder_Master
join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Details on T_MRIR_Master.MRIRNO = T_MRIR_Details.MRIRNO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
left join T_OGR_Master on T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV
left join T_OGR_Details on T_OGR_Master.OGRNO=T_OGR_Details.OGRNO and T_PurchaseOrder_LineItem.MaterialCode= T_OGR_Details.MaterialCode
where T_PurchaseOrder_Master.PONO=?';
$subQuery = 'select distinct t_purchaseorder_master.PONO,t_purchaseorder_lineitem.MaterialCode,
t_purchaseorder_lineitem.Quantity as Oqty,t_mrir_details.ActualQuantityReceived,
t_mrir_details.QuantityRejected,MaterialName,balance_Qty
from t_purchaseorder_master
join t_purchaseorder_lineitem on t_purchaseorder_lineitem.PONO = t_purchaseorder_master.PONO
join t_mrir_master on t_mrir_master.PONO = t_purchaseorder_master.PONO
join t_mrir_details on t_mrir_master.MRIRNO = t_mrir_details.MRIRNO and t_purchaseorder_lineitem.MaterialCode=t_mrir_details.MaterialCode
join t_materialmaster on t_mrir_details.MaterialCode=t_materialmaster.MaterialCode
left join t_ogr_master on t_purchaseorder_master.PONO=t_ogr_master.PONO_INV
left join t_ogr_details on t_ogr_master.OGRNO=t_ogr_details.OGRNO and t_purchaseorder_lineitem.MaterialCode= t_ogr_details.MaterialCode
where t_purchaseorder_master.PONO=?';
$query = $this->db->query($subQuery, array($PONO));
@ -637,13 +660,13 @@ class Inwardgateregister_model extends Model
function getPOMRIRDetails($MRIRno, $PONO, $materialcode)
{
$subQuery = 'select T_MRIR_Details.MaterialCode,ActualQuantityReceived,QuantityAccepted,QuantityRejected,
$subQuery = 'select t_mrir_details.MaterialCode,ActualQuantityReceived,QuantityAccepted,QuantityRejected,
MaterialName,Quantity as Oqty,SUM(Ogr_Out_Qty) as allowedQty
from T_MRIR_Details
join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
join T_MRIR_Master on T_MRIR_Details.MRIRNO = T_MRIR_Master.MRIRNO
join T_PurchaseOrder_LineItem on T_MRIR_Master.PONO = T_PurchaseOrder_LineItem.PONO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
where T_MRIR_Details.MRIRNO=? and T_MRIR_Master.PONO=? and T_MRIR_Details.MaterialCode=? group by T_MRIR_Details.MaterialCode;';
from t_mrir_details
join t_materialmaster on t_mrir_details.MaterialCode=t_materialmaster.MaterialCode
join t_mrir_master on t_mrir_details.MRIRNO = t_mrir_master.MRIRNO
join t_purchaseorder_lineitem on t_mrir_master.PONO = t_purchaseorder_lineitem.PONO and t_purchaseorder_lineitem.MaterialCode=t_mrir_details.MaterialCode
where t_mrir_details.MRIRNO=? and t_mrir_master.PONO=? and t_mrir_details.MaterialCode=? group by t_mrir_details.MaterialCode;';
$query = $this->db->query($subQuery, array($MRIRno, $PONO, $materialcode));
return $query->getResult();
@ -652,12 +675,12 @@ class Inwardgateregister_model extends Model
function getPOMRIRMaterial($MRIRno, $PONO)
{
$builder = $this->db->table('T_MRIR_Details')
$builder = $this->db->table('t_mrir_details')
->select('MaterialCode')
->join('T_MRIR_Master', 'T_MRIR_Master.MRIRNO=T_MRIR_Details.MRIRNO')
->where('T_MRIR_Details.MRIRNO', $MRIRno)
->join('t_mrir_master', 't_mrir_master.MRIRNO=t_mrir_details.MRIRNO')
->where('t_mrir_details.MRIRNO', $MRIRno)
->where('PONO', $PONO)
->groupBy('T_MRIR_Details.MaterialCode');
->groupBy('t_mrir_details.MaterialCode');
$query = $builder->get();
$result = $query->getResult();
@ -668,8 +691,8 @@ class Inwardgateregister_model extends Model
function gettotalout($PONO, $materialcode)
{
$subQuery = 'select SUM(Ogr_Out_Qty)
from T_MRIR_Details
join T_MRIR_Master on T_MRIR_Master.MRIRNO= T_MRIR_Details.MRIRNO
from t_mrir_details
join t_mrir_master on t_mrir_master.MRIRNO= t_mrir_details.MRIRNO
where PONO =? and MaterialCode = ?; ';
$query = $this->db->query($subQuery, array($PONO, $materialcode));
@ -680,15 +703,15 @@ class Inwardgateregister_model extends Model
function getPOmaterialDetails($PONO, $materialcode)
{
$subQuery = 'select distinct T_PurchaseOrder_LineItem.MaterialCode,MaterialName,T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,T_MRIR_Details.QuantityRejected,balance_Qty
from T_PurchaseOrder_Master
join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Details on T_MRIR_Master.MRIRNO = T_MRIR_Details.MRIRNO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
left join T_OGR_Master on T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV
left join T_OGR_Details on T_OGR_Master.OGRNO=T_OGR_Details.OGRNO and T_PurchaseOrder_LineItem.MaterialCode= T_OGR_Details.MaterialCode
where T_PurchaseOrder_LineItem.PONO=? and T_PurchaseOrder_LineItem.MaterialCode=?';
$subQuery = 'select distinct t_purchaseorder_lineitem.MaterialCode,MaterialName,t_purchaseorder_lineitem.Quantity as Oqty,t_mrir_details.ActualQuantityReceived,t_mrir_details.QuantityRejected,balance_Qty
from t_purchaseorder_master
join t_purchaseorder_lineitem on t_purchaseorder_lineitem.PONO = t_purchaseorder_master.PONO
join t_mrir_master on t_mrir_master.PONO = t_purchaseorder_master.PONO
join t_mrir_details on t_mrir_master.MRIRNO = t_mrir_details.MRIRNO and t_purchaseorder_lineitem.MaterialCode=t_mrir_details.MaterialCode
join t_materialmaster on t_mrir_details.MaterialCode=t_materialmaster.MaterialCode
left join t_ogr_master on t_purchaseorder_master.PONO=t_ogr_master.PONO_INV
left join t_ogr_details on t_ogr_master.OGRNO=t_ogr_details.OGRNO and t_purchaseorder_lineitem.MaterialCode= t_ogr_details.MaterialCode
where t_purchaseorder_lineitem.PONO=? and t_purchaseorder_lineitem.MaterialCode=?';
$query = $this->db->query($subQuery, array($PONO, $materialcode));
return $query->getResult();
@ -697,7 +720,7 @@ class Inwardgateregister_model extends Model
function getPOmaterial($PONO)
{
$subQuery = 'select MaterialCode from T_PurchaseOrder_LineItem where PONO=?';
$subQuery = 'select MaterialCode from t_purchaseorder_lineitem where PONO=?';
$query = $this->db->query($subQuery, array($PONO));
@ -709,17 +732,17 @@ class Inwardgateregister_model extends Model
function AddOGR($ogrmaster)
{
$this->db->transStart();
$builder = $this->db->table('T_OGR_Master');
$builder = $this->db->table('t_ogr_master');
$builder->insert($ogrmaster);
$aff_row = $this->db->affectedRows();
$this->db->transComplete();
if ($aff_row > 0) {
//$subQuery = 'select max(OGRNO) as OGRNO from T_OGR_Master';
//$subQuery = 'select max(OGRNO) as OGRNO from t_ogr_master';
// $subQuery = 'select OGRNO from order by desc limit 1';
// $query = $this->db->query($subQuery);
// return $query->getResult();
$result = $this->db->table('T_OGR_Master')
$result = $this->db->table('t_ogr_master')
->select('OGRNO')
->orderBy('CreatedOn', 'desc')
->get()
@ -735,8 +758,8 @@ class Inwardgateregister_model extends Model
function getlastogrline()
{
//$subQuery = 'select max(OGRItemNO) as OGRItemNO from T_OGR_Details';
$subQuery = 'select OGRItemNO from T_OGR_Details order by CreatedOn desc limit 1';
//$subQuery = 'select max(OGRItemNO) as OGRItemNO from t_ogr_details';
$subQuery = 'select OGRItemNO from t_ogr_details order by CreatedOn desc limit 1';
$query = $this->db->query($subQuery);
@ -746,7 +769,7 @@ class Inwardgateregister_model extends Model
function UpdateOGR($updateogrmaster, $OGRNO)
{
$this->db->table('T_OGR_Master')
$this->db->table('t_ogr_master')
->where('OGRNO', $OGRNO)
->update($updateogrmaster);
return TRUE;
@ -756,7 +779,7 @@ class Inwardgateregister_model extends Model
function AddOgrLine($Ogrline)
{
$this->db->transStart();
$builder = $this->db->table('T_OGR_Details');
$builder = $this->db->table('t_ogr_details');
$builder->insert($Ogrline);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -780,13 +803,13 @@ class Inwardgateregister_model extends Model
function GetPreSavedQty($pono, $MaterialCode)
{
// $subQuery = 'select Total_OutwardQty from T_PurchaseOrder_LineItem where PONO=? and MaterialCode=?';
// $subQuery = 'select Total_OutwardQty from t_purchaseorder_lineitem where PONO=? and MaterialCode=?';
// $query = $this->db->query($subQuery, array($pono,$MaterialCode));
//
// return $query->getResult();
$builder = $this->db->table('T_PurchaseOrder_LineItem')
$builder = $this->db->table('t_purchaseorder_lineitem')
->select('Total_OutwardQty')
->where('PONO', $pono)
->where('MaterialCode', $MaterialCode);
@ -799,7 +822,7 @@ class Inwardgateregister_model extends Model
function check_PO($pono)
{
$subQuery = 'select * from T_OGR_Master where PONO_INV=?';
$subQuery = 'select * from t_ogr_master where PONO_INV=?';
$query = $this->db->query($subQuery, array($pono));
return $query->getResult();
}
@ -807,7 +830,7 @@ class Inwardgateregister_model extends Model
function UpdatePOMasterOGR($postatus, $pono)
{
$this->db->table('T_PurchaseOrder_Master')
$this->db->table('t_purchaseorder_master')
->where('PONO', $pono)
//->where('MaterialCode', $MaterialCode)
->update($postatus);
@ -817,7 +840,7 @@ class Inwardgateregister_model extends Model
function updateigr($igrarr, $IGRNo)
{
$this->db->table('T_IGR_Master')
$this->db->table('t_igr_master')
->where('IGRNO', $IGRNo)
//->where('MaterialCode', $MaterialCode)
->update($igrarr);
@ -825,7 +848,7 @@ class Inwardgateregister_model extends Model
return $r;
}
function updateIGRLineItem($igrlineitemarr, $IGRitemNo){
$this->db->table('T_IGR_Details')
$this->db->table('t_igr_details')
->where('IGRItemNo', $IGRitemNo)
->update($igrlineitemarr);
$r = $this->db->affectedRows();
@ -833,7 +856,7 @@ class Inwardgateregister_model extends Model
}
function getpolineqty($NewPO)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')
$builder = $this->db->table('t_purchaseorder_lineitem')
->select('sum(Quantity)as Qty,sum(ReceivedQuantity)as rec')
->where('PONO', $NewPO);
@ -844,7 +867,7 @@ class Inwardgateregister_model extends Model
function POLineItemsupdatestatus($PONO, $Newstatus)
{
$this->db->table('T_PurchaseOrder_LineItem')
$this->db->table('t_purchaseorder_lineitem')
->where('PONO', $PONO)
->update($Newstatus);
@ -854,7 +877,7 @@ class Inwardgateregister_model extends Model
function pomasterupdatestatus($PONO, $Newstatus)
{
$this->db->table('T_PurchaseOrder_Master')
$this->db->table('t_purchaseorder_master')
->where('PONO', $PONO)
->update($Newstatus);
@ -864,11 +887,11 @@ class Inwardgateregister_model extends Model
public function ViewIGRHistory($igr)
{
$builder = $this->db->table('T_IGR_History');
$builder = $this->db->table('t_igr_history');
$builder->select('T_IGR_History.*, CONCAT_WS(" ", T_Employee_Details.FirstName, T_Employee_Details.LastName) AS FullName');
$builder->join('tbl_users', 'tbl_users.userId = T_IGR_History.by', 'left');
$builder->join('T_Employee_Details', 'tbl_users.EmpID = T_Employee_Details.EmpID', 'left');
$builder->select('t_igr_history.*, CONCAT_WS(" ", t_employee_details.FirstName, t_employee_details.LastName) AS FullName');
$builder->join('tbl_users', 'tbl_users.userId = t_igr_history.by', 'left');
$builder->join('t_employee_details', 'tbl_users.EmpID = t_employee_details.EmpID', 'left');
$builder->where('IGR_No', $igr);
$query = $builder->get();

825
app/Models/Inwardgateregister_model_b4_17072024.php
View File

@ -1,825 +0,0 @@
<?php
namespace App\Models;
use CodeIgniter\Model;
class Inwardgateregister_model extends Model
{
/**
* This function is used to get the user listing count
* @param string $searchText : This is optional search text
* @return number $count : This is row count
*/
/**
* This function is used to get the user listing count
* @param string $searchText : This is optional search text
* @param number $page : This is pagination offset
* @param number $segment : This is pagination limit
* @return array $result : This is result
*/
/*--------------------------JUN 11Change ----------------------------------*/
function updatefile($bill, $Picture, $oldfile)
{
// if($oldfile != ''){
// //unlink("public/uploads/BillFiles/".$oldfile);//this deletes the file on particular folder too
// }
$this->db->table('T_Inwardgateregister_fileupload')
->set('FilePath', $Picture)
->where('BillNo', $bill)
->update();
$afftectedRows = $this->db->affectedRows();
return $afftectedRows;
}
function getfies($igr)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload')->select('*')
->where('IGRNO', $igr);
$query = $builder->get();
return $query->getResult();
}
function fileupload($myfiles)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload');
$builder->insert($myfiles);
$myfile = $this->db->affectedRows();
return $myfile;
}
/*------------------------------------------------------------*/
function addMaterialStockHistory($MaterialstockHistoryadd)
{
$this->db->transStart();
$builder = $this->db->table('T_Material_stock_history');
$builder->insert($MaterialstockHistoryadd);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
//print_r($insert_id);
if ($insert_id > 0) {
$subQuery = 'select * from T_Material_stock_history';
$query = $this->db->query($subQuery);
return $query->getResult();
}
}
/*------------------------------------------------------------*/
// function igrListing()
// {
// $builder = $this->db->table('T_IGR_Master igr')->select('igr.*,PO.DeliveryDate,sup.SupplierName,igr.file');
// ->join('T_PurchaseOrder_Master PO','igr.PONO = PO.PONO');
// ->join('T_SupplierDetailsN` sup','PO.SupplierID = sup.SupplierID');
// ->orderBy('igr.CreatedDate','desc');
// $query =$builder->get();
// $result = $query->getResult();
// return $result;
// }
function igrListing()
{
$builder = $this->db->table('T_IGR_Master igr')
->select('igr.*,PO.DeliveryDate,sup.SupplierName,fileup.FilePath,igr.file,PO.POType')
->join('T_PurchaseOrder_Master PO', 'igr.PONO = PO.PONO')
->join('T_Inwardgateregister_fileupload fileup', ' igr.IGRNO = fileup.IGRNO', 'left')
->join('T_SupplierDetailsN` sup', 'PO.SupplierID = sup.SupplierID')
->orderBy('igr.CreatedDate','desc')
->groupBy('igr.IGRNO', 'desc');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function viewIGRFile($IGRNO)
{
$builder = $this->db->table('T_Inwardgateregister_fileupload')
->distinct()->select('*') //BillNo,IGRNO,FilePath,PONO
->where('IGRNO', $IGRNO);
$query = $builder->get();
$result = $query->getResult();
// print_r($result);die;
return $result;
}
function viewIGRFile1($IGRNO)
{
$builder = $this->db->table('T_IGR_Master igrm')
->distinct()->select('igrm.file,igrm.PONO as pono') //BillNo,IGRNO,FilePath,PONO
//->join('T_Inwardgateregister_fileupload igrf','igrm.IGRNO = igrf.IGRNO','left')
//->join('T_IGR_Details igrd','igrm.IGRNO = igrd.IGRNO','left');
->where('igrm.IGRNO', $IGRNO);
$query = $builder->get();
$result = $query->getResult();
// print_r($result);die;
return $result;
}
function getpurchaseorder()
{
$builder = $this->db->table('T_PurchaseOrder_Master POM')
->distinct()->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address,POM.status,OGR_Status,POM.PODate,POM.IsOpenOrder,POM.CreatedDate,POM.POType')
->select("IF(POM.PODate IS NOT NULL, DATE_FORMAT(POM.PODate, '%Y-%m-%d'), NULL) AS formatted_PODate")
->select("IF(POM.IsOpenOrder IS NULL OR POM.IsOpenOrder = '', 0, POM.IsOpenOrder) AS formatted_IsOpenOrder")
->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO')
->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID')
->join('T_OGR_Master OGM ', 'POM.PONO = OGM.PONO_INV', 'left')
->where('POM.POType !=', SERVICE)
->where('POM.Status', PO_RELEASED)
->orWhere('POM.Status',REQITEM_Emergency_PO_CREATED)
->orWhere('POM.Status',IGR_CREATED)
->orWhere('POM.Status', MRIR_CREATED)
->orWhere('POM.Status', MRIR_APPROVED)
->orWhere('POM.Status', OGR_COMPLETE)
->orderBy('POM.CreatedDate', 'desc');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function viewpurchaseorder($PO)
{
$subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM
FROM T_PurchaseOrder_Master POM
LEFT JOIN T_PurchaseOrder_LineItem POL ON POL.PONO = POM.PONO
LEFT JOIN T_IGR_Master IGM ON IGM.PONO = POL.PONO
LEFT JOIN T_IGR_Details igr ON igr.MaterialCode = POL.MaterialCode AND IGM.PONO = POL.PONO
LEFT JOIN T_MaterialMaster MM ON MM.MaterialCode = POL.MaterialCode
LEFT JOIN T_MRIR_Master MRM ON POM.PONO = MRM.PONO
LEFT JOIN T_MRIR_Details MRD ON MRM.MRIRNO = MRD.MRIRNO AND POL.MaterialCode = MRD.MaterialCode
WHERE POM.PONO = ? GROUP BY POL.MaterialCode';
$query = $this->db->query($subQuery, [$PO]);
return $query->getResult();
/*
$builder = $this->db->table('T_PurchaseOrder_Master POM')
->select('POM.PONO,POL.MaterialCode,POL.Quantity,POL.PONO,MM.MaterialName,MM.UOM')
->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO','left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = POL.MaterialCode','left')
->where('POM.PONO',$PO )
->where('POL.Status !=',POLINEITEM_IGR_CREATED );
$query =$builder->get();
$result = $query->getResult();
return $result; */
}
function addigrM($igrM)
{
$this->db->transStart();
$builder = $this->db->table('T_IGR_Master');
$builder->insert($igrM);
$YesIAmAffected = $this->db->affectedRows();
$this->db->transComplete();
$result = [];
if ($YesIAmAffected > 0) {
$result = $this->db->table('T_IGR_Master')
->select('IGRNO')
->orderBy('CreatedDate', 'desc')
->get()
->getRow();
// $result->IGRNO;
}
$igrno = ($YesIAmAffected && !empty($result)) ? $result->IGRNO : '';
return $igrno;
}
function addigrD($igrD)
{
$this->db->transStart();
$builder = $this->db->table('T_IGR_Details');
$builder->insert($igrD);
$aff_row = $this->db->affectedRows();
$this->db->transComplete();
$result = $this->db->table('T_IGR_Details')
->select('IGRItemNo')
->orderBy('CreatedDate', 'desc')
->get()
->getRow();
$res = ($aff_row && $result !== null) ? $result->IGRItemNo : 0;
return $res;
}
function addmaterialhistory($historydetails)
{
$this->db->transStart();
$builder = $this->db->table('T_Material_stock_history');
$builder->insert($historydetails);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
return true;
}
function addmaterialmaster($current_qty, $MaterialCode)
{
$this->db->table('T_MaterialMaster')
->where('MaterialCode', $MaterialCode)
->update($current_qty);
return TRUE;
}
function get_CurrentQty($MaterialCode)
{
$builder = $this->db->table('T_MaterialMaster')->select('Current_stock')
->where('T_MaterialMaster.MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getitemvalue($pono, $MaterialCode)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('Rate,SupplierID')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO')
->where('T_PurchaseOrder_LineItem.PONO', $pono)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function viewigr($IGRNO)
{
$builder = $this->db->table('T_IGR_Master igr')
->distinct()
->select('igr.IGRNO,igr.*,igrd.*,MM.MaterialName,MM.UOM,sup.Address,sup.SupplierName,POM.ServiceDescription,POL.Quantity,POM.POType')
->join('T_IGR_Details igrd', 'igrd.IGRNO = igr.IGRNO')
->join('T_PurchaseOrder_Master POM', 'igr.PONO = POM.PONO')
->join('T_PurchaseOrder_LineItem POL', 'igr.PONO = POL.PONO and POL.MaterialCode=igrd.MaterialCode ')
->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID')
->join('T_MaterialMaster MM', 'MM.MaterialCode = igrd.MaterialCode')
->where('igr.IGRNO', $IGRNO);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function UpdatePOLineItem($LineItem, $PONO, $MaterialCode)
{
$this->db->table('T_PurchaseOrder_LineItem')
->where('PONO', $PONO)
->where('MaterialCode', $MaterialCode)
->update($LineItem);
return TRUE;
}
function UpdateMRIROUTQty($mrirarray, $MRIRNO, $MaterialCode)
{
$this->db->table('T_MRIR_Details')
->where('MaterialCode', $MaterialCode)
->update($mrirarray);
return TRUE;
}
function UpdatePOMasterOGRStatus($pono, $POMasterStatuss)
{
$this->db->table('T_PurchaseOrder_Master')
->where('PONO', $pono)
->update($POMasterStatuss);
return TRUE;
}
function update_OGR($PONO, $status)
{
$builder = $this->db->table('T_OGR_Master')->select('*')
->where('PONO_INV', $PONO);
$query = $builder->get();
if ($query->getNumRows() != 0) {
$ogrstatus = array('Status' => $status);
$this->db->table('T_OGR_Master')
->where('PONO_INV', $PONO)
->update($ogrstatus);
}
}
function UpdatePOMaster($PONO, $updatedBy)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('*')
->where('PONO', $PONO)
->where('Status !=', IGR_CREATED);
$query = $builder->get();
if ($query->getNumRows() == 0) {
$POStatus = array('status' => IGR_CREATED, 'UpdateBY' => $updatedBy);
$this->db->table('T_PurchaseOrder_Master')
->where('PONO', $PONO)
->update($POStatus);
}
}
function UpdateOGRMasterOGRStatus($OGRNO)
{
$builder = $this->db->table('T_OGR_Details')->select('*')
->where('OGRNO', $OGRNO)
->where('Status !=', OGR_PARTIAL_COMPLETE);
$query = $builder->get();
$OGRStatus = ($query->getNumRows() == 0) ? array('status' => OGR_PARTIAL_COMPLETE) : array('status' => OGR_COMPLETE);
$this->db->table('T_OGR_Master')
->where('OGRNO', $OGRNO)
->update($OGRStatus);
}
function UpdateMRIRMasterOGRStatus($MRIRNO, $OGRNO)
{
$builder = $this->db->table('T_OGR_Details')->select('*')
->where('OGRNO', $OGRNO)
->where('Status !=', OGR_PARTIAL_COMPLETE);
$query = $builder->get();
$OGRStatus = ($query->getNumRows() == 0) ? array('OGRstatus' => OGR_PARTIAL_COMPLETE) : array('OGRstatus' => OGR_COMPLETE);
$this->db->table('T_MRIR_Master')
->where('MRIRNO', $MRIRNO)
->update($OGRStatus);
}
function updateogrpomaster($pono)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('*')
->where('PONO', $pono)
->where('OGR_Status !=', 'ST064');
$query = $builder->get();
$POStatus = ($query->getNumRows() == 0) ?? array('status' => 'ST063');
$this->db->table('T_PurchaseOrder_Master')
->where('PONO', $pono)
->update($POStatus);
}
function getPOLineItemReceivedQty($PONO, $MaterialCode)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')->select('ReceivedQuantity')
->where('PONO', $PONO)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function GetMRIROutQty($MRIRNO, $MaterialCode)
{
$builder = $this->db->table('T_MRIR_Details')->select('Ogr_Out_Qty')
->where('MRIRNO', $MRIRNO)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getCustomer()
{
$subQuery = 'select client_id,client_name from ip_clients';
$query = $this->db->query($subQuery);
return $query->getResult();
}
function getSupplier()
{
$subQuery = 'select SupplierID,SupplierName from T_SupplierDetailsN';
$query = $this->db->query($subQuery);
return $query->getResult();
}
function getstoredmaterialcode()
{
$subQuery = 'select MaterialCode,MaterialName from T_MaterialMaster';
$query = $this->db->query($subQuery);
return $query->getResult();
}
function getOGRData()
{
$builder = $this->db->table('T_OGR_Master')
->select('T_OGR_Master.*,T_OGR_Details.*,T_SupplierDetailsN.SupplierName,sup.SupplierName as Servicesupplier')
->join('T_OGR_Details', 'T_OGR_Details.OGRNO=T_OGR_Master.OGRNO')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV', 'left')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_PurchaseOrder_Master.SupplierID', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=T_OGR_Details.SupplierID', 'left')
->groupBy('T_OGR_Master.OGRNO');
//$this->db->where();
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getOGRDataforedit($OGRNO)
{
$builder = $this->db->table('T_OGR_Master')
->select('T_OGR_Master.*,T_SupplierDetailsN.SupplierName,T_OGR_Details.*,sup.SupplierName as ServiceSupname,T_MaterialMaster.MaterialName as Matname,Remark')
->join('T_OGR_Details', 'T_OGR_Details.OGRNO=T_OGR_Master.OGRNO')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV', 'left')
->join('T_SupplierDetailsN', 'T_SupplierDetailsN.SupplierID=T_PurchaseOrder_Master.SupplierID', 'left')
->join('T_SupplierDetailsN sup', 'sup.SupplierID=T_OGR_Details.SupplierID', 'left')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_OGR_Details.MaterialCode', 'left')
->where('T_OGR_Master.OGRNO', $OGRNO);
//$this->db->groupBy('T_OGR_Master.OGRNO');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getOGRlineDataforedit($OGRNO, $MRIRNO)
{
$builder = $this->db->table('T_OGR_Details')
->select('T_OGR_Details.*,MaterialName,ActualQuantityReceived,Quantity,QuantityRejected')
->join('T_MaterialMaster', 'T_MaterialMaster.MaterialCode=T_OGR_Details.MaterialCode')
->join('T_OGR_Master', 'T_OGR_Master.OGRNO=T_OGR_Details.OGRNO')
->join('T_MRIR_Master', 'T_MRIR_Master.PONO=T_OGR_Master.PONO_INV', 'left')
->join('T_MRIR_Details', 'T_MRIR_Details.MRIRNO=T_MRIR_Master.MRIRNO and T_MRIR_Details.MaterialCode=T_OGR_Details.MaterialCode')
->join('T_PurchaseOrder_Master', 'T_PurchaseOrder_Master.PONO=T_MRIR_Master.PONO')
->join('T_PurchaseOrder_LineItem', 'T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO and T_OGR_Details.MaterialCode=T_PurchaseOrder_LineItem.MaterialCode')
->where('T_OGR_Details.OGRNO', $OGRNO)
->where('T_MRIR_Details.MRIRNO', $MRIRNO)
->groupBy('T_OGR_Details.MaterialCode');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getInvoice($CustomerId)
{
$builder = $this->db->table('ip_invoices')->select('ip_invoices.invoice_id,invoice_number,item_product_id,item_name,item_quantity')
->join('ip_invoice_items', 'ip_invoice_items.invoice_id = ip_invoices.invoice_id')
->join('ip_clients', 'ip_invoices.client_id = ip_clients.client_id')
->where('ip_invoices.client_id', $CustomerId);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getPOmrir($PONO)
{
$builder = $this->db->table('T_MRIR_Master')->select('MRIRNO')
->where('T_MRIR_Master.PONO', $PONO)
->where('T_MRIR_Master.OGRstatus !=', OGR_COMPLETE);
// ->where('Status !=',IGR_CREATED);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function getPO($supplierId)
{
/// echo $supplierId;
$subQuery = 'select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
where T_PurchaseOrder_Master.SupplierID=? and (T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=? or T_PurchaseOrder_Master.Status=?) group by T_PurchaseOrder_Master.PONO';
//$query= $this->db->query($subQuery, array($supplierId,ST044,PO,ST063));
$query = $this->db->query($subQuery, array($supplierId, ST044, PO, PO_RELEASED, IGR_CREATED, MRIR_CREATED, PARTIAL_MRIRAPPROVED, OGR_COMPLETE, OGR_PARTIAL_COMPLETE, OGR_CREATED));
return $query->getResult();
}
function getPODetails($PONO)
{
$subQuery = 'select distinct T_PurchaseOrder_Master.PONO,T_PurchaseOrder_LineItem.MaterialCode,
T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,
T_MRIR_Details.QuantityRejected,MaterialName,balance_Qty
from T_PurchaseOrder_Master
join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Details on T_MRIR_Master.MRIRNO = T_MRIR_Details.MRIRNO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
left join T_OGR_Master on T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV
left join T_OGR_Details on T_OGR_Master.OGRNO=T_OGR_Details.OGRNO and T_PurchaseOrder_LineItem.MaterialCode= T_OGR_Details.MaterialCode
where T_PurchaseOrder_Master.PONO=?';
$query = $this->db->query($subQuery, array($PONO));
return $query->getResult();
}
function getPOMRIRDetails($MRIRno, $PONO, $materialcode)
{
$subQuery = 'select T_MRIR_Details.MaterialCode,ActualQuantityReceived,QuantityAccepted,QuantityRejected,
MaterialName,Quantity as Oqty,SUM(Ogr_Out_Qty) as allowedQty
from T_MRIR_Details
join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
join T_MRIR_Master on T_MRIR_Details.MRIRNO = T_MRIR_Master.MRIRNO
join T_PurchaseOrder_LineItem on T_MRIR_Master.PONO = T_PurchaseOrder_LineItem.PONO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
where T_MRIR_Details.MRIRNO=? and T_MRIR_Master.PONO=? and T_MRIR_Details.MaterialCode=? group by T_MRIR_Details.MaterialCode;';
$query = $this->db->query($subQuery, array($MRIRno, $PONO, $materialcode));
return $query->getResult();
}
function getPOMRIRMaterial($MRIRno, $PONO)
{
$builder = $this->db->table('T_MRIR_Details')
->select('MaterialCode')
->join('T_MRIR_Master', 'T_MRIR_Master.MRIRNO=T_MRIR_Details.MRIRNO')
->where('T_MRIR_Details.MRIRNO', $MRIRno)
->where('PONO', $PONO)
->groupBy('T_MRIR_Details.MaterialCode');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function gettotalout($PONO, $materialcode)
{
$subQuery = 'select SUM(Ogr_Out_Qty)
from T_MRIR_Details
join T_MRIR_Master on T_MRIR_Master.MRIRNO= T_MRIR_Details.MRIRNO
where PONO =? and MaterialCode = ?; ';
$query = $this->db->query($subQuery, array($PONO, $materialcode));
return $query->getResult();
}
function getPOmaterialDetails($PONO, $materialcode)
{
$subQuery = 'select distinct T_PurchaseOrder_LineItem.MaterialCode,MaterialName,T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,T_MRIR_Details.QuantityRejected,balance_Qty
from T_PurchaseOrder_Master
join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Details on T_MRIR_Master.MRIRNO = T_MRIR_Details.MRIRNO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
left join T_OGR_Master on T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV
left join T_OGR_Details on T_OGR_Master.OGRNO=T_OGR_Details.OGRNO and T_PurchaseOrder_LineItem.MaterialCode= T_OGR_Details.MaterialCode
where T_PurchaseOrder_LineItem.PONO=? and T_PurchaseOrder_LineItem.MaterialCode=?';
$query = $this->db->query($subQuery, array($PONO, $materialcode));
return $query->getResult();
}
function getPOmaterial($PONO)
{
$subQuery = 'select MaterialCode from T_PurchaseOrder_LineItem where PONO=?';
$query = $this->db->query($subQuery, array($PONO));
return $query->getResult();
}
function AddOGR($ogrmaster)
{
$this->db->transStart();
$builder = $this->db->table('T_OGR_Master');
$builder->insert($ogrmaster);
$aff_row = $this->db->affectedRows();
$this->db->transComplete();
if ($aff_row > 0) {
//$subQuery = 'select max(OGRNO) as OGRNO from T_OGR_Master';
// $subQuery = 'select OGRNO from order by desc limit 1';
// $query = $this->db->query($subQuery);
// return $query->getResult();
$result = $this->db->table('T_OGR_Master')
->select('OGRNO')
->orderBy('CreatedOn', 'desc')
->get()
->getRow();
$OGRNO = ($aff_row && $result !== null) ? $result->OGRNO : 0;
return $OGRNO;
}
}
function getlastogrline()
{
//$subQuery = 'select max(OGRItemNO) as OGRItemNO from T_OGR_Details';
$subQuery = 'select OGRItemNO from T_OGR_Details order by CreatedOn desc limit 1';
$query = $this->db->query($subQuery);
return $query->getResult();
}
function UpdateOGR($updateogrmaster, $OGRNO)
{
$this->db->table('T_OGR_Master')
->where('OGRNO', $OGRNO)
->update($updateogrmaster);
return TRUE;
}
function AddOgrLine($Ogrline)
{
$this->db->transStart();
$builder = $this->db->table('T_OGR_Details');
$builder->insert($Ogrline);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
return $insert_id;
}
// function GetIGR_Details($pono)
// {
//
// $builder = $this->db->table('ip_invoices')->select('IGRNO,MRIRNO,MaterialCode,')
// ->join('ip_invoice_items','ip_invoice_items.invoice_id = ip_invoices.invoice_id');
// ->join('ip_clients','ip_invoices.client_id = ip_clients.client_id');
// $this->db->where('ip_invoices.client_id',$CustomerId);
// $query =$builder->get();
//
// $result = $query->getResult();
// return $result;
// }
function GetPreSavedQty($pono, $MaterialCode)
{
// $subQuery = 'select Total_OutwardQty from T_PurchaseOrder_LineItem where PONO=? and MaterialCode=?';
// $query = $this->db->query($subQuery, array($pono,$MaterialCode));
//
// return $query->getResult();
$builder = $this->db->table('T_PurchaseOrder_LineItem')
->select('Total_OutwardQty')
->where('PONO', $pono)
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
$result = $query->getResult();
return $result;
}
function check_PO($pono)
{
$subQuery = 'select * from T_OGR_Master where PONO_INV=?';
$query = $this->db->query($subQuery, array($pono));
return $query->getResult();
}
function UpdatePOMasterOGR($postatus, $pono)
{
$this->db->table('T_PurchaseOrder_Master')
->where('PONO', $pono)
//->where('MaterialCode', $MaterialCode)
->update($postatus);
return TRUE;
}
function updateigr($igrarr, $IGRNo)
{
$this->db->table('T_IGR_Master')
->where('IGRNO', $IGRNo)
//->where('MaterialCode', $MaterialCode)
->update($igrarr);
$r = $this->db->affectedRows();
return $r;
}
function updateIGRLineItem($igrlineitemarr, $IGRitemNo){
$this->db->table('T_IGR_Details')
->where('IGRItemNo', $IGRitemNo)
->update($igrlineitemarr);
$r = $this->db->affectedRows();
return $r;
}
function getpolineqty($NewPO)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')
->select('sum(Quantity)as Qty,sum(ReceivedQuantity)as rec')
->where('PONO', $NewPO);
$query = $builder->get();
return $query->getResult();
}
function POLineItemsupdatestatus($PONO, $Newstatus)
{
$this->db->table('T_PurchaseOrder_LineItem')
->where('PONO', $PONO)
->update($Newstatus);
$update = $this->db->affectedRows();
return $update;
}
function pomasterupdatestatus($PONO, $Newstatus)
{
$this->db->table('T_PurchaseOrder_Master')
->where('PONO', $PONO)
->update($Newstatus);
$update = $this->db->affectedRows();
return $update;
}
}

12
app/Models/Login_model.php
View File

@ -18,8 +18,8 @@ class Login_model extends Model
$builder = $this->db->table('tbl_users as BaseTbl')
->select('BaseTbl.userId, BaseTbl.password, Emp.EmpID, Emp.FirstName, Emp.Designation, BaseTbl.roleId, Roles.role, DEPT.DEPCode, DEPT.DepartmentName, DEPT.HeadDept, Emp.ProfilePic')
->join('tbl_roles as Roles', 'Roles.roleId = BaseTbl.roleId')
->join('T_Employee_Details as Emp', 'BaseTbl.EmpID = Emp.EmpID')
->join('T_DepartmentDetails as DEPT', 'Emp.Departmentcode = DEPT.DEPCode')
->join('t_employee_details as Emp', 'BaseTbl.EmpID = Emp.EmpID')
->join('t_departmentdetails as DEPT', 'Emp.Departmentcode = DEPT.DEPCode')
->where('BaseTbl.isDeleted !=', 1)
->where('BaseTbl.email', $email)
->orWhere('Emp.ContactNumber', $email)
@ -33,7 +33,7 @@ class Login_model extends Model
$user = $query->getResult();
$query = $this->db->table('T_Company_Details')->select('CompanyName')->get();
$query = $this->db->table('t_company_details')->select('CompanyName')->get();
$result = $query->getRow();
$CompanyName = !empty($result) ? $result->CompanyName : '';
$addCompanyName = function ($u) use ($CompanyName) {
@ -140,7 +140,7 @@ class Login_model extends Model
function Accessdep($EmpID)
{
$builder = $this->db->table('T_AccessDepartments')
$builder = $this->db->table('t_accessdepartments')
->select('Departmentcode as AssDep')
->where('EmpID', $EmpID);
@ -156,7 +156,7 @@ class Login_model extends Model
$builder = $this->db->table('tbl_users as UsrTbl');
$builder->select('UsrTbl.userId,UsrTbl.email,EmpTbl.ContactNumber,EmpTbl.FirstName')
->from('tbl_users as UsrTbl')
->join('T_Employee_Details as EmpTbl', 'UsrTbl.EmpID = EmpTbl.EmpID')
->join('t_employee_details as EmpTbl', 'UsrTbl.EmpID = EmpTbl.EmpID')
->where('EmpTbl.ContactNumber', $mobileno)
->where('UsrTbl.email', $emailid)
->where('UsrTbl.isDeleted', 0);
@ -188,7 +188,7 @@ class Login_model extends Model
{
$builder = $this->db->table('tbl_users as BaseTbl')
->select('BaseTbl.userId')
->join('T_Employee_Details as Emp', 'BaseTbl.EmpID = Emp.EmpID')
->join('t_employee_details as Emp', 'BaseTbl.EmpID = Emp.EmpID')
->where('Emp.ContactNumber', $phno);
$query = $builder->get();
$result = $query->getResult();

170
app/Models/Monthlypay_model.php
View File

@ -30,22 +30,22 @@ class Monthlypay_model extends Model
$lastdate = $year_val . '-' . $month_val . '-' . $date_val;
//echo $lastdate ;
// ->select('T_Monthly_Pay_Inputs.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Payroll.Key,T_Loan_Master.Loan_ID');
// $builder = $this->db->table('T_Monthly_Pay_Inputs');
// ->join('T_Employee_Details','T_Monthly_Pay_Inputs.EmpID=T_Employee_Details.EmpID');
// ->join('T_Payroll','T_Monthly_Pay_Inputs.EmpID=T_Payroll.EmpID','left');
// ->join('T_Loan_Master','T_Monthly_Pay_Inputs.EmpID=T_Loan_Master.EmpID','left');
// $this->db->orderBy('T_Employee_Details.EmpID','asc');
// $this->db->where('T_Employee_Details.DateofJoining <=',$lastdate);
// ->select('t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName,t_payroll.Key,t_loan_master.Loan_ID');
// $builder = $this->db->table('t_monthly_pay_inputs');
// ->join('t_employee_details','t_monthly_pay_inputs.EmpID=t_employee_details.EmpID');
// ->join('t_payroll','t_monthly_pay_inputs.EmpID=t_payroll.EmpID','left');
// ->join('t_loan_master','t_monthly_pay_inputs.EmpID=t_loan_master.EmpID','left');
// $this->db->orderBy('t_employee_details.EmpID','asc');
// $this->db->where('t_employee_details.DateofJoining <=',$lastdate);
// $this->db->where('Month_Year',$current);
$sql = "select T_Monthly_Pay_Inputs.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Loan_Master.Loan_ID,T_Loan_Master.Monthly_Due,T_Payroll.Key
from T_Monthly_Pay_Inputs
left join T_Employee_Details on T_Monthly_Pay_Inputs.EmpID=T_Employee_Details.EmpID and T_Employee_Details.DateofJoining <= ?
left join T_Payroll on T_Monthly_Pay_Inputs.EmpID=T_Payroll.EmpID
left join T_Loan_Master on T_Monthly_Pay_Inputs.EmpID=T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
$sql = "select t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_payroll.Key
from t_monthly_pay_inputs
left join t_employee_details on t_monthly_pay_inputs.EmpID=t_employee_details.EmpID and t_employee_details.DateofJoining <= ?
left join t_payroll on t_monthly_pay_inputs.EmpID=t_payroll.EmpID
left join t_loan_master on t_monthly_pay_inputs.EmpID=t_loan_master.EmpID and t_loan_master.is_Active = 1
where Month_Year = ?
order by T_Employee_Details.EmpID asc";
order by t_employee_details.EmpID asc";
$query = $this->db->query($sql, array($lastdate, $current));
// print_r($query-getResult());
@ -63,11 +63,11 @@ class Monthlypay_model extends Model
$date_val = cal_days_in_month(CAL_GREGORIAN, $month_val, $year_val);
//$monthyear_val = date('Y-m',strtotime($current));
$lastdate = $year_val . '-' . $month_val . '-' . $date_val;
$builder = $this->db->table('T_Employee_Details')
->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining')
//->join('T_Emp_Pay_Data','T_Emp_Pay_Data.EmpID=T_Employee_Details.EmpID','Left')
->where('T_Employee_Details.IsActive', 1)
->where('T_Employee_Details.DateofJoining <=', $lastdate)
$builder = $this->db->table('t_employee_details')
->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining')
//->join('t_emp_pay_data','t_emp_pay_data.EmpID=t_employee_details.EmpID','Left')
->where('t_employee_details.IsActive', 1)
->where('t_employee_details.DateofJoining <=', $lastdate)
->orderBy('EmpID', 'asc');
$query = $builder->get();
$result = $query->getResult();
@ -99,19 +99,19 @@ class Monthlypay_model extends Model
$lastdate = $year_val . '-' . $month_val . '-' . $date_val;
//echo $lastdate;
//left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID and month(T_Payroll.PayOn) = month(?) and year(T_Payroll.PayOn) = year(?)
$sql = "select T_Emp_Pay_Data.EmpID, T_Emp_Pay_Data.Incentives as MasterIncentives,T_Emp_Pay_Data.*,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.DateofJoining,T_Attendance.Days_Worked as Days_worked,T_Attendance.Absent as LOP_Days,T_Attendance.Paid_Leave as Paid_leave,T_Attendance.Total_OTHrs as OT_Hrs_Worked,T_Attendance.NoofDays,T_Loan_Master.Loan_ID,T_Loan_Master.Monthly_Due,T_Loan_Master.Due_Start_Date as DueDate,T_Loan_Master.Loan_Amount,T_Loan_Master.Paid_Amount,T_Payroll.Key,T_Monthly_Pay_Inputs.Incentives as MonthlyIncentives,T_Monthly_Pay_Inputs.Loan_Recovered,T_Monthly_Pay_Inputs.Estimate,T_Monthly_Pay_Inputs.Festival_Bonus,T_Monthly_Pay_Inputs.Other_Deductions,T_Loan_History .Balance_Amount
from T_Emp_Pay_Data
left join T_Employee_Details on T_Employee_Details.EmpID = T_Emp_Pay_Data.EmpID
left join T_Payroll on T_Employee_Details.EmpID = T_Payroll.EmpID and T_Payroll.PayOn = ?
//left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and month(t_payroll.PayOn) = month(?) and year(t_payroll.PayOn) = year(?)
$sql = "select t_emp_pay_data.EmpID, t_emp_pay_data.Incentives as MasterIncentives,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Incentives as MonthlyIncentives,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
from t_emp_pay_data
left join t_employee_details on t_employee_details.EmpID = t_emp_pay_data.EmpID
left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and t_payroll.PayOn = ?
left join T_Attendance on T_Emp_Pay_Data.EmpID = T_Attendance.EmpID
left join T_Monthly_Pay_Inputs on T_Monthly_Pay_Inputs.EmpID = T_Emp_Pay_Data.EmpID and T_Monthly_Pay_Inputs.Month_Year = ?
left join T_Loan_Master on T_Emp_Pay_Data.EmpID = T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
left join T_Loan_History on T_Loan_History .Loan_ID = T_Loan_Master.Loan_ID
where T_Employee_Details.DateofJoining <= ?
and month(T_Attendance.Month_Year) = month(?) and year(T_Attendance.Month_Year) = year(?)
order by T_Employee_Details.EmpID";
left join t_attendance on t_emp_pay_data.EmpID = t_attendance.EmpID
left join t_monthly_pay_inputs on t_monthly_pay_inputs.EmpID = t_emp_pay_data.EmpID and t_monthly_pay_inputs.Month_Year = ?
left join t_loan_master on t_emp_pay_data.EmpID = t_loan_master.EmpID and t_loan_master.is_Active = 1
left join t_loan_history on t_loan_history .Loan_ID = t_loan_master.Loan_ID
where t_employee_details.DateofJoining <= ?
and month(t_attendance.Month_Year) = month(?) and year(t_attendance.Month_Year) = year(?)
order by t_employee_details.EmpID";
$query = $this->db->query($sql, array($month, $month, $lastdate, $current, $current));
return $query->getResult();
@ -121,11 +121,11 @@ class Monthlypay_model extends Model
function getPublicHoldays($current = "")
{
if (!empty($current)) {
$sql = "select * from T_Public_Holidays where month(H_Date) = month(?) and year(H_Date) = year(?)";
$sql = "select * from t_public_holidays where month(H_Date) = month(?) and year(H_Date) = year(?)";
$query = $this->db->query($sql, array($current, $current));
return $query->getResult();
} else {
$sql = "select * from T_Public_Holidays where year(H_Date)=year(CURRENT_DATE) order by H_Date";
$sql = "select * from t_public_holidays where year(H_Date)=year(CURRENT_DATE) order by H_Date";
$query = $this->db->query($sql);
return $query->getResult();
}
@ -136,7 +136,7 @@ class Monthlypay_model extends Model
$Date = format_date($Date);
//echo $Date;die();[
$sql = "select count(*) as count from T_Public_Holidays where H_Date = ?";
$sql = "select count(*) as count from t_public_holidays where H_Date = ?";
$query = $this->db->query($sql, array($Date));
return $query->getResultArray();
}
@ -145,12 +145,12 @@ class Monthlypay_model extends Model
{
//print_r($data);
if ($string == 'i') {
$builder = $this->db->table('T_Public_Holidays');
$builder = $this->db->table('t_public_holidays');
$builder->insert($data);
$i = $this->db->affectedRows();
return $i;
} else if ($string == 'u') {
$this->db->table('T_Public_Holidays')
$this->db->table('t_public_holidays')
->where('H_date', $data['H_Date'])
->update($data);
@ -163,7 +163,7 @@ class Monthlypay_model extends Model
function deleteHoliday($d)
{
$d = format_date($d);//3rd
$this->db->table('T_Public_Holidays')->delete(['H_date' => $d]);
$this->db->table('t_public_holidays')->delete(['H_date' => $d]);
return $this->db->affectedRows();
}
function monthlyAttendance($current = "")
@ -174,15 +174,15 @@ class Monthlypay_model extends Model
$date_val = cal_days_in_month(CAL_GREGORIAN, $month_val, $year_val);
$lastdate = $year_val . '-' . $month_val . '-' . $date_val;
$builder = $this->db->table('T_Attendance')
->select('T_Attendance.*,T_Employee_Details.FirstName,T_Employee_Details.LastName')
->join('T_Employee_Details', 'T_Attendance.EmpID=T_Employee_Details.EmpID')
// ->where('year(T_Employee_Details.DateofJoining) <= ',$year_val)
// ->where('month(T_Employee_Details.DateofJoining) <= ',$month_val)
->where('T_Employee_Details.DateofJoining <= ', $lastdate)
$builder = $this->db->table('t_attendance')
->select('t_attendance.*,t_employee_details.FirstName,t_employee_details.LastName')
->join('t_employee_details', 't_attendance.EmpID=t_employee_details.EmpID')
// ->where('year(t_employee_details.DateofJoining) <= ',$year_val)
// ->where('month(t_employee_details.DateofJoining) <= ',$month_val)
->where('t_employee_details.DateofJoining <= ', $lastdate)
->where('Month_Year', $current)
// ->where('T_Employee_Details.IsActive',1)
->orderBy('T_Attendance.EmpID', 'asc');
// ->where('t_employee_details.IsActive',1)
->orderBy('t_attendance.EmpID', 'asc');
$query = $builder->get();
$result = $query->getResult();
@ -197,7 +197,7 @@ class Monthlypay_model extends Model
$count = 0;
$builder = $this->db->table('T_Monthly_Pay_Inputs')->select('count(*) as count')
$builder = $this->db->table('t_monthly_pay_inputs')->select('count(*) as count')
->where('Month_Year', $month)
->where('EmpID', $empid);
$isExits = $builder->get();
@ -210,13 +210,13 @@ class Monthlypay_model extends Model
// print_r($data);die;
if ($count == 0) {
$builder = $this->db->table('T_Monthly_Pay_Inputs');
$builder = $this->db->table('t_monthly_pay_inputs');
$builder->insert($data);
$i = $this->db->affectedRows();
return $i;
} elseif ($count == 1) {
$this->db->table('T_Monthly_Pay_Inputs')
$this->db->table('t_monthly_pay_inputs')
// ->where('H_date', $data['H_Date']) // ask velmurugan H_Date public hoilday table la irukku
->where('EmpID', $data['EmpID']) // temp solution
->update($data);
@ -229,7 +229,7 @@ class Monthlypay_model extends Model
function saveAttendance($monthattendance, $Month_Year, $EmpID)
{
$builder = $this->db->table('T_Attendance')->select('count(*) as c')
$builder = $this->db->table('t_attendance')->select('count(*) as c')
->where('Month_Year', $Month_Year)
->where('EmpID', $EmpID);
$isExist = $builder->get();
@ -239,7 +239,7 @@ class Monthlypay_model extends Model
if ($ans == 0) {
//array_pop();
$builder = $this->db->table('T_Attendance');
$builder = $this->db->table('t_attendance');
$builder->insert($monthattendance);
return $this->db->affectedRows();
@ -254,7 +254,7 @@ class Monthlypay_model extends Model
// return false;
// }
} else {
$this->db->table('T_Attendance')
$this->db->table('t_attendance')
->where('Month_Year', $Month_Year)
->where('EmpID', $EmpID)
->update($monthattendance);
@ -268,7 +268,7 @@ class Monthlypay_model extends Model
function addNewmonthlisting($m_list)
{
$this->db->transStart();
$builder = $this->db->table('T_Monthly_Pay_Inputs');
$builder = $this->db->table('t_monthly_pay_inputs');
$builder->insert($m_list);
$Asset_Code = $this->db->insertId();
@ -279,11 +279,11 @@ class Monthlypay_model extends Model
function getUserInfo($EmpID, $month_year)
{
$builder = $this->db->table('T_Monthly_Pay_Inputs')
->select('T_Monthly_Pay_Inputs.*,T_Employee_Details.FirstName,T_Employee_Details.LastName')
->join('T_Employee_Details', 'T_Monthly_Pay_Inputs.EmpID=T_Employee_Details.EmpID')
->where('T_Monthly_Pay_Inputs.EmpID', $EmpID)
->where('T_Monthly_Pay_Inputs.Month_Year', $month_year);
$builder = $this->db->table('t_monthly_pay_inputs')
->select('t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName')
->join('t_employee_details', 't_monthly_pay_inputs.EmpID=t_employee_details.EmpID')
->where('t_monthly_pay_inputs.EmpID', $EmpID)
->where('t_monthly_pay_inputs.Month_Year', $month_year);
$query = $builder->get();
return $query->getResult();
@ -293,7 +293,7 @@ class Monthlypay_model extends Model
function editmonth($monthdata, $EmpID)
{
$monthyear = $monthdata['Month_Year'];
$this->db->table('T_Monthly_Pay_Inputs')
$this->db->table('t_monthly_pay_inputs')
->where('EmpID', $EmpID)
->where('Month_Year', $monthyear)
->update($monthdata);
@ -305,7 +305,7 @@ class Monthlypay_model extends Model
function viewmonth($monthdata, $employeeid)
{
$this->db->table('T_Monthly_Pay_Inputs')
$this->db->table('t_monthly_pay_inputs')
->orderBy('Month_Year')
->where('EmpID', $employeeid)
->update($monthdata);
@ -318,8 +318,8 @@ class Monthlypay_model extends Model
function emplist()
{
$sql = "select Emp.EmpID,CONCAT(FirstName,' ',LastName)as name ,Emp.Departmentcode, Dep.DepartmentName FROM T_Employee_Details as Emp
join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsActive = 1;";
$sql = "select Emp.EmpID,CONCAT(FirstName,' ',LastName)as name ,Emp.Departmentcode, Dep.DepartmentName FROM t_employee_details as Emp
join t_departmentdetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsActive = 1;";
$query = $this->db->query($sql);
return $query->getResult();
}
@ -330,7 +330,7 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA
//if(!empty($Permissiondata){
$this->db->transStart();
$builder = $this->db->table('T_Permission');
$builder = $this->db->table('t_permission');
$builder->insert($Permissiondata);
//$Asset_Code = $this->db->insert_id();
@ -345,7 +345,7 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA
{
$builder = $this->db->table('T_Permission')->select('*');
$builder = $this->db->table('t_permission')->select('*');
$query = $builder->get();
return $query->getResult();
}
@ -353,9 +353,9 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA
function pdf($SNO)
{
$builder = $this->db->table('T_Permission per')->select('per.*,emp.FirstName,LastName,dep.DepartmentName')
->join('T_Employee_Details emp', 'emp.EmpID = per.EmpID')
->join('T_DepartmentDetails dep', 'dep.DEPCode = emp.Departmentcode')
$builder = $this->db->table('t_permission per')->select('per.*,emp.FirstName,LastName,dep.DepartmentName')
->join('t_employee_details emp', 'emp.EmpID = per.EmpID')
->join('t_departmentdetails dep', 'dep.DEPCode = emp.Departmentcode')
->where('per.SNO', $SNO);
$query = $builder->get();
return $query->getResult();
@ -372,15 +372,15 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA
$pre_year = $curr_split[0];
$curr_year = $curr_split[1];
$sql = "select T_Monthly_Pay_Inputs.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,sum(Incentives) as Incentives,sum(Festival_Bonus) as Bonus
from T_Monthly_Pay_Inputs
join T_Employee_Details on T_Monthly_Pay_Inputs.EmpID = T_Employee_Details.EmpID
$sql = "select t_monthly_pay_inputs.EmpID,t_employee_details.FirstName,t_employee_details.LastName,sum(Incentives) as Incentives,sum(Festival_Bonus) as Bonus
from t_monthly_pay_inputs
join t_employee_details on t_monthly_pay_inputs.EmpID = t_employee_details.EmpID
where
substr(T_Monthly_Pay_Inputs.Month_Year,4) = ?
and substr(T_Monthly_Pay_Inputs.Month_Year,1,2) >= 4
or substr(T_Monthly_Pay_Inputs.Month_Year,4) = ?
and substr(T_Monthly_Pay_Inputs.Month_Year,1,2) <= 3
group by T_Monthly_Pay_Inputs.EmpID";
substr(t_monthly_pay_inputs.Month_Year,4) = ?
and substr(t_monthly_pay_inputs.Month_Year,1,2) >= 4
or substr(t_monthly_pay_inputs.Month_Year,4) = ?
and substr(t_monthly_pay_inputs.Month_Year,1,2) <= 3
group by t_monthly_pay_inputs.EmpID";
$query = $this->db->query($sql, array($pre_year, $curr_year));
return $query->getResult();
@ -394,13 +394,13 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA
$pre_year = $curr_split[0];
$curr_year = $curr_split[1];
$sql = "select T_Monthly_Pay_Inputs.EmpID,T_Monthly_Pay_Inputs.Month_Year,T_Employee_Details.FirstName,T_Employee_Details.LastName,sum(Incentives) as Incentives,sum(Festival_Bonus) as Bonus
from T_Monthly_Pay_Inputs
join T_Employee_Details on T_Monthly_Pay_Inputs.EmpID = T_Employee_Details.EmpID
and T_Monthly_Pay_Inputs.EmpID = ?
where substr(T_Monthly_Pay_Inputs.Month_Year,4) = ? and substr(T_Monthly_Pay_Inputs.Month_Year,1,2) >= 4
or substr(T_Monthly_Pay_Inputs.Month_Year,4) = ? and substr(T_Monthly_Pay_Inputs.Month_Year,1,2) <= 3
group by T_Monthly_Pay_Inputs.Month_Year";
$sql = "select t_monthly_pay_inputs.EmpID,t_monthly_pay_inputs.Month_Year,t_employee_details.FirstName,t_employee_details.LastName,sum(Incentives) as Incentives,sum(Festival_Bonus) as Bonus
from t_monthly_pay_inputs
join t_employee_details on t_monthly_pay_inputs.EmpID = t_employee_details.EmpID
and t_monthly_pay_inputs.EmpID = ?
where substr(t_monthly_pay_inputs.Month_Year,4) = ? and substr(t_monthly_pay_inputs.Month_Year,1,2) >= 4
or substr(t_monthly_pay_inputs.Month_Year,4) = ? and substr(t_monthly_pay_inputs.Month_Year,1,2) <= 3
group by t_monthly_pay_inputs.Month_Year";
$query = $this->db->query($sql, array($EmployeeID, $pre_year, $curr_year));
return $query->getResult();
@ -450,9 +450,9 @@ join T_DepartmentDetails as Dep on Dep.DEPCode=Emp.Departmentcode where Emp.IsA
$sql = "select att.EmpID," . $WH . ",a.FirstName from T_Attendance as att
join T_Employee_Details as a on a.EmpID= att.EmpID
where Month_Year = ? and att.EmpID in (select EmpID from T_Attendance)";
$sql = "select att.EmpID," . $WH . ",a.FirstName from t_attendance as att
join t_employee_details as a on a.EmpID= att.EmpID
where Month_Year = ? and att.EmpID in (select EmpID from t_attendance)";
$query = $this->db->query($sql, array($daydate));
return $query->getResultArray();
@ -462,7 +462,7 @@ where Month_Year = ? and att.EmpID in (select EmpID from T_Attendance)";
function dayAllPersentEmpSalary($WH, $OT, $date)
{
$sql = "select EmpID," . $WH . "," . $OT . " from T_Attendance where Month_Year = ? and EmpID in (select EmpID from T_Attendance)";
$sql = "select EmpID," . $WH . "," . $OT . " from t_attendance where Month_Year = ? and EmpID in (select EmpID from t_attendance)";
$query = $this->db->query($sql, array($date));
return $query->getResultArray();
@ -473,7 +473,7 @@ where Month_Year = ? and att.EmpID in (select EmpID from T_Attendance)";
function persentEmployeeDetails($EmpID)
{
$sql = "select * FROM T_Emp_Pay_Data where EmpID = ?;";
$sql = "select * FROM t_emp_pay_data where EmpID = ?;";
$query = $this->db->query($sql, array($EmpID));
return $query->getResult();

195
app/Models/Mrir_model.php
View File

@ -13,49 +13,26 @@ class Mrir_model extends Model
/* This function is used to display the IGR in dropdown box*/
function getIGRNOonly()
{
$builder = $this->db->table('T_IGR_Master')->select('IGRNO')
$builder = $this->db->table('t_igr_master')->select('IGRNO')
->orderBy('IGRNO', 'asc');
$res = $builder->get();
return $res->getResult();
}
/**
* This function is used to get the user listing count
* @param string $searchText : This is optional search text
* @param number $page : This is pagination offset
* @param number $segment : This is pagination limit
* @return array $result : This is result
*/
function ViewigrListing()
{
$builder = $this->db->table('T_IGR_Master igr')
->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType')
->join('T_PurchaseOrder_Master PO', 'igr.PONO = PO.PONO')
->join('T_SupplierDetailsN` sup', 'PO.SupplierID = sup.SupplierID')
->where('igr.IGRStatus !=', MRIR_CREATED)
->where('PO.IsQualityChkReqired', 1)
->orderBy("CreatedDate", "desc");
$query = $builder->get();
$result = $query->getResult();
return $result;
}
/* This function is used to get the igr value (button link)*/
function get_IGR($IgrNo)
{
$builder = $this->db->table('T_IGR_Master IGRM')
$builder = $this->db->table('t_igr_master IGRM')
->distinct()
->select('IGRM.DeliveryChellanDate,IGRM.CreatedDate,IGRM.IGRNO,IGRM.VehicleNo,IGRM.DeliveryChellanOrInvoiceNo,IGRM.CourierNo,IGRM.PONO,IGRD.MaterialCode,IGRD.QuantityAsPerInvoice,POMR.ServiceDescription,POMR.PODate,POMR.DeliveryDate,POMR.CreatedBy,SUPP.SupplierName,SUPP.Address,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName')
//->select("DATE_FORMAT(IGRM.DeliveryChellanDate, '%d %m %Y') as DCdate")
->join('T_PurchaseOrder_Master POMR ', 'IGRM.PONO=POMR.PONO')
->join('T_IGR_Details IGRD', 'IGRM.IGRNO=IGRD.IGRNO')
->join('T_SupplierDetailsN SUPP', 'POMR.SupplierID=SUPP.SupplierID')
->join('T_MaterialMaster MM', ' MM.MaterialCode=IGRD.MaterialCode')
->join('T_PurchaseOrder_LineItem POLT', 'IGRM.PONO=POLT.PONO and IGRD.MaterialCode = POLT.MaterialCode')
->join('t_purchaseorder_master POMR ', 'IGRM.PONO=POMR.PONO')
->join('t_igr_details IGRD', 'IGRM.IGRNO=IGRD.IGRNO')
->join('t_supplierdetailsn SUPP', 'POMR.SupplierID=SUPP.SupplierID')
->join('t_materialmaster MM', ' MM.MaterialCode=IGRD.MaterialCode')
->join('t_purchaseorder_lineitem POLT', 'IGRM.PONO=POLT.PONO and IGRD.MaterialCode = POLT.MaterialCode')
->join('tbl_users user', 'user.userid=POMR.CreatedBy', 'left')
->join('T_Employee_Details ED', 'ED.EmpID = user.EmpID', 'left')
->join('t_employee_details ED', 'ED.EmpID = user.EmpID', 'left')
->where('IGRM.IGRNO', $IgrNo);
$query = $builder->get();
@ -71,16 +48,16 @@ as OrderedQuantity ,(MD.ActualQuantityReceived) as ActualReceivedqty,(MD.Quantit
AcceptedQty,REQ.ReqDate, ReqLine.Status as ReqStatus,
st.StatusCode as ReqStatus,st.StatusName,
ReqLine.Remarks
from T_Requestion_Details ReqLine join T_PurchaseOrder_LineItem POL
from t_requestion_details ReqLine join t_purchaseorder_lineitem POL
on ReqLine.ReqNo = POL.ReqNo and ReqLine.MaterialCode = POL.MaterialCode
join T_Requestion_Master REQ on REQ.ReqNo = ReqLine.ReqNo
join T_PurchaseOrder_Master POMast on POMast.PONO=POL.PONO
join T_Status st on ReqLine.Status = st.StatusCode
join T_MRIR_Master MR on MR.PONO = POL.PONO join T_MRIR_Details MD
on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on
join t_requestion_master REQ on REQ.ReqNo = ReqLine.ReqNo
join t_purchaseorder_master POMast on POMast.PONO=POL.PONO
join t_status st on ReqLine.Status = st.StatusCode
join t_mrir_master MR on MR.PONO = POL.PONO join t_mrir_details MD
on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join t_materialmaster MM on
MM.MaterialCode = ReqLine.MaterialCode join
T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby join
T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where
t_employee_details EMP on EMP.EmpID = REQ.Requestedby join
t_departmentdetails DD on DD.DEPCode = EMP.Departmentcode where
POL.status in (?,?)
and ReqLine.Status not in(?) and POMast.status not in(?)
group by ReqLine.MaterialCode ,POL.PONO';
@ -91,18 +68,18 @@ POL.status in (?,?)
/* This function is used to list the MRIR value*/
function view_mrir()
{
$builder = $this->db->table('T_MRIR_Master TMM')
$builder = $this->db->table('t_mrir_master TMM')
->distinct()
->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.MRIRStatus,ST.StatusName,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.CreatedBy,ED.FirstName as UpdatedbyName,ED1.FirstName as CreatedByName')
->join('T_MRIR_Details TMD', 'TMM.MRIRNO=TMD.MRIRNO')
->join('T_IGR_Master IGRM', 'TMM.IGRNO=IGRM.IGRNO')
->join('T_IGR_Details IGRD', 'IGRM.IGRNO=IGRD.IGRNO')
->join('T_PurchaseOrder_Master POM', 'TMM.PONO=POM.PONO')
->join('t_mrir_details TMD', 'TMM.MRIRNO=TMD.MRIRNO')
->join('t_igr_master IGRM', 'TMM.IGRNO=IGRM.IGRNO')
->join('t_igr_details IGRD', 'IGRM.IGRNO=IGRD.IGRNO')
->join('t_purchaseorder_master POM', 'TMM.PONO=POM.PONO')
->join('tbl_users user', 'user.userid=TMD.UpdateBY', 'left')
->join('T_Employee_Details ED', 'ED.EmpID = user.EmpID', 'left')
->join('t_employee_details ED', 'ED.EmpID = user.EmpID', 'left')
->join('tbl_users user1', 'user1.userid = POM.CreatedBy', 'left')
->join('T_Employee_Details ED1', 'ED1.EmpID = user1.EmpID', 'left')
->join('T_Status ST', 'ST.StatusCode = TMM.MRIRStatus')
->join('t_employee_details ED1', 'ED1.EmpID = user1.EmpID', 'left')
->join('t_status ST', 'ST.StatusCode = TMM.MRIRStatus')
//->where('POM.IsQualityChkReqired !=','0')
->orderBy('TMM.MRIRNO', 'desc');
$query = $builder->get();
@ -110,7 +87,7 @@ POL.status in (?,?)
}
function getStatus()
{
$builder = $this->db->table('T_Status')
$builder = $this->db->table('t_status')
->select('StatusCode,StatusName')
->where('StatusType', 8);
$query = $builder->get();
@ -119,7 +96,7 @@ POL.status in (?,?)
/* This function is used to list the MRIR value*/
function view_mrir_Billing()
{
$builder = $this->db->table('T_MRIR_Master TMM')
$builder = $this->db->table('t_mrir_master TMM')
->distinct()
->select('TMM.MRIRNO,TMM.PONO, TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,
IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.QualityInchargeID,
@ -127,20 +104,20 @@ POL.status in (?,?)
ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName,
MM.UOM, POL.Quantity,IGRD.QuantityAsPerInvoice, TMD.ActualQuantityReceived,TMD.QuantityAccepted,
TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ')
->join('T_MRIR_Details TMD', 'TMM.MRIRNO=TMD.MRIRNO', 'left')
->join('T_IGR_Master IGRM', 'TMM.IGRNO=IGRM.IGRNO')
->join('T_IGR_Details IGRD', 'IGRM.IGRNO=IGRD.IGRNO and IGRD.MaterialCode = TMD.MaterialCode')
->join('T_PurchaseOrder_Master POM', 'POM.PONO=IGRM.PONO')
->join('T_PurchaseOrder_LineItem POL', 'POL.PONO=POM.PONO and TMD.MaterialCode = POL.MaterialCode')
->join('T_PurchaseOrder_AdvanceRequest PUADV', 'POM.PONO=PUADV.PONO', 'left')
->join('t_mrir_details TMD', 'TMM.MRIRNO=TMD.MRIRNO', 'left')
->join('t_igr_master IGRM', 'TMM.IGRNO=IGRM.IGRNO')
->join('t_igr_details IGRD', 'IGRM.IGRNO=IGRD.IGRNO and IGRD.MaterialCode = TMD.MaterialCode')
->join('t_purchaseorder_master POM', 'POM.PONO=IGRM.PONO')
->join('t_purchaseorder_lineitem POL', 'POL.PONO=POM.PONO and TMD.MaterialCode = POL.MaterialCode')
->join('t_purchaseorder_advancerequest PUADV', 'POM.PONO=PUADV.PONO', 'left')
->join('tbl_users user', 'user.userid=TMD.UpdateBY', 'left')
->join('T_Employee_Details ED', 'ED.EmpID = user.EmpID', 'left')
->join('t_employee_details ED', 'ED.EmpID = user.EmpID', 'left')
->join('tbl_users user1', 'user1.userid = POM.ReleasedBy', 'left')
->join('T_Employee_Details ED1', 'ED1.EmpID = user1.EmpID', 'left')
->join('t_employee_details ED1', 'ED1.EmpID = user1.EmpID', 'left')
->join('tbl_users user2', 'user2.userid=TMD.StoreInchargeID', 'left')
->join('T_Employee_Details ED2', 'ED2.EmpID = user2.EmpID', 'left')
->join('T_MaterialMaster MM', 'MM.MaterialCode = IGRD.MaterialCode and POL.MaterialCode = MM.MaterialCode')
->join('T_Status ST', 'ST.StatusCode = TMD.MRIRStatus')
->join('t_employee_details ED2', 'ED2.EmpID = user2.EmpID', 'left')
->join('t_materialmaster MM', 'MM.MaterialCode = IGRD.MaterialCode and POL.MaterialCode = MM.MaterialCode')
->join('t_status ST', 'ST.StatusCode = TMD.MRIRStatus')
->where('TMM.MRIRStatus', MRIR_APPROVED)
->orderBy('TMM.UpdatedOn', 'desc');
$query = $builder->get();
@ -152,24 +129,24 @@ POL.status in (?,?)
function edit_mrir($MrirNo)
{
$builder = $this->db->table('T_MRIR_Master TMM')
$builder = $this->db->table('t_mrir_master TMM')
->distinct()->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon as MRIRCreatedon,TMD.MRIRItemNo,TMD.ActualQuantityReceived,TMD.QuantityAccepted,TMD.QuantityRejected,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate as IGRCreated,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,Line.Quantity,Line.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus,Line.CostCenterCode,COST.CostCenterName,TMD.Remarks')
->join('T_MRIR_Details TMD', 'TMM.MRIRNO = TMD.MRIRNO') //to get IGRNO,PONO,MRIRNO,mrirdate,
->join('T_IGR_Master IGRM', 'IGRM.IGRNO = TMM.IGRNO') //to get actualquantity,deliverydate,Invoicedate,vechileno,courierno,igrdate,
->join('T_PurchaseOrder_Master POMR ', 'IGRM.PONO = POMR.PONO') //to get podate,deliverydate,servicedescription
// ->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO');//to get receivedquantity,quantity
->join('T_PurchaseOrder_LineItem Line', 'TMM.PONO=Line.PONO and TMD.MaterialCode=Line.MaterialCode')
->join('T_CostCenter_Master COST', 'Line.CostCenterCode=COST.CostCenterCode', 'left')
//->join ('T_IGR_Details IGRD','IGRD.IGRNO = IGRM.IGRNO');//to get invoicequantity
->join('T_IGR_Details IGRD', 'IGRD.IGRNO = TMM.IGRNO and TMD.MaterialCode=IGRD.MaterialCode')
->join('T_MaterialMaster MM', 'TMD.MaterialCode = MM.MaterialCode')
->join('T_SupplierDetailsN SUPP', 'POMR.SupplierID = SUPP.SupplierID') //to get suppliername,supplieraddress
->join('t_mrir_details TMD', 'TMM.MRIRNO = TMD.MRIRNO') //to get IGRNO,PONO,MRIRNO,mrirdate,
->join('t_igr_master IGRM', 'IGRM.IGRNO = TMM.IGRNO') //to get actualquantity,deliverydate,Invoicedate,vechileno,courierno,igrdate,
->join('t_purchaseorder_master POMR ', 'IGRM.PONO = POMR.PONO') //to get podate,deliverydate,servicedescription
// ->join ('t_purchaseorder_lineitem POLT','IGRM.PONO=POLT.PONO');//to get receivedquantity,quantity
->join('t_purchaseorder_lineitem Line', 'TMM.PONO=Line.PONO and TMD.MaterialCode=Line.MaterialCode')
->join('t_costcenter_master COST', 'Line.CostCenterCode=COST.CostCenterCode', 'left')
//->join ('t_igr_details IGRD','IGRD.IGRNO = IGRM.IGRNO');//to get invoicequantity
->join('t_igr_details IGRD', 'IGRD.IGRNO = TMM.IGRNO and TMD.MaterialCode=IGRD.MaterialCode')
->join('t_materialmaster MM', 'TMD.MaterialCode = MM.MaterialCode')
->join('t_supplierdetailsn SUPP', 'POMR.SupplierID = SUPP.SupplierID') //to get suppliername,supplieraddress
->join('tbl_users user', 'user.userid = POMR.CreatedBy') //to get poraisedby
->join('T_Employee_Details ED', 'ED.EmpID = user.EmpID')
->join('t_employee_details ED', 'ED.EmpID = user.EmpID')
->join('tbl_users user1', 'user1.userid=TMM.CreatedBy') //to get mrirraisedby
->join('T_Employee_Details ED1', 'ED1.EmpID = user1.EmpID')
->join('t_employee_details ED1', 'ED1.EmpID = user1.EmpID')
->join('tbl_users user2', 'user2.userid=IGRM.CreatedBy') //to get igrraisedby
->join('T_Employee_Details ED2', 'ED2.EmpID = user2.EmpID')
->join('t_employee_details ED2', 'ED2.EmpID = user2.EmpID')
->where('TMM.MRIRNO', $MrirNo)
->groupBy('TMM.MRIRNO,TMD.MaterialCode');
$query = $builder->get();
@ -181,14 +158,14 @@ POL.status in (?,?)
function master_mrir($mrirmastervalues)
{
$builder = $this->db->table('T_MRIR_Master');
$builder = $this->db->table('t_mrir_master');
$builder->insert($mrirmastervalues);
$insert_id = $this->db->affectedRows();
if ($insert_id > 0) {
//$subQuery = 'select max(MRIRNO) as MRIRNo from T_MRIR_Master';
$subQuery = 'select MRIRNO from T_MRIR_Master order by Createdon desc limit 1';
//$subQuery = 'select max(MRIRNO) as MRIRNo from t_mrir_master';
$subQuery = 'select MRIRNO from t_mrir_master order by Createdon desc limit 1';
$query = $this->db->query($subQuery);
return $query->getResult(); //_array();
}
@ -198,7 +175,7 @@ POL.status in (?,?)
function detail_mrir($mrirdetailvalues)
{
$builder = $this->db->table('T_MRIR_Details');
$builder = $this->db->table('t_mrir_details');
$builder->insert($mrirdetailvalues);
$insert_id = $this->db->affectedRows();
@ -210,7 +187,7 @@ POL.status in (?,?)
/* This function is used to update the value in MRIR master table*/
function update_mrirmaster($updatemastervalues, $mrir_no)
{
$builder = $this->db->table('T_MRIR_Master')
$builder = $this->db->table('t_mrir_master')
->where('MRIRNO', $mrir_no)
->update($updatemastervalues);
$r = $this->db->affectedRows();
@ -224,7 +201,7 @@ POL.status in (?,?)
function update_mrirdetail($updatedetailvalues, $Lineitm)
{
$builder = $this->db->table('T_MRIR_Details')
$builder = $this->db->table('t_mrir_details')
->where('MRIRItemNo', $Lineitm)
->update($updatedetailvalues);
}
@ -234,17 +211,17 @@ POL.status in (?,?)
function get_MRIRs($mrir)
{
$builder = $this->db->table('T_MRIR_Master TMM')
$builder = $this->db->table('t_mrir_master TMM')
->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity,POMR.POType,ED.FirstName as StoreinchargeName')
->join('T_MRIR_Details TMD', 'TMM.MRIRNO = TMD.MRIRNO')
->join('T_MaterialMaster MM', 'TMD.MaterialCode = MM.MaterialCode')
->join('T_IGR_Master IGRM', 'IGRM.IGRNO=TMM.IGRNO')
->join('T_PurchaseOrder_Master POMR ', 'IGRM.PONO=POMR.PONO')
->join('T_PurchaseOrder_LineItem POLT', 'IGRM.PONO=POLT.PONO and POLT.MaterialCode=TMD.MaterialCode')
->join('T_IGR_Details IGRD', 'IGRD.IGRNO= IGRM.IGRNO and IGRD.MaterialCode=TMD.MaterialCode')
->join('T_SupplierDetailsN SUPP', 'POMR.SupplierID=SUPP.SupplierID')
->join('t_mrir_details TMD', 'TMM.MRIRNO = TMD.MRIRNO')
->join('t_materialmaster MM', 'TMD.MaterialCode = MM.MaterialCode')
->join('t_igr_master IGRM', 'IGRM.IGRNO=TMM.IGRNO')
->join('t_purchaseorder_master POMR ', 'IGRM.PONO=POMR.PONO')
->join('t_purchaseorder_lineitem POLT', 'IGRM.PONO=POLT.PONO and POLT.MaterialCode=TMD.MaterialCode')
->join('t_igr_details IGRD', 'IGRD.IGRNO= IGRM.IGRNO and IGRD.MaterialCode=TMD.MaterialCode')
->join('t_supplierdetailsn SUPP', 'POMR.SupplierID=SUPP.SupplierID')
->join('tbl_users user', 'user.userid=TMD.StoreInchargeID', 'left')
->join('T_Employee_Details ED', 'ED.EmpID = user.EmpID', 'left')
->join('t_employee_details ED', 'ED.EmpID = user.EmpID', 'left')
->where('TMD.MRIRNO', $mrir);
//->orderBy('TMD.MRIRNO','asc');
@ -258,15 +235,15 @@ POL.status in (?,?)
function get_IGRdatas()
{
$builder = $this->db->table('T_IGR_Master IGRM')
$builder = $this->db->table('t_igr_master IGRM')
->select('IGRM.*,IGRD.*,SUPP.SupplierName,SUPP.Address,TMM.PONO,TMD.*,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity')
->join('T_PurchaseOrder_Master POMR ', 'IGRM.PONO=POMR.PONO', 'left')
->join('T_MRIR_Master TMM', 'TMM.IGRNO=IGRM.IGRNO')
->join('T_MRIR_Details TMD', 'TMD.MRIRNO=TMM.MRIRNO')
->join('T_IGR_Details IGRD', 'IGRD.IGRNO= IGRM.IGRNO', 'left')
->join('T_PurchaseOrder_LineItem POLT', 'IGRM.PONO=POLT.PONO', 'left')
->join('T_SupplierDetailsN SUPP', 'POMR.SupplierID=SUPP.SupplierID', 'left')
->join('T_MaterialMaster MM', ' MM.MaterialCode=TMD.MaterialCode', 'left');
->join('t_purchaseorder_master POMR ', 'IGRM.PONO=POMR.PONO', 'left')
->join('t_mrir_master TMM', 'TMM.IGRNO=IGRM.IGRNO')
->join('t_mrir_details TMD', 'TMD.MRIRNO=TMM.MRIRNO')
->join('t_igr_details IGRD', 'IGRD.IGRNO= IGRM.IGRNO', 'left')
->join('t_purchaseorder_lineitem POLT', 'IGRM.PONO=POLT.PONO', 'left')
->join('t_supplierdetailsn SUPP', 'POMR.SupplierID=SUPP.SupplierID', 'left')
->join('t_materialmaster MM', ' MM.MaterialCode=TMD.MaterialCode', 'left');
//->where('IGRM.IGRNO ');
$query = $builder->get();
$result = $query->getResult();
@ -280,7 +257,7 @@ POL.status in (?,?)
function UpdateIGRStatus($IGRDetails, $IGRNO)
{
$builder = $this->db->table('T_IGR_Master')
$builder = $this->db->table('t_igr_master')
->where('IGRNO', $IGRNO)
->update($IGRDetails);
return TRUE;
@ -291,13 +268,13 @@ POL.status in (?,?)
// echo $MaterialCode;
// die();
$subQuery = 'select Quantity from T_Store_Stockdetails where MaterialCode=?';
$subQuery = 'select Quantity from t_store_stockdetails where MaterialCode=?';
$query = $this->db->query($subQuery, array($MaterialCode));
return $query->getResultArray();
}
function UpdateStock($StockDetails, $MaterialCode)
{
$builder = $this->db->table('T_Store_Stockdetails')
$builder = $this->db->table('t_store_stockdetails')
->where('MaterialCode', $MaterialCode)
->update($StockDetails);
return TRUE;
@ -308,13 +285,13 @@ POL.status in (?,?)
}
function UpdatePOLineItem($LineItem, $PONO, $MaterialCode)
{
$subQuery = 'select * from T_PurchaseOrder_LineItem where Quantity = ReceivedQuantity and PONO=? and MaterialCode=? ';
$subQuery = 'select * from t_purchaseorder_lineitem where Quantity = ReceivedQuantity and PONO=? and MaterialCode=? ';
$query = $this->db->query($subQuery, array($PONO, $MaterialCode));
$ApprovedCount = $query->getNumRows();
$subQuery = 'select * from T_PurchaseOrder_LineItem where Quantity > ReceivedQuantity and ReceivedQuantity != 0 and PONO=? and MaterialCode=?';
$subQuery = 'select * from t_purchaseorder_lineitem where Quantity > ReceivedQuantity and ReceivedQuantity != 0 and PONO=? and MaterialCode=?';
$query = $this->db->query($subQuery, array($PONO, $MaterialCode));
$PartialApproved = $query->getNumRows();
@ -322,7 +299,7 @@ POL.status in (?,?)
// echo 'Partialcount'.$PartialApproved;
if ($ApprovedCount > 0) {
$builder = $this->db->table('T_PurchaseOrder_LineItem')
$builder = $this->db->table('t_purchaseorder_lineitem')
->where('PONO', $PONO)
->where('MaterialCode', $MaterialCode)
->update($LineItem);
@ -333,7 +310,7 @@ POL.status in (?,?)
$updateon = get_current_date_time();
$POLineItem = array('Status' => PARTIAL_MRIRAPPROVED, 'UpdateBY' => $updateby, 'UpdatedOn' => $updateon);
$builder = $this->db->table('T_PurchaseOrder_LineItem')
$builder = $this->db->table('t_purchaseorder_lineitem')
->where('PONO', $PONO)
->where('MaterialCode', $MaterialCode)
->update($POLineItem);
@ -343,7 +320,7 @@ POL.status in (?,?)
function UpdatePOMaster($PONO, $PoMrirStatus, $updatedBy)
{
$builder = $this->db->table('T_PurchaseOrder_LineItem')
$builder = $this->db->table('t_purchaseorder_lineitem')
->select('*')
->where('PONO', $PONO)
->where('Status !=', MRIR_APPROVED);
@ -352,7 +329,7 @@ POL.status in (?,?)
$ApprovedCnt = $query->getNumRows();
$builder1 = $this->db->table('T_PurchaseOrder_LineItem')->select('*')
$builder1 = $this->db->table('t_purchaseorder_lineitem')->select('*')
->where('PONO', $PONO)
->where('Status !=', MRIR_REJECTED);
$query1 = $builder1->get();
@ -360,7 +337,7 @@ POL.status in (?,?)
if ($ApprovedCnt == 0) {
$POStatus = array('status' => MRIR_APPROVED, 'UpdateBY' => $updatedBy);
$builder = $this->db->table('T_PurchaseOrder_Master')
$builder = $this->db->table('t_purchaseorder_master')
->where('PONO', $PONO)
->update($POStatus);
return TRUE;
@ -368,7 +345,7 @@ POL.status in (?,?)
if ($RejectedCnt == 0) {
$POStatus = array('status' => MRIR_REJECTED, 'UpdateBY' => $updatedBy);
$builder = $this->db->table('T_PurchaseOrder_Master')
$builder = $this->db->table('t_purchaseorder_master')
->where('PONO', $PONO)
->update($POStatus);
return TRUE;

112
app/Models/Payroll_model.php
View File

@ -14,7 +14,7 @@ class Payroll_model extends Model
*/
function UploadFileName($FileDetails)
{
$builder = $this->db->table('T_Payroll_File');
$builder = $this->db->table('t_payroll_file');
$builder->insert($FileDetails);
$Payon = $this->db->affectedRows();
@ -40,7 +40,7 @@ class Payroll_model extends Model
*/
function UpdateFileName($FileDetails, $PayOn)
{
$builder = $this->db->table('T_Payroll_File')
$builder = $this->db->table('t_payroll_file')
->where('PayOn', $PayOn)
->update($FileDetails);
return TRUE;
@ -52,7 +52,7 @@ class Payroll_model extends Model
*/
function checkFileDetailsExists($PayOn)
{
$builder = $this->db->table('T_Payroll_File')
$builder = $this->db->table('t_payroll_file')
->select('PayOn')
->where('PayOn', $PayOn);
@ -66,7 +66,7 @@ class Payroll_model extends Model
function checkExistPayData($empid, $payon)
{
$builder = $this->db->table('T_Payroll')
$builder = $this->db->table('t_payroll')
->select('PayOn,EmpID')
->where('PayOn', $payon)
->where('EmpID', $empid);
@ -78,7 +78,7 @@ class Payroll_model extends Model
{
//echo $EmpId;
//die();
$builder = $this->db->table('T_Monthly_Pay_Inputs')
$builder = $this->db->table('t_monthly_pay_inputs')
->select('Month_Year', 'EmpID')
->where('EmpID', $EmpId)
->where('Month_Year', $PayOn);
@ -101,7 +101,7 @@ class Payroll_model extends Model
*/
function UploadFileData($FileData)
{
$builder = $this->db->table('T_Payroll');
$builder = $this->db->table('t_payroll');
$builder->insert($FileData);
$Payon = $this->db->affectedRows();
@ -111,7 +111,7 @@ class Payroll_model extends Model
function UploadFileData2($FileData)
{
$builder = $this->db->table('T_Monthly_Pay_Inputs');
$builder = $this->db->table('t_monthly_pay_inputs');
$builder->insert($FileData);
$Payon = $this->db->affectedRows();
@ -126,7 +126,7 @@ class Payroll_model extends Model
*/
function UpdateFiledata($FileData, $PayOn, $EmpId)
{
$builder = $this->db->table('T_Payroll')
$builder = $this->db->table('t_payroll')
->where('PayOn', $PayOn)
->where('EmpID', $EmpId)
->update($FileData);
@ -141,10 +141,10 @@ class Payroll_model extends Model
function GetPayslipdata($PayOn = '', $EmpId = '')
{
//echo "FROM MODEL" . $PayOn . $EmpId;
$builder = $this->db->table('T_Payroll Pay')->select('Pay.*,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.BankAccountNo as BankAccountNumber,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.AadharNo,Emp.Designation as Designation,Dep.DepartmentName as DeptName')
//->join('T_Payroll_File payfile', 'Pay.PayOn = payfile.PayOn')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID')
->join('T_DepartmentDetails Dep', 'Emp.Departmentcode = Dep.DEPCode');
$builder = $this->db->table('t_payroll Pay')->select('Pay.*,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.BankAccountNo as BankAccountNumber,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.AadharNo,Emp.Designation as Designation,Dep.DepartmentName as DeptName')
//->join('t_payroll_file payfile', 'Pay.PayOn = payfile.PayOn')
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID')
->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode');
if ($PayOn != '') {
$builder->where('Pay.PayOn', $PayOn);
}
@ -166,13 +166,13 @@ class Payroll_model extends Model
/* */
/**
* This function is used to get the PayOn details from T_Payroll_File
* This function is used to get the PayOn details from t_payroll_file
* @return array $result : This is result of the query
*/
function getPayOn()
{
$builder = $this->db->table('T_Monthly_Pay_Inputs')
$builder = $this->db->table('t_monthly_pay_inputs')
->select('DISTINCT(Month_Year)')
->orderBy("Month_Year", "desc");
$query = $builder->get();
@ -182,7 +182,7 @@ class Payroll_model extends Model
function getBankInfo($bank = "")
{
$builder = $this->db->table('T_Bank_Details')
$builder = $this->db->table('t_bank_details')
->select('*')
->where("Is_Active", 1);
if (!empty($bank)) {
@ -194,11 +194,11 @@ class Payroll_model extends Model
function getReportforBank($bank, $payon)
{
$builder = $this->db->table('T_Payroll Pay')
$builder = $this->db->table('t_payroll Pay')
->select('Pay.*,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.IFSCCode as IFSC,Bank.Address as BAddress')
->distinct()
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID')
->join('T_Bank_Details Bank', 'Emp.BankBranchName = Bank.Bank_name')
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID')
->join('t_bank_details Bank', 'Emp.BankBranchName = Bank.Bank_name')
->orderBy("Pay.EmpID", "asc")
->where('Emp.BankBranchName', $bank)
->where('Pay.PayOn', $payon)
@ -210,9 +210,9 @@ class Payroll_model extends Model
function getReportforPFESI($payon)
{
$builder = $this->db->table('T_Payroll Pay')->distinct()
$builder = $this->db->table('t_payroll Pay')->distinct()
->select('Pay.EmployeeESI,Pay.PF,Pay.CompanyESI,Pay.CompanyPF,Pay.NoofDaysWorked,Pay.OTperHours,Emp.FirstName as FName ,Emp.LastName as Lname,Emp.PFNO,Emp.ESI')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID')
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID')
->where('Pay.PayOn', $payon)
// ->where('Pay.EmployeeESI > 0 ')
// ->where('Pay.CompanyESI > 0')
@ -226,11 +226,11 @@ class Payroll_model extends Model
// echo "<br>---------------------------";
// echo "<br>From Model-";
// echo $source.'-'.$year1.'-'.$year2;
$builder = $this->db->table('T_Emp_Pay_Data Pay')
$builder = $this->db->table('t_emp_pay_data Pay')
->distinct()
->select('Pay.EmpID,Emp.FirstName as FName ,Emp.LastName as Lname,sum(loan.Loan_Amount) as Loan_Amount,sum(loan.Paid_Amount) as Paid_Amount')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID')
->join('T_Loan_Master loan', 'Pay.EmpID = loan.EmpID');
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID')
->join('t_loan_master loan', 'Pay.EmpID = loan.EmpID');
if ($source != 'company') {
$builder->where('Pay.EmpID', $source);
@ -254,9 +254,9 @@ class Payroll_model extends Model
function getEmpDetailsforLoan()
{
$builder = $this->db->table('T_Employee_Details Pay')
$builder = $this->db->table('t_employee_details Pay')
->select('Pay.EmpID,Pay.FirstName as FName ,Pay.LastName as Lname')
->join('T_Loan_Master loan', 'Pay.EmpID = loan.EmpID')
->join('t_loan_master loan', 'Pay.EmpID = loan.EmpID')
->orderBy('Pay.EmpID', 'asc');
$query = $builder->get();
return $query->getResult();
@ -269,10 +269,10 @@ class Payroll_model extends Model
//$this->db->distinct();
if ($string == 'emp') {
$builder = $this->db->table('T_Emp_Pay_Data Pay')
$builder = $this->db->table('t_emp_pay_data Pay')
->select('Pay.EmpID,Emp.FirstName as FName ,Emp.LastName as Lname,loan.*')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID')
->join('T_Loan_Master loan', 'Pay.EmpID = loan.EmpID', 'left')
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID')
->join('t_loan_master loan', 'Pay.EmpID = loan.EmpID', 'left')
// if($source != 'company'){
->where('Pay.EmpID', $eid);
//}
@ -289,15 +289,15 @@ class Payroll_model extends Model
return $query->getResult();
} elseif ($string == 'history') {
$builder = $this->db->table('T_Loan_History')
->select('T_Loan_Master.EmpID,Emp.FirstName,Emp.LastName,T_Loan_Master.Loan_Amount,T_Loan_Master.Loan_Issued_Date,T_Loan_History.*')
->join('T_Loan_Master', 'T_Loan_Master.Loan_ID=T_Loan_History.Loan_ID')
->join('T_Employee_Details Emp', 'T_Loan_Master.EmpID = Emp.EmpID')
->where('T_Loan_History.Loan_ID', $eid);
$builder = $this->db->table('t_loan_history')
->select('t_loan_master.EmpID,Emp.FirstName,Emp.LastName,t_loan_master.Loan_Amount,t_loan_master.Loan_Issued_Date,t_loan_history.*')
->join('t_loan_master', 't_loan_master.Loan_ID=t_loan_history.Loan_ID')
->join('t_employee_details Emp', 't_loan_master.EmpID = Emp.EmpID')
->where('t_loan_history.Loan_ID', $eid);
$q = $builder->get();
// ->orderBy('Entry_Date','asc');
//->where('Loan_ID',$eid);
// $q = $tdb->get('T_Loan_History');
// $q = $tdb->get('t_loan_history');
//print_r($q-getResult());
return $q->getResult();
// print_r($q-getResult());
@ -310,15 +310,15 @@ class Payroll_model extends Model
}
/* */
/**
* This function is used to get the PayOn details from T_Payroll_FileOTperHours
* This function is used to get the PayOn details from t_payroll_fileOTperHours
* @return array $result : This is result of the query
*/
function getEmployeelist($Payon = '')
{
$builder = $this->db->table('T_Payroll Pay')
$builder = $this->db->table('t_payroll Pay')
->select('Pay.EmpID as EmpId,Emp.FirstName as Fname,Emp.LastName as Lname')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID');
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID');
if ($Payon != '') {
$builder->where('Pay.PayOn', $Payon);
}
@ -331,9 +331,9 @@ class Payroll_model extends Model
function getEmployeelist2($Payon = '')
{
$builder = $this->db->table('T_Monthly_Pay_Inputs Pay')
$builder = $this->db->table('t_monthly_pay_inputs Pay')
->select('Pay.EmpID as EmpId,Emp.FirstName as Fname,Emp.LastName as Lname')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID');
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID');
if ($Payon != '') {
$builder->where('Pay.Month_Year', $Payon);
}
@ -345,15 +345,15 @@ class Payroll_model extends Model
/* */
/**
* This function is used to get the PayOn details from T_Payroll_File
* This function is used to get the PayOn details from t_payroll_file
* @return array $result : This is result of the query
*/
function getEmpAll($Payon = '')
{
$builder = $this->db->table('T_Payroll Pay')
$builder = $this->db->table('t_payroll Pay')
->select('Pay.EmpID as EmpId,Emp.FirstName as Fname,Emp.LastName as Lname')
->join('T_Employee_Details Emp', 'Pay.EmpID = Emp.EmpID');
->join('t_employee_details Emp', 'Pay.EmpID = Emp.EmpID');
if ($Payon != '') {
$builder->where('Pay.PayOn', $Payon);
}
@ -365,21 +365,21 @@ class Payroll_model extends Model
/* */
/**
* This function is used to delete the PayOn details from T_Payroll
* This function is used to delete the PayOn details from t_payroll
* @return array $result : This is result of the query
*/
function deleteFileData($PayOn = '')
{
$this->db->table('T_Payroll')->delete(['PayOn' => $PayOn]);
$this->db->table('t_payroll')->delete(['PayOn' => $PayOn]);
}
function getEmpID($q = '')
{
$builder = $this->db->table('T_Employee_Details')
$builder = $this->db->table('t_employee_details')
->select('EmpID,FirstName,LastName');
if ($q == "addemppaydate") {
$builder->where('EmpID NOT IN (SELECT EmpID from T_Emp_Pay_Data)', NULL, FALSE);
$builder->where('EmpID NOT IN (SELECT EmpID from t_emp_pay_data)', NULL, FALSE);
}
$query = $builder->get();
return $query->getResult();
@ -389,7 +389,7 @@ class Payroll_model extends Model
function getEmpIDfromPayData()
{
$builder = $this->db->table('T_Emp_Pay_Data')
$builder = $this->db->table('t_emp_pay_data')
->select('EmpID');
$query = $builder->get();
return $query->getResult();
@ -402,7 +402,7 @@ class Payroll_model extends Model
$PayOn = $data['PayOn'];
$EmpID = $data['EmpID'];
$builder = $this->db->table('T_Payroll')
$builder = $this->db->table('t_payroll')
->where('Key', $key)
->where('PayOn', $PayOn)
->where('EmpID', $EmpID)
@ -416,7 +416,7 @@ class Payroll_model extends Model
{
$subQuery = "select CompanyName,Address,GSTNO,PAN,ContactNumber,EmailAddress,AlternateContactNumber,companyWebsite,StateCode
from T_Company_Details ";
from t_company_details ";
$query = $this->db->query($subQuery);
//print_r($query-getResult());die();
return $query->getResult();
@ -424,13 +424,13 @@ class Payroll_model extends Model
function ChequeDetails($cheque)
{
$builder = $this->db->table('T_ChequeDetails');
$builder = $this->db->table('t_chequedetails');
$builder->insert($cheque);
}
public function getFiscalYear()
{
$sql = "SELECT FiscalYearStartOn, FiscalYearEndsOn FROM T_Company_Details";
$sql = "SELECT FiscalYearStartOn, FiscalYearEndsOn FROM t_company_details";
$query = $this->db->query($sql);
$result = $query->getRow();
return $result;
@ -438,10 +438,10 @@ class Payroll_model extends Model
public function getEmpDetailsforLeave($financial_year){
$years = explode('-', $financial_year);
$builder = $this->db->table('T_Attendance as A');
$builder = $this->db->table('t_attendance as A');
$builder->select('A.EmpID, GROUP_CONCAT(A.Month_Year) AS Month_Year, SUM(A.Days_Worked) AS NoofWorkedDays, SUM(A.Absent) AS NoofAbsentDays, SUM(A.Paid_Leave) AS NoofPaidLeaveDays, CONCAT_WS(" ", E.FirstName, E.LastName) AS FullName');
$builder->join('T_Employee_Details as E', 'A.EmpID = E.EmpID', 'left');
$builder->join('t_employee_details as E', 'A.EmpID = E.EmpID', 'left');
$builder->where('A.Month_Year >=', $years[0].'-04-01');
$builder->where('A.Month_Year <=', $years[1].'-03-31');
$builder->groupBy('A.EmpID');
@ -456,12 +456,12 @@ class Payroll_model extends Model
$years = explode('-', $financial_year);
$builder = $this->db->table('T_Attendance as A');
$builder = $this->db->table('t_attendance as A');
$builder->select('A.EmpID, A.Days_Worked AS NoofWorkedDays, A.Absent AS NoofAbsentDays, A.Paid_Leave AS NoofPaidLeaveDays');
$builder->select('CONCAT_WS(" ", E.FirstName, E.LastName) AS FullName');
$builder->select('DATE_FORMAT(A.Month_Year, "%Y-%m") AS Month_Year'); // Format as YYYY-MM
$builder->join('T_Employee_Details as E', 'A.EmpID = E.EmpID', 'left');
$builder->join('t_employee_details as E', 'A.EmpID = E.EmpID', 'left');
$builder->where('A.Month_Year >=', $years[0].'-04-01');
$builder->where('A.Month_Year <=', $years[1].'-03-31');
$builder->where('A.EmpID', $employee_id);
@ -479,7 +479,7 @@ class Payroll_model extends Model
{
$sql = "SELECT Cheque.*
FROM T_ChequeDetails Cheque
FROM t_chequedetails Cheque
WHERE Cheque.BankName = ?
AND Cheque.MonthYear = ? ";

682
app/Models/Purchaseorder_model.php
View File

File diff suppressed because it is too large Load Diff

156
app/Models/Quality_model.php
View File

@ -22,9 +22,9 @@ class Quality_model extends Model
function getAllprodcutsInward()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName')
->like('T_MaterialMaster.Category', 'raw material');
->like('t_materialmaster.Category', 'raw material');
$result = $builder->get();
return $result->getResult();
}
@ -39,7 +39,7 @@ class Quality_model extends Model
function getAllcustomersInward()
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierID,SupplierName')
->where('IsActive', 1);
$result = $builder->get();
@ -97,9 +97,9 @@ class Quality_model extends Model
function getAllspecInward()
{
$builder = $this->db->table('T_Prodcut_Specification_Master')
->select('T_Prodcut_Specification_Master.*,T_MaterialMaster.MaterialCode,T_MaterialMaster.MaterialName,T_SupplierDetailsN.SupplierID,T_SupplierDetailsN.SupplierName,count(*) as count')
->join('T_MaterialMaster', 'T_Prodcut_Specification_Master.product_id=T_MaterialMaster.MaterialCode')
->join('T_SupplierDetailsN', 'T_Prodcut_Specification_Master.customer_id=T_SupplierDetailsN.SupplierID')
->select('T_Prodcut_Specification_Master.*,t_materialmaster.MaterialCode,t_materialmaster.MaterialName,t_supplierdetailsn.SupplierID,t_supplierdetailsn.SupplierName,count(*) as count')
->join('t_materialmaster', 'T_Prodcut_Specification_Master.product_id=t_materialmaster.MaterialCode')
->join('t_supplierdetailsn', 'T_Prodcut_Specification_Master.customer_id=t_supplierdetailsn.SupplierID')
->groupBy('product_id,customer_id,T_Prodcut_Specification_Master.type');
$result = $builder->get();
return $result->getResult();
@ -119,9 +119,9 @@ class Quality_model extends Model
//print_r($result->getResult());
if (empty($result->getResult())) {
$builders = $this->db->table('T_Prodcut_Specification_Master')
->select('T_Prodcut_Specification_Master.*,T_MaterialMaster.MaterialCode,T_MaterialMaster.MaterialName as product_name,T_SupplierDetailsN.SupplierID,T_SupplierDetailsN.SupplierName as client_name')
->join('T_MaterialMaster', 'T_Prodcut_Specification_Master.product_id=T_MaterialMaster.MaterialCode')
->join('T_SupplierDetailsN', 'T_Prodcut_Specification_Master.customer_id=T_SupplierDetailsN.SupplierID')
->select('T_Prodcut_Specification_Master.*,t_materialmaster.MaterialCode,t_materialmaster.MaterialName as product_name,t_supplierdetailsn.SupplierID,t_supplierdetailsn.SupplierName as client_name')
->join('t_materialmaster', 'T_Prodcut_Specification_Master.product_id=t_materialmaster.MaterialCode')
->join('t_supplierdetailsn', 'T_Prodcut_Specification_Master.customer_id=t_supplierdetailsn.SupplierID')
->where('T_Prodcut_Specification_Master.product_id', $prodcutid)
->where('T_Prodcut_Specification_Master.customer_id', $customerid)
->where('T_Prodcut_Specification_Master.type', $type);
@ -180,27 +180,27 @@ class Quality_model extends Model
function getOperatorsListforReport()
{
$builder = $this->db->table('T_Employee_Details')->select('EmpID,FirstName,LastName');
$builder = $this->db->table('t_employee_details')->select('EmpID,FirstName,LastName');
return $builder->get()->getResult();
}
function getExistOperatorsListforReport($rbcid)
{
$sql = "select T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName
from T_ResinBatchCard_Operators join T_Employee_Details on T_ResinBatchCard_Operators.EmpID =
T_Employee_Details.EmpID where T_ResinBatchCard_Operators.master_id = ?";
$sql = "select t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName
from T_ResinBatchCard_Operators join t_employee_details on T_ResinBatchCard_Operators.EmpID =
t_employee_details.EmpID where T_ResinBatchCard_Operators.master_id = ?";
$r = $this->db->query($sql, array($rbcid));
return $r->getResult();
}
function getEmplistforReport()
{
$builder = $this->db->table('T_Employee_Details')
->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.Departmentcode,T_DepartmentDetails.shortName')
->join('T_DepartmentDetails', 'T_Employee_Details.Departmentcode=T_DepartmentDetails.DEPCode')
$builder = $this->db->table('t_employee_details')
->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.Departmentcode,t_departmentdetails.shortName')
->join('t_departmentdetails', 't_employee_details.Departmentcode=t_departmentdetails.DEPCode')
//->join('ip_invoice_items','ip_invoices.invoice_number=ip_invoice_items.invoice_number')
//->join('ip_products','ip_invoice_items.item_product_id=ip_products.product_id')
//->join('ip_invoice_custom','ip_invoices.invoice_number=ip_invoice_custom.invoice_number and invoice_custom_fieldid=62')
->orderBy('T_Employee_Details.EmpID');
->orderBy('t_employee_details.EmpID');
$res = $builder->get();
return $res->getResult();
}
@ -258,13 +258,13 @@ class Quality_model extends Model
function getResinBatchCardDetails($rbcid)
{
$sql = 'select T_ResinBatchCard_Master.*,ip_products.product_name,ip_products.product_description,ip_clients.client_name,T_Machine_Master.Machine_Name,T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,a.FirstName as name from T_ResinBatchCard_Master
$sql = 'select T_ResinBatchCard_Master.*,ip_products.product_name,ip_products.product_description,ip_clients.client_name,T_Machine_Master.Machine_Name,t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,a.FirstName as name from T_ResinBatchCard_Master
join ip_products on T_ResinBatchCard_Master.productid = ip_products.product_id
join ip_clients on T_ResinBatchCard_Master.customerid = ip_clients.client_id
join T_Machine_Master on T_ResinBatchCard_Master.machinecode = T_Machine_Master.Machine_Code
join tbl_users on T_ResinBatchCard_Master.createdby = tbl_users.userId
join T_Employee_Details on tbl_users.EmpID = T_Employee_Details.EmpID
join T_Employee_Details as a on a.EmpID = T_ResinBatchCard_Master.operatedby
join t_employee_details on tbl_users.EmpID = t_employee_details.EmpID
join t_employee_details as a on a.EmpID = T_ResinBatchCard_Master.operatedby
where T_ResinBatchCard_Master.resinbatch_id = ?';
$res['masterdata'] = $this->db->query($sql, array($rbcid))->getResult();
//print_r($res['masterdata']);
@ -304,8 +304,8 @@ class Quality_model extends Model
join ip_products on T_ResinBatchCard_Master.productid=ip_products.product_id
join ip_clients on T_ResinBatchCard_Master.customerid=ip_clients.client_id
join tbl_users on T_ResinBatchCard_Master.createdby = tbl_users.userId
join T_Employee_Details ED on ED.EmpID = T_ResinBatchCard_Master.operatedby
join T_Employee_Details EmpDtl on EmpDtl.EmpID = tbl_users.EmpID';
join t_employee_details ED on ED.EmpID = T_ResinBatchCard_Master.operatedby
join t_employee_details EmpDtl on EmpDtl.EmpID = tbl_users.EmpID';
$res = $this->db->query($sql);
return $res->getResult();
@ -338,15 +338,15 @@ class Quality_model extends Model
function getIndividualReportData($reportid)
{
$builder = $this->db->table('T_Test_Report_Master')->select('T_Test_Report_Master.testreport_id,ip_invoices.invoice_date_created,T_Test_Report_Master.invoiceid,T_Test_Report_Master.batchdate,T_Test_Report_Master.chartdata,ip_clients.client_id,ip_clients.client_name,invoice_custom_fieldvalue,ip_products.product_id,ip_products.product_name,ip_products.product_description,T_Employee_Details.FirstName,T_Employee_Details.LastName,ip_invoice_items.item_quantity,T_Test_Report_Master.approvedby')
$builder = $this->db->table('T_Test_Report_Master')->select('T_Test_Report_Master.testreport_id,ip_invoices.invoice_date_created,T_Test_Report_Master.invoiceid,T_Test_Report_Master.batchdate,T_Test_Report_Master.chartdata,ip_clients.client_id,ip_clients.client_name,invoice_custom_fieldvalue,ip_products.product_id,ip_products.product_name,ip_products.product_description,t_employee_details.FirstName,t_employee_details.LastName,ip_invoice_items.item_quantity,T_Test_Report_Master.approvedby')
->join('ip_invoices', 'T_Test_Report_Master.invoiceid=ip_invoices.invoice_number')
->join('ip_clients', 'ip_invoices.client_id=ip_clients.client_id')
->join('ip_invoice_items', 'ip_invoices.invoice_id=ip_invoice_items.invoice_id')
->join('ip_products', 'ip_products.product_id=ip_invoice_items.item_product_id')
->join('ip_invoice_custom', 'ip_invoices.invoice_id=ip_invoice_custom.invoice_id and invoice_custom_fieldid=62')
->join('tbl_users', 'T_Test_Report_Master.createdby=tbl_users.userid')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID')
//->join('T_Employee_Details','T_Test_Report_Master.EmpID=T_Employee_Details.EmpID');
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID')
//->join('t_employee_details','T_Test_Report_Master.EmpID=t_employee_details.EmpID');
//->join('ip_invoice_custom','ip_invoices.invoice_number=ip_invoice_custom.invoice_number and invoice_custom_fieldid=62');
->where('testreport_id', $reportid);
// ->join('T_Test_Report','T_Test_Report_Master.testreport_id=T_Test_Report.testreport_id');
@ -374,8 +374,8 @@ class Quality_model extends Model
$res2 = $builder2->get();
$reportdata['masterreportafs'] = $res2->getResult();
$builder3 = $this->db->table('T_Company_Details')
->select('T_Company_Details.CompanyName,T_Company_Details.Address,T_Company_Details.ProfilePic');
$builder3 = $this->db->table('t_company_details')
->select('t_company_details.CompanyName,t_company_details.Address,t_company_details.ProfilePic');
//->where('testreport_id',$reportid)
$res3 = $builder3->get();
$reportdata['company'] = $res3->getResult();
@ -387,14 +387,14 @@ class Quality_model extends Model
{
$builder = $this->db->table('T_Test_Report_Master')
->select('T_Test_Report_Master.chartdata,T_Test_Report_Master.batchdate,T_Test_Report_Master.testreport_id,T_IGR_Master.IGRNO,T_IGR_Master.DeliveryChellanOrInvoiceNo,T_IGR_Master.DeliveryChellanDate,T_IGR_Details.IGRItemNo,T_IGR_Details.QuantityAsPerInvoice,T_MaterialMaster.MaterialCode,T_MaterialMaster.Materialname,T_SupplierDetailsN.SupplierID,T_SupplierDetailsN.SupplierName,T_Test_Report_Master.approvedby,T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName')
->join('T_IGR_Master', 'T_Test_Report_Master.igrno=T_IGR_Master.IGRNO')
->join('T_IGR_Details', 'T_Test_Report_Master.igrlineitemno=T_IGR_Details.IGRItemNo')
->join('T_PurchaseOrder_Master', 'T_IGR_Master.PONO=T_PurchaseOrder_Master.PONO')
->join('T_MaterialMaster', 'T_IGR_Details.MaterialCode=T_MaterialMaster.MaterialCode')
->join('T_SupplierDetailsN', 'T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID')
->select('T_Test_Report_Master.chartdata,T_Test_Report_Master.batchdate,T_Test_Report_Master.testreport_id,t_igr_master.IGRNO,t_igr_master.DeliveryChellanOrInvoiceNo,t_igr_master.DeliveryChellanDate,t_igr_details.IGRItemNo,t_igr_details.QuantityAsPerInvoice,t_materialmaster.MaterialCode,t_materialmaster.Materialname,t_supplierdetailsn.SupplierID,t_supplierdetailsn.SupplierName,T_Test_Report_Master.approvedby,t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName')
->join('t_igr_master', 'T_Test_Report_Master.igrno=t_igr_master.IGRNO')
->join('t_igr_details', 'T_Test_Report_Master.igrlineitemno=t_igr_details.IGRItemNo')
->join('t_purchaseorder_master', 't_igr_master.PONO=t_purchaseorder_master.PONO')
->join('t_materialmaster', 't_igr_details.MaterialCode=t_materialmaster.MaterialCode')
->join('t_supplierdetailsn', 't_purchaseorder_master.SupplierID=t_supplierdetailsn.SupplierID')
->join('tbl_users', 'T_Test_Report_Master.createdby=tbl_users.userid')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID')
->where('T_Test_Report_Master.testreport_id', $reportid);
@ -419,8 +419,8 @@ class Quality_model extends Model
$res3 = $builder3->get();
$reportdata['masterreportafs'] = $res3->getResult();
$builder4 = $this->db->table('T_Company_Details')
->select('T_Company_Details.CompanyName,T_Company_Details.Address,T_Company_Details.ProfilePic');
$builder4 = $this->db->table('t_company_details')
->select('t_company_details.CompanyName,t_company_details.Address,t_company_details.ProfilePic');
//->where('testreport_id',$reportid);
$res4 = $builder4->get()->getResult();
$reportdata['company'] = $res4;
@ -451,14 +451,14 @@ class Quality_model extends Model
// $res = $builder->get();
// return $res->getResult();
$builder = $this->db->table('T_Test_Report_Master')->select('T_Test_Report_Master.batchdate,T_Test_Report_Master.testreport_id,T_IGR_Master.IGRNO,T_IGR_Master.DeliveryChellanOrInvoiceNo,T_IGR_Master.DeliveryChellanDate,T_IGR_Details.IGRItemNo,T_IGR_Details.QuantityAsPerInvoice,T_MaterialMaster.MaterialCode,T_MaterialMaster.Materialname,T_SupplierDetailsN.SupplierID,T_SupplierDetailsN.SupplierName,T_Test_Report_Master.approvedby,T_Test_Report_Master.document,T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName')
->join('T_IGR_Master', 'T_Test_Report_Master.igrno=T_IGR_Master.IGRNO')
->join('T_IGR_Details', 'T_Test_Report_Master.igrlineitemno=T_IGR_Details.IGRItemNo')
->join('T_PurchaseOrder_Master', 'T_IGR_Master.PONO=T_PurchaseOrder_Master.PONO')
->join('T_MaterialMaster', 'T_IGR_Details.MaterialCode=T_MaterialMaster.MaterialCode')
->join('T_SupplierDetailsN', 'T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID')
$builder = $this->db->table('T_Test_Report_Master')->select('T_Test_Report_Master.batchdate,T_Test_Report_Master.testreport_id,t_igr_master.IGRNO,t_igr_master.DeliveryChellanOrInvoiceNo,t_igr_master.DeliveryChellanDate,t_igr_details.IGRItemNo,t_igr_details.QuantityAsPerInvoice,t_materialmaster.MaterialCode,t_materialmaster.Materialname,t_supplierdetailsn.SupplierID,t_supplierdetailsn.SupplierName,T_Test_Report_Master.approvedby,T_Test_Report_Master.document,t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName')
->join('t_igr_master', 'T_Test_Report_Master.igrno=t_igr_master.IGRNO')
->join('t_igr_details', 'T_Test_Report_Master.igrlineitemno=t_igr_details.IGRItemNo')
->join('t_purchaseorder_master', 't_igr_master.PONO=t_purchaseorder_master.PONO')
->join('t_materialmaster', 't_igr_details.MaterialCode=t_materialmaster.MaterialCode')
->join('t_supplierdetailsn', 't_purchaseorder_master.SupplierID=t_supplierdetailsn.SupplierID')
->join('tbl_users', 'T_Test_Report_Master.createdby=tbl_users.userid')
->join('T_Employee_Details', 'tbl_users.EmpID=T_Employee_Details.EmpID')
->join('t_employee_details', 'tbl_users.EmpID=t_employee_details.EmpID')
->orderBy('testreport_id', 'desc');
$res = $builder->get();
return $res->getResult();
@ -468,13 +468,13 @@ class Quality_model extends Model
{
// $this->db->distinct();
// ->select('IGRNO');
// $builder = $this->db->table('T_IGR_Details');
// ->join('T_MaterialMaster','T_IGR_Details.MaterialCode=T_MaterialMaster.MaterialCode');
// $this->db->like('T_MaterialMaster.Category','raw material');
// $builder = $this->db->table('t_igr_details');
// ->join('t_materialmaster','t_igr_details.MaterialCode=t_materialmaster.MaterialCode');
// $this->db->like('t_materialmaster.Category','raw material');
$sql = 'select distinct IGRNO from T_IGR_Details
join T_MaterialMaster on T_IGR_Details.MaterialCode = T_MaterialMaster.MaterialCode
where T_MaterialMaster.Category like "%Raw Material%"and date(T_IGR_Details.CreatedDate)
$sql = 'select distinct IGRNO from t_igr_details
join t_materialmaster on t_igr_details.MaterialCode = t_materialmaster.MaterialCode
where t_materialmaster.Category like "%Raw Material%"and date(t_igr_details.CreatedDate)
between date(SUBDATE(CURRENT_DATE,1)) and date(CURRENT_DATE)
order by IGRNO desc';
$result = $this->db->query($sql);
@ -484,12 +484,12 @@ class Quality_model extends Model
function getIGRLineItemNo($igrno)
{
// ->select('IGRItemNo');
// $builder = $this->db->table('T_IGR_Details');
// $builder = $this->db->table('t_igr_details');
// $this->db->where('IGRNO',$igrno);
$sql = 'select IGRItemNo from T_IGR_Details
join T_MaterialMaster on T_IGR_Details.MaterialCode = T_MaterialMaster.MaterialCode
where IGRNO = ? and T_MaterialMaster.Category like "%Raw Material%"';
$sql = 'select IGRItemNo from t_igr_details
join t_materialmaster on t_igr_details.MaterialCode = t_materialmaster.MaterialCode
where IGRNO = ? and t_materialmaster.Category like "%Raw Material%"';
$result = $this->db->query($sql, array($igrno));
return $result->getResult();
@ -503,14 +503,14 @@ class Quality_model extends Model
$res['generated'] = ($builder->get()->getResult());
// ->select('IGRNO,IGRItemNo');
// $builder = $this->db->table('T_IGR_Details');
// $builder = $this->db->table('t_igr_details');
// $this->db->where('IGRNO NOT IN (SELECT IGRNO from T_Test_Report_Master)',NULL,false);
// $this->db->orWhere('IGRItemNo NOT IN (SELECT IGRItemNo from T_Test_Report_Master)',NULL,false);
$sql = 'select distinct IGRNO,IGRItemNo from T_IGR_Details join T_MaterialMaster on T_IGR_Details.MaterialCode = T_MaterialMaster.MaterialCode
where (T_IGR_Details.IGRNO not in (select igrno from T_Test_Report_Master where igrno != "")
or T_IGR_Details.IGRItemNo not in (select igrlineitemno from T_Test_Report_Master where igrno != "") )
and T_MaterialMaster.Category like "%Raw Material%"
order by T_IGR_Details.IGRNO DESC';
$sql = 'select distinct IGRNO,IGRItemNo from t_igr_details join t_materialmaster on t_igr_details.MaterialCode = t_materialmaster.MaterialCode
where (t_igr_details.IGRNO not in (select igrno from T_Test_Report_Master where igrno != "")
or t_igr_details.IGRItemNo not in (select igrlineitemno from T_Test_Report_Master where igrno != "") )
and t_materialmaster.Category like "%Raw Material%"
order by t_igr_details.IGRNO DESC';
$r = $this->db->query($sql);
$res['notgenerated'] = ($r->getResult());
@ -520,34 +520,34 @@ class Quality_model extends Model
function getIGRDataforReport($igrno, $igrlineitemno)
{
//echo $igrno.'-'.$igrlineitemno;die();
// ->select('T_IGR_Master.DeliveryChellanOrInvoiceNo,T_IGR_Master.DeliveryChellanDate,T_SupplierDetailsN.SupplierID,T_SupplierDetailsN.SupplierName,T_MaterialMaster.MaterialCode,T_MaterialMaster.MaterialName,T_IGR_Details.QuantityAsPerInvoice');
// $builder = $this->db->table('T_IGR_Master');
// ->join('T_IGR_Details','T_IGR_Master.IGRNO=T_IGR_Details.IGRNO');
// ->join('T_MaterialMaster','T_IGR_Details.MaterialCode=T_MaterialMaster.MaterialCode');
// ->join('T_PurchaseOrder_Master','T_IGR_Master.PONO=T_PurchaseOrder_Master.PONO');
// ->join('T_SupplierDetailsN','T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID');
// ->select('t_igr_master.DeliveryChellanOrInvoiceNo,t_igr_master.DeliveryChellanDate,t_supplierdetailsn.SupplierID,t_supplierdetailsn.SupplierName,t_materialmaster.MaterialCode,t_materialmaster.MaterialName,t_igr_details.QuantityAsPerInvoice');
// $builder = $this->db->table('t_igr_master');
// ->join('t_igr_details','t_igr_master.IGRNO=t_igr_details.IGRNO');
// ->join('t_materialmaster','t_igr_details.MaterialCode=t_materialmaster.MaterialCode');
// ->join('t_purchaseorder_master','t_igr_master.PONO=t_purchaseorder_master.PONO');
// ->join('t_supplierdetailsn','t_purchaseorder_master.SupplierID=t_supplierdetailsn.SupplierID');
// $this->db->where('T_IGR_Details.IGRNO',$igrno);
// $this->db->where('T_IGR_Details.IGRItemNo',$igrlineitemno);
// $this->db->orderBy('T_IGR_Master.IGRNO');
// $this->db->where('t_igr_details.IGRNO',$igrno);
// $this->db->where('t_igr_details.IGRItemNo',$igrlineitemno);
// $this->db->orderBy('t_igr_master.IGRNO');
// $res = $builder->get();
// return $res->getResult();
$sql = 'select T_IGR_Master.DeliveryChellanOrInvoiceNo, date_format(T_IGR_Master.DeliveryChellanDate,"%d-%m-%Y") as DeliveryChellanDate,T_SupplierDetailsN.SupplierID,T_SupplierDetailsN.SupplierName,T_MaterialMaster.MaterialCode,
T_MaterialMaster.MaterialName,T_IGR_Details.QuantityAsPerInvoice
from T_IGR_Master
join T_IGR_Details on T_IGR_Master.IGRNO=T_IGR_Details.IGRNO
join T_MaterialMaster on T_IGR_Details.MaterialCode=T_MaterialMaster.MaterialCode
join T_PurchaseOrder_Master on T_IGR_Master.PONO=T_PurchaseOrder_Master.PONO
join T_SupplierDetailsN on T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID
where T_IGR_Master.IGRNO = ? and T_IGR_Details.IGRItemNo = ?';
$sql = 'select t_igr_master.DeliveryChellanOrInvoiceNo, date_format(t_igr_master.DeliveryChellanDate,"%d-%m-%Y") as DeliveryChellanDate,t_supplierdetailsn.SupplierID,t_supplierdetailsn.SupplierName,t_materialmaster.MaterialCode,
t_materialmaster.MaterialName,t_igr_details.QuantityAsPerInvoice
from t_igr_master
join t_igr_details on t_igr_master.IGRNO=t_igr_details.IGRNO
join t_materialmaster on t_igr_details.MaterialCode=t_materialmaster.MaterialCode
join t_purchaseorder_master on t_igr_master.PONO=t_purchaseorder_master.PONO
join t_supplierdetailsn on t_purchaseorder_master.SupplierID=t_supplierdetailsn.SupplierID
where t_igr_master.IGRNO = ? and t_igr_details.IGRItemNo = ?';
$res = $this->db->query($sql, array($igrno, $igrlineitemno));
return $res->getResult();
}
function getIGRNos()
{
$sql = 'select IGRNO from T_IGR_Master order by IGRNO desc';
$sql = 'select IGRNO from t_igr_master order by IGRNO desc';
$res = $this->db->query($sql);
return $res->getResult();
}
@ -567,7 +567,7 @@ class Quality_model extends Model
}
function getIGRItemNos()
{
$sql = 'select IGRItemNo from T_IGR_Details order by IGRItemNo desc';
$sql = 'select IGRItemNo from t_igr_details order by IGRItemNo desc';
$res = $this->db->query($sql);
return $res->getResult();
}

52
app/Models/Rawmaterialdetails_model.php
View File

@ -17,7 +17,7 @@ class Rawmaterialdetails_model extends Model
function rawmaterialListing()
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('*')
->where('IsActive', 1)
->orderBy('CreatedDate','DESC');
@ -29,7 +29,7 @@ class Rawmaterialdetails_model extends Model
function getUOM($UOM = '')
{
$ConfigID = 'C001';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('ConfigValue')
->where('Config_id ', $ConfigID);
if ($UOM != '') {
@ -43,7 +43,7 @@ class Rawmaterialdetails_model extends Model
function getmaterialType($MaterialType = '')
{
$Config_ID = 'C003';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('Config_ID,ConfigValue')
->where('Config_id', $Config_ID);
if ($MaterialType != '') {
@ -58,7 +58,7 @@ class Rawmaterialdetails_model extends Model
function getmaterialCategory($MaterialCategory = '')
{
$Config_ID = 'C023';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('Config_ID,ConfigValue')
->where('Config_id', $Config_ID);
if ($MaterialCategory != '') {
@ -73,7 +73,7 @@ class Rawmaterialdetails_model extends Model
function getConversionfactorUOM($ConversionFactorUOM = '')
{
$Config_ID = 'C024';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('Config_ID,ConfigValue')
->where('Config_id', $Config_ID);
if ($ConversionFactorUOM != '') {
@ -95,7 +95,7 @@ class Rawmaterialdetails_model extends Model
function addNewRawMaterial($RawMaterial = '')
{
$builder = $this->db->table('T_MaterialMaster');
$builder = $this->db->table('t_materialmaster');
$builder->insert($RawMaterial);
return TRUE;
}
@ -104,7 +104,7 @@ class Rawmaterialdetails_model extends Model
{
$builder = $this->db->table('T_ConfigDetails');
$builder = $this->db->table('t_configdetails');
$builder->insert($config);
return TRUE;
}
@ -118,7 +118,7 @@ class Rawmaterialdetails_model extends Model
{
$sql = " SELECT * FROM T_MaterialMaster WHERE MaterialCode ='$MaterialCode'";
$sql = " SELECT * FROM t_materialmaster WHERE MaterialCode ='$MaterialCode'";
$query = $this->db->query($sql);
return $query->getResult();
}
@ -152,7 +152,7 @@ class Rawmaterialdetails_model extends Model
$subquery = "SELECT SUM(IF(Transaction_type='Add',Quantity,0)) - SUM(IF(Transaction_type='Reduce',Quantity,0))as remainingqty
FROM T_Material_stock_history
FROM t_material_stock_history
WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
$query = $this->db->query($subquery, array($MaterialCode, $startdate, $newdate));
@ -165,7 +165,7 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function getAssetcode()
{
$builder = $this->db->table('T_Asset_Details')
$builder = $this->db->table('t_asset_details')
->select('AssetCode,AssetName');
//->where('Assetcode',$Assetcode );
$query = $builder->get();
@ -175,7 +175,7 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function getCostCenterCode() //$CostCenterCode='')
{
$builder = $this->db->table('T_CostCenter_Master')
$builder = $this->db->table('t_costcenter_master')
->select('CostCenterCode,CostCenterName');
//->where('CostCenterCode', $CostCenterCode);
$query = $builder->get();
@ -186,7 +186,7 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function editRawmaterial($RawMaterial, $MaterialCode)
{
$this->db->table('T_MaterialMaster')
$this->db->table('t_materialmaster')
->where('MaterialCode', $MaterialCode)
->update($RawMaterial);
@ -198,7 +198,7 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
{
echo $MaterialCode; //."and".$RawMaterial ;
$this->db->table('T_MaterialMaster')
$this->db->table('t_materialmaster')
->where('MaterialCode', $MaterialCode)
->update($RawMaterial);
@ -208,12 +208,12 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function export_excel()
{
$builder = $this->db->table('T_MaterialMaster as det')
$builder = $this->db->table('t_materialmaster as det')
->select('det.*,emp.firstname,emp1.firstname as Updated_By,det.IsActive')
->join('tbl_users as tbl', ' det.createdby = tbl.userid', 'left')
->join('T_Employee_Details as emp', 'emp.empid=tbl.empid', 'left')
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
->join('tbl_users as tbl1', ' det.UpdatedBy = tbl1.userid', 'left')
->join('T_Employee_Details as emp1', 'emp1.empid=tbl1.empid', 'left');
->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid', 'left');
return $builder->get()->getResultArray();
}
@ -231,11 +231,11 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function checkMaterialExists($material)
{
// $sql="SELECT MaterialCode, MaterialName, MaterialType, Category,REPLACE(MaterialName, ' ', '')
// FROM T_MaterialMaster
// FROM t_materialmaster
// WHERE REPLACE(MaterialName, ' ', '') LIKE REPLACE('%'".$material."'%', ' ', '')";
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName,MaterialType,Category')
->like('REPLACE(MaterialName, " ", "")', $material);
@ -247,7 +247,7 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function checkMaterialCategory($mc)
{
$temp = [];
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->distinct()
->select('ConfigValue')
->where('Config_ID', 'C023')
@ -269,7 +269,7 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
function reOrderListing()
{
//$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
//$subQuery='SELECT * from t_materialmaster where Current_stock < reorder?';
$today = get_current_date();
@ -290,9 +290,9 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
$subQuery = "SELECT DISTINCT(p.MaterialCode),mm.MaterialName,opens.CurrentStock,OpeningStock,mm.reorder
FROM T_Material_stock_history AS p
FROM t_material_stock_history AS p
left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
left join t_materialmaster mm on mm.MaterialCode = p.MaterialCode
left join
(select StockId,pp.MaterialCode mc,
@ -306,8 +306,8 @@ SUM(
END
) as OpeningStock
FROM T_Material_stock_history AS pp
left join T_MaterialMaster mm on mm.MaterialCode = pp.MaterialCode
FROM t_material_stock_history AS pp
left join t_materialmaster mm on mm.MaterialCode = pp.MaterialCode
GROUP BY pp.MaterialCode
) as opens on opens.mc = p.MaterialCode
@ -323,8 +323,8 @@ where (CurrentStock+OpeningStock)<reorder";
function getMaterialAvg($RawMaterialID)
{
$subQuery = 'select AVG(Rate) as avg_rate from T_PurchaseOrder_LineItem
join T_PurchaseOrder_Master on T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO
$subQuery = 'select AVG(Rate) as avg_rate from t_purchaseorder_lineitem
join t_purchaseorder_master on t_purchaseorder_master.PONO=t_purchaseorder_lineitem.PONO
where MaterialCode = ?';
$query = $this->db->query($subQuery, array($RawMaterialID));

106
app/Models/Requistion_model.php
View File

@ -12,7 +12,7 @@ class Requistion_model extends Model
*/
function getSupplierName()
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierID, SupplierName,ADeleteRequistionLineItemddress');
//->where('roleId !=', 1);
$query = $builder->get();
@ -58,12 +58,12 @@ class Requistion_model extends Model
/* $subQuery ='select distinct Req.ReqNo, Req.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,
ifnull(Po.Quantity,0) as POQTY,sta.StatusName
from T_Requestion_Details Req join T_MaterialMaster Mat on
from t_requestion_details Req join t_materialmaster Mat on
Req.MaterialCode = Mat.MaterialCode
left join T_PurchaseOrder_LineItem Po on Po.ReqNo = Req.ReqNo
left join T_PurchaseOrder_Master POmast on POmast.PONO=Po.PONO
left join t_purchaseorder_lineitem Po on Po.ReqNo = Req.ReqNo
left join t_purchaseorder_master POmast on POmast.PONO=Po.PONO
and Po.MaterialCode = Req.MaterialCode
join T_Status sta on sta.StatusCode = Req.Status
join t_status sta on sta.StatusCode = Req.Status
where Req.ReqNo = ? and POmast.Status != ?';
$query = $this->db->query($subQuery, [$ReqNo,PO_AMENDED));
@ -79,7 +79,7 @@ class Requistion_model extends Model
*/
function getStatus()
{
$builder = $this->db->table('T_Status')
$builder = $this->db->table('t_status')
->select('StatusCode,StatusName')
->where('StatusType', REQUISTSTATUS)
->where('StatusCode !=', REQ_DRAFT);
@ -107,9 +107,9 @@ class Requistion_model extends Model
function GetEmployeeDetails($EmpID)
{
$builder = $this->db->table('T_Employee_Details EMP')
$builder = $this->db->table('t_employee_details EMP')
->select(' EMP.EmpID,EMP.Designation,DEPT.DEPCode,DEPT.DepartmentName')
->join('T_DepartmentDetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->join('t_departmentdetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->where('EMP.EmpID ',$EmpID );
$query = $builder->get();
@ -122,9 +122,9 @@ class Requistion_model extends Model
*/
function GetCostCenterByDept($DeptId)
{
$builder = $this->db->table('T_CostCenter_Master Mast ')
$builder = $this->db->table('t_costcenter_master Mast ')
->select('Mast.CostCenterCode,Mast.CostCenterName')
->join('T_CostCenter_Departments COST', 'COST.CostCenterCode = Mast.CostCenterCode')
->join('t_costcenter_departments COST', 'COST.CostCenterCode = Mast.CostCenterCode')
->where('COST.DEPCode ',$DeptId );
$query = $builder->get();
@ -136,7 +136,7 @@ class Requistion_model extends Model
*/
function GetAvailableBudgetAmount($CostCode,$Year,$BudgetType)
{
$builder = $this->db->table('T_CostCenter_Budget')
$builder = $this->db->table('t_costcenter_budget')
->select('BudgetAmount')
->where('CostCenterCode',$CostCode )
->where('BudgetYear',$Year )
@ -148,8 +148,8 @@ class Requistion_model extends Model
function EditMaterialCode($ReqNo,$ReqType)
{
$subQuery ='SELECT Mat.MaterialCode,Mat.MaterialName,Mat.UOM
from T_MaterialMaster Mat where Mat.MaterialCode not in (select Req.MaterialCode from T_Requestion_Details Req
join T_Requestion_Master mast on Req.ReqNo = mast.ReqNo where mast.ReqNo=? and mast.ReqType=?
from t_materialmaster Mat where Mat.MaterialCode not in (select Req.MaterialCode from t_requestion_details Req
join t_requestion_master mast on Req.ReqNo = mast.ReqNo where mast.ReqNo=? and mast.ReqType=?
) and Mat.MaterialType=?';
$query = $this->db->query($subQuery, [$ReqNo,$ReqType,$ReqType]);
@ -166,7 +166,7 @@ class Requistion_model extends Model
*/
function GetMaterialCode($ReqType,$NotArray='')
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName,UOM')
->where('IsActive',1);
@ -188,7 +188,7 @@ class Requistion_model extends Model
*/
function getRawMaterialList($MaterialCode)
{
$builder = $this->db->table('T_MaterialMaster')
$builder = $this->db->table('t_materialmaster')
->select('MaterialName,UOM')
->where('MaterialCode',$MaterialCode );
$query = $builder->get();
@ -202,7 +202,7 @@ class Requistion_model extends Model
*/
function getConfigValue($ConfigID ,$ConfigValue = '')
{
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('ConfigValue')
->where('Config_id ',$ConfigID );
@ -223,7 +223,7 @@ class Requistion_model extends Model
function getAllEmployees()
{
$builder = $this->db->table('T_Employee_Details')
$builder = $this->db->table('t_employee_details')
->select('EmpID,FirstName,LastName');
$query = $builder->get();
@ -238,7 +238,7 @@ class Requistion_model extends Model
function getEmpIdByUserID($UserID)
{
$subQuery ='SELECT EMP.EmpID,EMP.FirstName,EMP.Designation,DEPT.DEPCode,DEPT.DepartmentName
FROM T_Employee_Details EMP JOIN T_DepartmentDetails DEPT ON
FROM t_employee_details EMP JOIN t_departmentdetails DEPT ON
EMP.Departmentcode = DEPT.DEPCode
WHERE EMP.EmpID=(select EmpID from tbl_users where userId=?)';
@ -253,10 +253,10 @@ class Requistion_model extends Model
*/
function getCostCenterUserID($UserID)
{
// $subQuery ='SELECT Mast.CostCenterCode,Mast.CostCenterName from T_CostCenter_Master Mast
// LEFT JOIN T_CostCenter_Departments COST ON COST.CostCenterCode = Mast.CostCenterCode
// WHERE COST.DEPCode=(select Departmentcode from T_Employee_Details where EmpID = (select EmpID from tbl_users where userId=?))';
$subQuery ='SELECT Mast.CostCenterCode,Mast.CostCenterName from T_CostCenter_Master Mast where Mast.IsActive = 1';
// $subQuery ='SELECT Mast.CostCenterCode,Mast.CostCenterName from t_costcenter_master Mast
// LEFT JOIN t_costcenter_departments COST ON COST.CostCenterCode = Mast.CostCenterCode
// WHERE COST.DEPCode=(select Departmentcode from t_employee_details where EmpID = (select EmpID from tbl_users where userId=?))';
$subQuery ='SELECT Mast.CostCenterCode,Mast.CostCenterName from t_costcenter_master Mast where Mast.IsActive = 1';
$query = $this->db->query($subQuery, [$UserID]);
@ -270,7 +270,7 @@ class Requistion_model extends Model
function CheckDraftStatus($UserID)
{
$subQuery = 'select count(ReqNo) as cnt,ReqNo from T_Requestion_Master where
$subQuery = 'select count(ReqNo) as cnt,ReqNo from t_requestion_master where
Requestedby= ( select EmpID from tbl_users where userId=?) and status=?';
$query = $this->db->query($subQuery, [$UserID,REQ_DRAFT]);
@ -285,10 +285,10 @@ class Requistion_model extends Model
{
$subQuery = 'select distinct ReqNo,ReqType,Status,Requestedby,DATE_FORMAT(mast.CreatedDate, "%d-%m-%Y") as CreatedDate,Schedule_Type,NumberOfService,Service_Period ,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,DATE_FORMAT(mast.ReqDate, "%d-%m-%Y") as ReqDate,mast.CostCenterCode,Cost.CostCenterName
from T_Requestion_Master mast
left join T_CostCenter_Master Cost on Cost.CostCenterCode = mast.CostCenterCode
join T_Employee_Details emp on mast.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode
from t_requestion_master mast
left join t_costcenter_master Cost on Cost.CostCenterCode = mast.CostCenterCode
join t_employee_details emp on mast.Requestedby = emp.EmpID
join t_departmentdetails Dept on emp.Departmentcode = Dept.DEPCode
where ReqNo=?';
$query = $this->db->query($subQuery, [$ReqID]);
@ -308,8 +308,8 @@ class Requistion_model extends Model
function getRequistListUserID($UserID)
{
$subQuery = 'select ReqNo, ReqType ,Status,CreatedDate ,StatusName from T_Requestion_Master mast
join T_Status st on st.StatusCode= mast.Status where
$subQuery = 'select ReqNo, ReqType ,Status,CreatedDate ,StatusName from t_requestion_master mast
join t_status st on st.StatusCode= mast.Status where
Requestedby = ( select EmpID from tbl_users where userId=?) and Status != ? ';
$query = $this->db->query($subQuery, [$UserID,REQ_DELETED]);
@ -323,10 +323,10 @@ class Requistion_model extends Model
function getRequistItemList($ReqID,$NoArray='')
{
/* $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,sum(Po.Quantity) as POQTY,sta.StatusName from T_MaterialMaster Mat
left join T_Requestion_Details Req on Req.MaterialCode = Mat.MaterialCode
left join T_PurchaseOrder_LineItem Po on Po.ReqNo = Req.ReqNo and Po.MaterialCode = Req.MaterialCode
left join T_Status sta on sta.StatusCode = Req.Status where Req.ReqNo=? group by Po.ReqNo,Req.MaterialCode';
/* $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,sum(Po.Quantity) as POQTY,sta.StatusName from t_materialmaster Mat
left join t_requestion_details Req on Req.MaterialCode = Mat.MaterialCode
left join t_purchaseorder_lineitem Po on Po.ReqNo = Req.ReqNo and Po.MaterialCode = Req.MaterialCode
left join t_status sta on sta.StatusCode = Req.Status where Req.ReqNo=? group by Po.ReqNo,Req.MaterialCode';
$query = $this->db->query($subQuery, [$ReqID)); */
@ -355,14 +355,14 @@ class Requistion_model extends Model
// function addRequistion($Requistion)
// {
// $this->db->transStart();
// $builder = $this->db->table('T_Requestion_Master');
// $builder = $this->db->table('t_requestion_master');
// $builder->insert($Requistion);
// $insert_id = $this->db->affectedRows();
// $this->db->transComplete();
// if($insert_id>0)
// {
// $subQuery = 'select max(ReqNo) as ReqNo from T_Requestion_Master';
// $subQuery = 'select max(ReqNo) as ReqNo from t_requestion_master';
// $query = $this->db->query($subQuery);
@ -372,7 +372,7 @@ class Requistion_model extends Model
function addRequisition($Requisition) {
$this->db->transStart(); // Start transaction
$result = $this->db->table('T_Requestion_Master')->insert($Requisition);
$result = $this->db->table('t_requestion_master')->insert($Requisition);
$insert_id = $this->db->insertID();
$affected_rows = $this->db->affectedRows();
$this->db->transComplete(); // Complete transaction
@ -381,7 +381,7 @@ class Requistion_model extends Model
$result = ($result) ? $result : false;
if ($result && $affected_rows > 0) {
$subQuery = 'SELECT ReqNo FROM T_Requestion_Master ORDER BY CreatedDate DESC LIMIT 1';
$subQuery = 'SELECT ReqNo FROM t_requestion_master ORDER BY CreatedDate DESC LIMIT 1';
$query = $this->db->query($subQuery);
log_message('error', 'Added new Requisition: ReqID '.$insert_id);
@ -403,7 +403,7 @@ class Requistion_model extends Model
function RequistionIsExists($ReqBy)
{
$builder = $this->db->table('T_Requestion_Master')
$builder = $this->db->table('t_requestion_master')
->select('ReqNo')
->where('Status ',REQ_DRAFT )
->where('Requestedby ',$ReqBy );
@ -421,7 +421,7 @@ class Requistion_model extends Model
function LineItemIsExists($ReqNo,$MaterialCode)
{
$builder = $this->db->table('T_Requestion_Details')
$builder = $this->db->table('t_requestion_details')
->select('ReqNo')
->where('ReqNo ',$ReqNo )
->where('MaterialCode ',$MaterialCode );
@ -439,11 +439,11 @@ class Requistion_model extends Model
function addRequistionDetails($Requistion,$RegNo='')
{
$this->db->transStart();
$builder = $this->db->table('T_Requestion_Details');
$builder = $this->db->table('t_requestion_details');
$builder->insert($Requistion);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
$subQuery = 'select max(ItemNo) as ItemNo from T_Requestion_Details where ReqNo=?';
$subQuery = 'select max(ItemNo) as ItemNo from t_requestion_details where ReqNo=?';
$query = $this->db->query($subQuery,[$RegNo]);
return $query->getResultArray();
@ -451,7 +451,7 @@ class Requistion_model extends Model
function getItemNumber($ReqNo,$MaterialCode)
{
$subQuery = 'select ItemNo from T_Requestion_Details where ReqNo=? and MaterialCode=?';
$subQuery = 'select ItemNo from t_requestion_details where ReqNo=? and MaterialCode=?';
$query = $this->db->query($subQuery,[$ReqNo,$MaterialCode]);
@ -463,7 +463,7 @@ class Requistion_model extends Model
*/
function DeleteRequistionLineItem( $ReqNo,$MaterialCode)
{
$this->db->table('T_Requestion_Details')->delete(['ReqNo' => $ReqNo,'MaterialCode'=>$MaterialCode]);
$this->db->table('t_requestion_details')->delete(['ReqNo' => $ReqNo,'MaterialCode'=>$MaterialCode]);
return TRUE;
}
@ -473,7 +473,7 @@ class Requistion_model extends Model
*/
function UpdateRequistionLineItem($Requist, $ReqNo,$MaterialCode)
{
$this->db->table('T_Requestion_Details')
$this->db->table('t_requestion_details')
->where('ReqNo', $ReqNo)
->where('MaterialCode', $MaterialCode)
->update($Requist);
@ -487,7 +487,7 @@ class Requistion_model extends Model
function UpdateAvlQty($BalanceQuantity,$MaterialCode)
{
$this->db->table('T_Store_Stockdetails')
$this->db->table('t_store_stockdetails')
->where('MaterialCode',$MaterialCode)
->update($BalanceQuantity);
@ -500,7 +500,7 @@ class Requistion_model extends Model
*/
function UpdateRequistion($Requistion, $ReqNo)
{
$this->db->table('T_Requestion_Master')
$this->db->table('t_requestion_master')
->where('ReqNo', $ReqNo)
->update($Requistion);
return TRUE;
@ -517,11 +517,11 @@ class Requistion_model extends Model
// echo 'UserId: '.$UserID . 'From: '.$FromDate .'TO: '. $ToDate. 'Status: '. $Status;
$subQuery = 'select distinct ReqNo,Status,mast.CreatedDate,Requestedby,emp.FirstName,mast.Comments,st.StatusName
from T_Requestion_Master mast join T_Employee_Details emp on mast.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode
join T_Status st on st.StatusCode = mast.Status
where status not in(?,?,?) and emp.Departmentcode in (select DEPCode from T_DepartmentDetails where HeadDept=
(select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where
from t_requestion_master mast join t_employee_details emp on mast.Requestedby = emp.EmpID
join t_departmentdetails Dept on emp.Departmentcode = Dept.DEPCode
join t_status st on st.StatusCode = mast.Status
where status not in(?,?,?) and emp.Departmentcode in (select DEPCode from t_departmentdetails where HeadDept=
(select HeadDept from t_departmentdetails where DEPCode = (select Departmentcode from t_employee_details where
EmpID=(select EmpID from tbl_users where userId=?))))';
$subQuery1 = $subQuery;
$order_by = ' order by mast.CreatedDate desc';
@ -567,8 +567,8 @@ class Requistion_model extends Model
function getRequestBy(){
$subQuery ='SELECT CONCAT_WS(" ",ted.FirstName,ted.LastName) as Full_Name ,tdd.DepartmentName, ted.EmpID
from T_Employee_Details as ted
left join T_DepartmentDetails as tdd on tdd.DEPCode = ted.Departmentcode
from t_employee_details as ted
left join t_departmentdetails as tdd on tdd.DEPCode = ted.Departmentcode
where ted.Designation = "Admin Head" and ted.IsActive = 1';
$query = $this->db->query($subQuery);

20
app/Models/Store_model.php
View File

@ -9,9 +9,9 @@ class Store_model extends Model
function viewStock()
{
$builder = $this->db->table('T_Store_Stockdetails st ')
$builder = $this->db->table('t_store_stockdetails st ')
->select('st.*,st.Remarks as storeremarks,MM.*')
->join('T_MaterialMaster MM', 'st.MaterialCode=MM.MaterialCode');
->join('t_materialmaster MM', 'st.MaterialCode=MM.MaterialCode');
$query = $builder->get();
$result = $query->getResult();
@ -20,10 +20,10 @@ class Store_model extends Model
// function viewStock()
// {
// $builder = $this->db->table('T_Store_Stockdetails st ')->distinct()
// $builder = $this->db->table('t_store_stockdetails st ')->distinct()
// ->select('st.*,st.Remarks as storeremarks,MM.*,RDet.DeliveredQuantity')
// ->join('T_MaterialMaster MM','st.MaterialCode=MM.MaterialCode')
// ->join('T_Requestion_Details RDet','st.MaterialCode=RDet.MaterialCode and MM.MaterialCode=RDet.MaterialCode');
// ->join('t_materialmaster MM','st.MaterialCode=MM.MaterialCode')
// ->join('t_requestion_details RDet','st.MaterialCode=RDet.MaterialCode and MM.MaterialCode=RDet.MaterialCode');
// $query = $builder->get();
// $result = $query->getResult();
//
@ -32,13 +32,13 @@ class Store_model extends Model
function GetAllMaterialList()
{
$subQuery = 'select MM.* from T_MaterialMaster MM where MaterialCode not in(select MaterialCode from T_Store_Stockdetails)';
$subQuery = 'select MM.* from t_materialmaster MM where MaterialCode not in(select MaterialCode from t_store_stockdetails)';
$query = $this->db->query($subQuery);
return $query->getResult();
}
function GetConfigValue($ConfigID)
{
$builder = $this->db->table('T_ConfigDetails')->select('ConfigValue')
$builder = $this->db->table('t_configdetails')->select('ConfigValue')
->where('Config_ID', $ConfigID);
$query = $builder->get();
@ -49,7 +49,7 @@ class Store_model extends Model
{
$this->db->transStart();
$builder = $this->db->table('T_Store_Stockdetails');
$builder = $this->db->table('t_store_stockdetails');
$builder->insert($StockDetails);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -58,14 +58,14 @@ class Store_model extends Model
function UpdateStock($StockDetails, $MaterialCode)
{
$this->db->table('T_Store_Stockdetails')
$this->db->table('t_store_stockdetails')
->where('MaterialCode', $MaterialCode)
->update($StockDetails);
}
function GetStockHisory($MaterialCode)
{
$builder = $this->db->table('T_Store_Stockdetails_History')
$builder = $this->db->table('t_store_stockdetails_history')
->select('Quantity,ActualQuantity,Remarks,updatedOn')
->where('MaterialCode', $MaterialCode);
$query = $builder->get();

108
app/Models/Storerequistion_model.php
View File

@ -10,11 +10,11 @@ class Storerequistion_model extends Model
/* completed*/
function getCostUser($userId = '', $BudgetType = '')
{
$builder = $this->db->table('T_CostCenter_Master CM')
$builder = $this->db->table('t_costcenter_master CM')
->select('ED.FirstName,CM.CostCenterCode,CM.CostCenterName,CB.BudgetAmount,CB.BudgetType')
->join('T_CostCenter_Departments CD ', ' CD.CostCenterCode = CM.CostCenterCode')
->join('T_CostCenter_Budget CB ', ' CB.CostCenterCode = CM.CostCenterCode')
->join('T_Employee_Details ED ', 'ED.Departmentcode = CD.DEPCode')
->join('t_costcenter_departments CD ', ' CD.CostCenterCode = CM.CostCenterCode')
->join('t_costcenter_budget CB ', ' CB.CostCenterCode = CM.CostCenterCode')
->join('t_employee_details ED ', 'ED.Departmentcode = CD.DEPCode')
->join('tbl_users TU ', ' TU.EmpID = ED.EmpID ')
->where('TU.userId ', $userId);
//$this->db->where('CB.BudgetType','SERVICE');
@ -30,7 +30,7 @@ class Storerequistion_model extends Model
function getRawMaterialList($MaterialCode = '')
{
$builder = $this->db->table('T_MaterialMaster')->select('MaterialName,UOM,MaterialCode');
$builder = $this->db->table('t_materialmaster')->select('MaterialName,UOM,MaterialCode');
//$this->db->where('MaterialCode',$MaterialCode );
$query = $builder->get();
$result = $query->getResult();
@ -46,12 +46,12 @@ class Storerequistion_model extends Model
{
$this->db->transStart();
$builder = $this->db->table('T_Store_Requestion_Master');
$builder = $this->db->table('t_store_requestion_master');
$builder->insert($ReqDate);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
if ($insert_id > 0) {
$subQuery = 'select max(StoreReqNo) as StoreReqNo from T_Store_Requestion_Master';
$subQuery = 'select max(StoreReqNo) as StoreReqNo from t_store_requestion_master';
$query = $this->db->query($subQuery);
@ -68,7 +68,7 @@ class Storerequistion_model extends Model
*/
function UpdateRequistion($StoreReqNo, $Request)
{
$this->db->table('T_Store_Requestion_Master')
$this->db->table('t_store_requestion_master')
->where('StoreReqNo', $StoreReqNo)
->update($Request);
return TRUE;
@ -76,12 +76,12 @@ class Storerequistion_model extends Model
function getRequistionList()
{
$builder = $this->db->table('T_Store_Requestion_Master Sm')
$builder = $this->db->table('t_store_requestion_master Sm')
->select('Sm.StoreReqNo, Emp.FirstName as Requestedby,Sm.ReqDate,Sm.Status,Sm.Comments as Remarks,St.StatusName,Dept.DepartmentName ')
->join('tbl_users user', 'Sm.CreatedBy = user.userId ')
->join('T_Employee_Details Emp', 'Emp.EmpID= user.EmpID')
->join('T_DepartmentDetails Dept', 'Dept.DEPCode = Sm.DepartmentCode')
->join('T_Status St', 'St.StatusCode = Sm.Status')
->join('t_employee_details Emp', 'Emp.EmpID= user.EmpID')
->join('t_departmentdetails Dept', 'Dept.DEPCode = Sm.DepartmentCode')
->join('t_status St', 'St.StatusCode = Sm.Status')
->where('Sm.Status ', STORE_APPROVAL)
->orWhere('Sm.Status ', STORE_PARTIALLYISSUSED);
@ -97,12 +97,12 @@ class Storerequistion_model extends Model
//print_r($Request);
//die();
$this->db->transStart();
$builder = $this->db->table('T_Store_Requestion_Details');
$builder = $this->db->table('t_store_requestion_details');
$builder->insert($Request);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
if ($insert_id > 0) {
$subQuery = 'select max(StoreReqLineItemNo) as StoreReqLineItemNo from T_Store_Requestion_Details';
$subQuery = 'select max(StoreReqLineItemNo) as StoreReqLineItemNo from t_store_requestion_details';
$query = $this->db->query($subQuery);
@ -115,12 +115,12 @@ class Storerequistion_model extends Model
{
//print_r($Request);
$this->db->transStart();
$this->db->table('T_Store_Requestion_Details')
$this->db->table('t_store_requestion_details')
->update($Request);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
if ($insert_id > 0) {
$subQuery = 'select max(StoreReqLineItemNo) as StoreReqLineItemNo from T_Store_Requestion_Details';
$subQuery = 'select max(StoreReqLineItemNo) as StoreReqLineItemNo from t_store_requestion_details';
$query = $this->db->query($subQuery);
@ -134,7 +134,7 @@ class Storerequistion_model extends Model
function LineItemIsExists($StoreReqNo, $MaterialCode)
{
$builder = $this->db->table('T_Store_Requestion_Details');
$builder = $this->db->table('t_store_requestion_details');
$builder->select('StoreReqNo')
->where('StoreReqNo', $StoreReqNo)
->where('MaterialCode', $MaterialCode);
@ -158,7 +158,7 @@ class Storerequistion_model extends Model
{
//echo "nsmdnsjkkjasdf"; die();
$this->db->transStart();
$builder = $this->db->table('T_Store_Requestion_Details');
$builder = $this->db->table('t_store_requestion_details');
$builder->insert($StoreReqLineItemNo);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -174,7 +174,7 @@ class Storerequistion_model extends Model
{
//echo "nsmdnsjkkjasdf"; die();
$this->db->transStart();
$this->db->table('T_Store_Requestion_Details')
$this->db->table('t_store_requestion_details')
->update($StoreReqLineItemNo);
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
@ -189,7 +189,7 @@ class Storerequistion_model extends Model
*/
function UpdateRequistionLineItem($Request, $StoreReqNo, $MaterialCode)
{
$this->db->table('T_Store_Requestion_Details')
$this->db->table('t_store_requestion_details')
->where('MaterialCode', $MaterialCode)
->where('StoreReqNo', $StoreReqNo)
->update($Request);
@ -202,7 +202,7 @@ class Storerequistion_model extends Model
*/
function DeleteRequistionLineItem($StoreReqNo, $MaterialCode)
{
$this->db->table('T_Store_Requestion_Details')->delete(['StoreReqNo' => $StoreReqNo, 'MaterialCode' => $MaterialCode]);
$this->db->table('t_store_requestion_details')->delete(['StoreReqNo' => $StoreReqNo, 'MaterialCode' => $MaterialCode]);
return TRUE;
}
@ -215,7 +215,7 @@ class Storerequistion_model extends Model
function getStatus()
{
$builder = $this->db->table('T_Status')->select('StatusCode,StatusName ')
$builder = $this->db->table('t_status')->select('StatusCode,StatusName ')
->where('Remarks', 'STORE REQUISTION STATUS');
//->where('StatusCode!=', REQ_DRAFT);
$query = $builder->get();
@ -226,10 +226,10 @@ class Storerequistion_model extends Model
function editstorerequistions($StoreReqNo)
{
$builder = $this->db->table('T_Store_Requestion_Details Sr')
$builder = $this->db->table('t_store_requestion_details Sr')
->select('Sr.StoreReqNo,Sr.MaterialCode,Sr.QuantityRequired,Sr.Status,Sr.Remarks,Mm.MaterialName,Mm.UOM,Sr.QuantityIssued,STM.Status ')
->join('T_MaterialMaster Mm', ' Mm.MaterialCode = Sr.MaterialCode')
->join('T_Store_Requestion_Master STM', ' STM.StoreReqNo = Sr.StoreReqNo')
->join('t_materialmaster Mm', ' Mm.MaterialCode = Sr.MaterialCode')
->join('t_store_requestion_master STM', ' STM.StoreReqNo = Sr.StoreReqNo')
->where('Sr.StoreReqNo', $StoreReqNo);
$query = $builder->get();
return $query->getResult();
@ -243,7 +243,7 @@ class Storerequistion_model extends Model
function RequistionIsExists($ReqDate)
{
$builder = $this->db->table('T_Store_Requestion_Master')
$builder = $this->db->table('t_store_requestion_master')
->select('StoreReqNo')
//->where('Status ',REQ_DRAFT )
->where('ReqDate', $ReqDate);
@ -261,7 +261,7 @@ class Storerequistion_model extends Model
function Storerequisition($MaterialCode)
{
$builder = $this->db->table('T_Store_Requestion_Details')->select('StoreReqNo')
$builder = $this->db->table('t_store_requestion_details')->select('StoreReqNo')
//->where('Status ',REQ_DRAFT )
->where('MaterialCode', $MaterialCode);
$query = $builder->get();
@ -282,13 +282,13 @@ class Storerequistion_model extends Model
$subQuery = ' select distinct Str.StoreReqNo,Str.Requestedby,Str.ReqDate,Str.Status,Str.CreatedDate,Str.Comments,St.StatusName,Emp1.FirstName
from T_Store_Requestion_Master Str
join T_Status St on St.StatusCode = Str.Status
join T_Employee_Details Emp on Emp.Departmentcode =Str.DepartmentCode
join T_Employee_Details Emp1 on Emp1.EmpID =Str.Requestedby
join T_DepartmentDetails Dept on Dept.DEPCode = Emp.Departmentcode
where Str.Status not in(?,?,?) and Emp.Departmentcode in (select DEPCode from T_DepartmentDetails where HeadDept=
(select HeadDept from T_DepartmentDetails where DEPCode = (select Departmentcode from T_Employee_Details where
from t_store_requestion_master Str
join t_status St on St.StatusCode = Str.Status
join t_employee_details Emp on Emp.Departmentcode =Str.DepartmentCode
join t_employee_details Emp1 on Emp1.EmpID =Str.Requestedby
join t_departmentdetails Dept on Dept.DEPCode = Emp.Departmentcode
where Str.Status not in(?,?,?) and Emp.Departmentcode in (select DEPCode from t_departmentdetails where HeadDept=
(select HeadDept from t_departmentdetails where DEPCode = (select Departmentcode from t_employee_details where
EmpID=(select EmpID from tbl_users where userId=?))))';
$query = '';
@ -304,10 +304,10 @@ class Storerequistion_model extends Model
function getRequistDetails($StoreReqNo = '')
{
$subQuery = ' select Str.StoreReqNo,Str.Requestedby,Str.ReqDate,Dept.DEPCode,Dept.DepartmentName,Cm.CostCenterCode,Cm.CostCenterName,Emp.FirstName from T_Store_Requestion_Master Str
join T_DepartmentDetails Dept on Dept.DEPCode = Str.DepartmentCode
join T_CostCenter_Master Cm on Cm.CostCenterCode =Str.CostCenterCode
join T_Employee_Details Emp on Emp.EmpID =Str.Requestedby
$subQuery = ' select Str.StoreReqNo,Str.Requestedby,Str.ReqDate,Dept.DEPCode,Dept.DepartmentName,Cm.CostCenterCode,Cm.CostCenterName,Emp.FirstName from t_store_requestion_master Str
join t_departmentdetails Dept on Dept.DEPCode = Str.DepartmentCode
join t_costcenter_master Cm on Cm.CostCenterCode =Str.CostCenterCode
join t_employee_details Emp on Emp.EmpID =Str.Requestedby
where StoreReqNo =? ';
@ -319,9 +319,9 @@ class Storerequistion_model extends Model
function editRequistDetails($StoreReqNo)
{
$builder = $this->db->table('T_Store_Requestion_Master Sr')
$builder = $this->db->table('t_store_requestion_master Sr')
->select('StoreReqNo,Sr.CostCenterCode,Cc.CostCenterName ')
->join('T_CostCenter_Master Cc ', ' Cc.CostCenterCode=Sr.CostCenterCode')
->join('t_costcenter_master Cc ', ' Cc.CostCenterCode=Sr.CostCenterCode')
->where('StoreReqNo', $StoreReqNo);
$query = $builder->get();
return $query->getResult();
@ -335,9 +335,9 @@ class Storerequistion_model extends Model
{
$subQuery = ' select Str.StoreReqNo,Str.MaterialCode,Str.QuantityRequired,Str.Remarks,Mat.MaterialName,Mat.UOM,Ss.StatusName,Str.Status,Str.QuantityIssued
from T_Store_Requestion_Details Str
join T_MaterialMaster Mat on Mat.MaterialCode = Str.MaterialCode
join T_Status Ss on Ss.StatusCode = Str.Status
from t_store_requestion_details Str
join t_materialmaster Mat on Mat.MaterialCode = Str.MaterialCode
join t_status Ss on Ss.StatusCode = Str.Status
where Str.StoreReqNo =?';
$query = $this->db->query($subQuery, array($StoreReqNo));
@ -356,10 +356,10 @@ class Storerequistion_model extends Model
{
$subQuery = ' select Str.StoreReqNo,Str.MaterialCode,Str.QuantityRequired,Str.QuantityIssued,Str.Remarks,Str.StoreComments,Mat.MaterialName,Mat.UOM,Ss.StatusName,St.Status,St.Quantity
from T_Store_Requestion_Details Str
join T_MaterialMaster Mat on Mat.MaterialCode = Str.MaterialCode
join T_Status Ss on Ss.StatusCode = Str.Status
left join T_Store_Stockdetails St on St.MaterialCode=Str.MaterialCode
from t_store_requestion_details Str
join t_materialmaster Mat on Mat.MaterialCode = Str.MaterialCode
join t_status Ss on Ss.StatusCode = Str.Status
left join t_store_stockdetails St on St.MaterialCode=Str.MaterialCode
where Str.StoreReqNo =?';
$query = $this->db->query($subQuery, array($StoreReqNo));
@ -370,7 +370,7 @@ class Storerequistion_model extends Model
function getStoreRequistionStatus($StreReqNo = '')
{
$builder = $this->db->table('T_Store_Requestion_Master Sr')
$builder = $this->db->table('t_store_requestion_master Sr')
->select('Status')
->where('StoreReqNo', $StreReqNo);
$query = $builder->get();
@ -379,7 +379,7 @@ class Storerequistion_model extends Model
function UpdateStoreRequistionItem($Items, $ReqNo, $MaterialCode)
{
$this->db->table('T_Store_Requestion_Details')
$this->db->table('t_store_requestion_details')
->where('StoreReqNo', $ReqNo)
->where('MaterialCode', $Items)
->update($Items);
@ -391,7 +391,7 @@ class Storerequistion_model extends Model
function getSavedQty($ReqNO, $MaterialCode)
{
$subQuery = 'select QuantityIssued from T_Store_Requestion_Details
$subQuery = 'select QuantityIssued from t_store_requestion_details
where StoreReqNo=? and MaterialCode=?';
$query = $this->db->query($subQuery, array($ReqNO, $MaterialCode));
@ -401,7 +401,7 @@ class Storerequistion_model extends Model
function updatestoremaster($updatestatus, $StoreReqNo)
{
$this->db->table('T_Store_Requestion_Master')
$this->db->table('t_store_requestion_master')
->where('StoreReqNo', $StoreReqNo)
->update($updatestatus);
return TRUE;
@ -410,7 +410,7 @@ class Storerequistion_model extends Model
function getstatuscount($Status, $StoreReqNo)
{
$builder = $this->db->table('T_Store_Requestion_Details')->select('count(Status) as SCount')
$builder = $this->db->table('t_store_requestion_details')->select('count(Status) as SCount')
->where('Status', $Status)
->where('StoreReqNo', $StoreReqNo);
//->where('StoreReqNo', $StoreReqNo);
@ -439,14 +439,14 @@ class Storerequistion_model extends Model
function getItemQuantityFromStock($MaterialCode)
{
$subQuery = 'select Quantity from T_Store_Stockdetails where MaterialCode=?';
$subQuery = 'select Quantity from t_store_stockdetails where MaterialCode=?';
$query = $this->db->query($subQuery, array($MaterialCode));
return $query->getResultArray();
}
function UpdateStock($StockDetails, $MaterialCode)
{
$this->db->table('T_Store_Stockdetails')
$this->db->table('t_store_stockdetails')
->where('MaterialCode', $MaterialCode)
->update($StockDetails);

38
app/Models/Supplier_model.php
View File

@ -17,9 +17,9 @@ class Supplier_model extends Model
function supplierlisting()
{
$builder = $this->db->table('T_SupplierDetailsN as BaseT')
$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.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');
$query = $builder->get();
@ -37,7 +37,7 @@ class Supplier_model extends Model
{
$ConfigID = 'C009';
$builder = $this->db->table('T_ConfigDetails')
$builder = $this->db->table('t_configdetails')
->select('ConfigValue')
->where('Config_id ', $ConfigID);
if ($Configvalue != '') {
@ -51,7 +51,7 @@ class Supplier_model extends Model
function getPaymentTerms($payment = '')
{
$builder = $this->db->table('T_PaymentTerms')->select('*');
$builder = $this->db->table('t_paymentterms')->select('*');
$query = $builder->get();
$result = $query->getResult();
return $result;
@ -60,7 +60,7 @@ class Supplier_model extends Model
function checkPAN($PAN, $SID = '')
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('PAN')->where('PAN', $PAN);
if ($SID != '') {
$builder->where('SupplierID !=', $SID);
@ -75,7 +75,7 @@ class Supplier_model extends Model
public function checkGST($GST, $SID = null)
{
$builder = $this->db->table('T_SupplierDetailsN')->select('GSTNO')
$builder = $this->db->table('t_supplierdetailsn')->select('GSTNO')
->where('GSTNO', $GST);
if ($SID !== null) {
@ -95,7 +95,7 @@ class Supplier_model extends Model
function addNewsupplier($supplier)
{
$builder = $this->db->table('T_SupplierDetailsN');
$builder = $this->db->table('t_supplierdetailsn');
$builder->insert($supplier);
$SID = $this->db->affectedRows();
return $SID;
@ -105,13 +105,13 @@ class Supplier_model extends Model
// function addNewsupplier($supplier)
// {
// $builder = $this->db->table('T_SupplierDetailsN');
// $builder = $this->db->table('t_supplierdetailsn');
// $builder->insert($supplier);
// $SID = $this->db->affectedRows();
// // if($SID>0)
// // {
// // $subQuery = 'select max(SupplierID) as suppid from T_SupplierDetailsN';
// // $subQuery = 'select max(SupplierID) as suppid from t_supplierdetailsn';
// // $query = $this->db->query($subQuery);
// // return $query->getResult();
// // }
@ -128,8 +128,8 @@ class Supplier_model extends Model
{
//->select('SD.SupplierID, SD.SupplierName, SD.Address, SD.ContactNumber, SD.AlternateContactNumber, SD.EmailAddress, SD.Exiseregistration, SD.TIN, SD.PAN, SD.CSTNO, SD.CSTDate, SD.GSTNO, SD.GSTRange, SD.CollectrateAddress, SD.UANumber, SD.BankAcNumber, SD.IsService, SD.IsMaintanance, SD.IsRawMaterial, SD.IFSCCode, SD.BranchName, SD.BankAddress, SD.IsActive, SD.PaymentID,PT.PaymentTerms');
$builder = $this->db->table('T_SupplierDetailsN SD')->select('SD.*,PT.PaymentTerms')
->join('T_PaymentTerms PT', 'PT.PaymentID = SD.PaymentID', 'left')
$builder = $this->db->table('t_supplierdetailsn SD')->select('SD.*,PT.PaymentTerms')
->join('t_paymentterms PT', 'PT.PaymentID = SD.PaymentID', 'left')
->where('SD.SupplierID', $supplierID);
$query = $builder->get();
@ -138,13 +138,13 @@ class Supplier_model extends Model
/* This function to get the Supplier Address on respective Supplier ID */
function GetSupplierAddress($supplierID)
{
$builder = $this->db->table('T_SupplierDetailsN')->select('Address')->where('SupplierID', $supplierID);
$builder = $this->db->table('t_supplierdetailsn')->select('Address')->where('SupplierID', $supplierID);
$query = $builder->get();
return $query->getResultArray();
}
function UpdateSupplier($supplier, $supplierID)
{
$this->db->table('T_SupplierDetailsN')
$this->db->table('t_supplierdetailsn')
->where('SupplierID', $supplierID)
->update($supplier);
return $this->db->affectedRows();
@ -154,7 +154,7 @@ class Supplier_model extends Model
function viewsupplier($supplier, $supplierID)
{
$this->db->table('T_SupplierDetailsN')
$this->db->table('t_supplierdetailsn')
->where('SupplierID', $supplierID)
->update($supplier);
return $this->db->affectedRows();
@ -170,16 +170,16 @@ class Supplier_model extends Model
function export_excel()
{
$builder = $this->db->table('T_SupplierDetailsN as det')
$builder = $this->db->table('t_supplierdetailsn as det')
->select('det.SupplierID,SupplierName,det.Address,det.ContactNumber,det.AlternateContactNumber,det.EmailAddress,
det.PAN,det.GSTNO,det.MSME,
CONCAT(det.BankAcNumber, "-", det.IFSCCode, "-", det.BranchName," ", det.BankAddress) AS ConcatenatedBankDetails,
pmt.PaymentTerms,det.IsService,det.IsMaintanance,det.IsRawMaterial,emp.firstname ,emp1.firstname as Update_by,det.IsActive')
->join('tbl_users as tbl', ' det.createdby = tbl.userid', 'left')
->join('T_Employee_Details as emp', 'emp.empid=tbl.empid', 'left')
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
->join('tbl_users as tbl1', ' det.UpdatedBy = tbl1.userid', 'left')
->join('T_Employee_Details as emp1', 'emp1.empid=tbl1.empid', 'left')
->join('T_PaymentTerms as pmt', 'pmt.PaymentID = det.PaymentID', 'left');
->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid', 'left')
->join('t_paymentterms as pmt', 'pmt.PaymentID = det.PaymentID', 'left');
$query = $builder->get();
return $query->getResultArray();
@ -188,7 +188,7 @@ class Supplier_model extends Model
function checkSupplierExists($supp_name)
{
$builder = $this->db->table('T_SupplierDetailsN')
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierID,SupplierName,Address')
->like('REPLACE(SupplierName, " ", "")', $supp_name);

20
app/Models/User_model.php
View File

@ -17,10 +17,10 @@ class User_model extends Model
*/
function userListing()
{
$builder = $this->db->table('T_Employee_Details EMP')
$builder = $this->db->table('t_employee_details EMP')
->select('EMP.EmpID,EMP.FirstName,EMP.LastName,EMP.Designation,EMP.EmailId,EMP.ContactNumber,
DEPT.DEPCode,DEPT.DepartmentName,role.role,user.userId')
->join('T_DepartmentDetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->join('t_departmentdetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->join('tbl_users user', 'user.EmpID = EMP.EmpID')
->join('tbl_roles role', 'user.roleId = role.roleId')
->where('user.isDeleted !=', 1);
@ -191,7 +191,7 @@ class User_model extends Model
{
//echo $UserId;
$subQuery = 'select EMP.EmpID,EMP.FirstName,EMP.LastName,EMP.Designation,EMP.EmailId,EMP.ContactNumber,DEPT.DEPCode,DEPT.DepartmentName from
T_Employee_Details EMP join T_DepartmentDetails DEPT on
t_employee_details EMP join t_departmentdetails DEPT on
EMP.Departmentcode = DEPT.DEPCode where EMP.EmpID= (select EmpID from tbl_users where userId=?)';
$query = $this->db->query($subQuery, array($UserId));
@ -207,13 +207,13 @@ class User_model extends Model
function getAllEmployees()
{
/*->select('EmpID,FirstName,LastName');
$builder = $this->db->table('T_Employee_Details');
$builder = $this->db->table('t_employee_details');
$query = $builder->get();
return $query->getResult(); */
$builder = $this->db->table('T_Employee_Details EMP')
$builder = $this->db->table('t_employee_details EMP')
->select('EMP.EmpID,EMP.FirstName,EMP.LastName,EMP.Designation,EMP.EmailId,EMP.ContactNumber,DEPT.DEPCode,DEPT.DepartmentName')
->join('T_DepartmentDetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->join('t_departmentdetails DEPT', 'EMP.Departmentcode = DEPT.DEPCode')
->where('EMP.IsActive ', 1);
$query = $builder->get();
return $query->getResult();
@ -223,7 +223,7 @@ class User_model extends Model
function addAccess($userdept)
{
$this->db->transStart();
$builder = $this->db->table('T_AccessDepartments');
$builder = $this->db->table('t_accessdepartments');
$builder->insert($userdept);
$insert_id = $this->db->affectedRows();
@ -236,7 +236,7 @@ class User_model extends Model
function DeleteAccess($empid, $Depcode)
{
$query = $this->db->table('T_AccessDepartments')->delete(['Departmentcode' => $Depcode, 'EmpID' => $empid]);
$query = $this->db->table('t_accessdepartments')->delete(['Departmentcode' => $Depcode, 'EmpID' => $empid]);
return TRUE;
}
@ -295,10 +295,10 @@ GROUP BY financial_year ";
function favouriteadd($favourite)
{
if ($favourite['Menu_ID'] != '') {
$query = $this->db->table('T_fav_add')->delete(['Menu_ID' => $favourite['Menu_ID']]);
$query = $this->db->table('t_fav_add')->delete(['Menu_ID' => $favourite['Menu_ID']]);
} else {
//echo "else";
$builder = $this->db->table('T_fav_add');
$builder = $this->db->table('t_fav_add');
$builder->insert($favourite);
$r = $this->db->affectedRows();
return $r;

12
app/Views/Favourite.php
View File

@ -827,9 +827,9 @@ else{
<div class="box-body">
<div style="padding-left: 15px;">
<div id="Addigr" onclick="save(this.id,'Inward Gate Register Entry')"><span class="star glyphicon glyphicon-star-empty"></span>Inward Gate Register Entry</div>
<div id="AddIGR" onclick="save(this.id,'Inward Gate Register Entry')"><span class="star glyphicon glyphicon-star-empty"></span>Inward Gate Register Entry</div>
<div id="ViewigrDetails" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="ViewIGR" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="AddOgr" onclick="save(this.id,'Outward Gate Register Entry')"><span class="star glyphicon glyphicon-star-empty"></span>Outward Gate Register Entry</div>
@ -839,7 +839,7 @@ else{
<?php if($DEPCode != SECURITY){?>
<div id="Viewigr" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="ViewIGR" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="ViewMRIR" onclick="save(this.id,'View Material Inspection Report')"><span class="star glyphicon glyphicon-star-empty"></span>View Material Inspection Report</div>
<?php }?>
@ -895,13 +895,13 @@ else{
</div>
<div class="box-body">
<div style="padding-left: 15px;">
<div id="Viewigr" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="ViewIGR" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="ViewMRIR" onclick="save(this.id,'View Material Inspection Report')"><span class="star glyphicon glyphicon-star-empty"></span>View Material Inspection Report</div>
<div id="quality" onclick="save(this.id,'Product Test Specification Master')"><span class="star glyphicon glyphicon-star-empty"></span>Product Test Specification Master</div>
<div id="qualityreportlist" onclick="save(this.id,'Product Test Report')"><span class="star glyphicon glyphicon-star-empty"></span>Product Test Report</div>
<div id="qualityreportlistinward" onclick="save(this.id,'Inward Material Test Report')"><span class="star glyphicon glyphicon-star-empty"></span>Inward Material Test Report</div>
<div id="Addigr" onclick="save(this.id,'Inward Gate Register Entry')"><span class="star glyphicon glyphicon-star-empty"></span>Inward Gate Register Entry</div>
<div id="ViewigrDetails" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="AddIGR" onclick="save(this.id,'Inward Gate Register Entry')"><span class="star glyphicon glyphicon-star-empty"></span>Inward Gate Register Entry</div>
<div id="ViewIGR" onclick="save(this.id,'View Inward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Inward Gate Register</div>
<div id="AddOgr" onclick="save(this.id,'Outward Gate Register Entry')"><span class="star glyphicon glyphicon-star-empty"></span>Outward Gate Register Entry</div>
<div id="ViewOgr" onclick="save(this.id,'View Outward Gate Register')"><span class="star glyphicon glyphicon-star-empty"></span>View Outward Gate Register</div>

4
app/Views/alterpurchaseorder.php
View File

@ -149,7 +149,7 @@ if (!empty($INRSYMBOL)) {
<td align="left"><%=TotalValue%></td>
<td>
<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow('<%=index%>')" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
</td>
@ -5487,7 +5487,7 @@ if (!empty($INRSYMBOL)) {
<td align="left"><%=TotalValue%></td>
<td>
<a data-target='#EDITREVENUE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRevenueRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
<a data-target='#EDITREVENUE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRevenueRow('<%=index%>')" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
</td>

2
app/Views/bankamountunpaid.php
View File

@ -253,7 +253,7 @@ foreach($financialyear as $item)
<th>PO Amount (&#8377;)</th>
<th style="display:none;">IGR File</th>
<th style="display:none;">PO File</th>
<!--<th>Over Due Days</th>DATEDIFF(CURDATE(),T_IGR_Master.MaterialReceivedDate)as days-->
<!--<th>Over Due Days</th>DATEDIFF(CURDATE(),t_igr_master.MaterialReceivedDate)as days-->
</tr>
</thead>

17
app/Views/includes/header.php
View File

@ -1480,7 +1480,7 @@
$DEPCode == "Inspection"
) { ?>
<li>
<a href="<?php echo base_url(); ?>Addigr">
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
@ -1554,7 +1554,7 @@
<?php } ?>
<!-- <?php if ($DEPCode == SECURITY) { ?>
<li class="treeview">
<a href="<?php echo base_url(); ?>Addigr">
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
@ -1598,7 +1598,7 @@
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>Addigr">
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
@ -1695,7 +1695,7 @@
$DEPCode == SECURITY
) { ?>
<li>
<a href="<?php echo base_url(); ?>Addigr">
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
@ -1738,17 +1738,16 @@
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>Addigr">
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
</li>
<li>
<?php $link = ($DEPCode == SECURITY) ? base_url() . 'ViewigrDetails' : base_url() . 'Viewigr'; ?>
<a href="<?php echo $link; ?>">
<i class="fa fa-eye"></i>
<span>View Inward Gate Register</span>
<a href="<?php echo base_url(); ?>ViewIGR">
<i class="fa fa-eye"></i>
<span>View Inward Gate Register</span>
</a>
</li>
</ul>

166
app/Views/inwardgateregister.php
View File

@ -2,6 +2,14 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
<script src="<?php echo base_url()?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="<?php echo base_url()?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
<style>
#MaterialRcvdDate {
text-align: left;
}
#InvoiceDate {
text-align: left;
}
</style>
<script>
$(document).ready(function(){
@ -10,15 +18,13 @@
$("#InvoiceDate").datepicker({
maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
$("#MaterialRcvdDate").datepicker({
maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
}).datepicker("setDate", new Date());
});
//jquery for vechicle masking
@ -61,7 +67,7 @@
<section class="content-header">
<h5><div class="pull-right hidden-xs">
<b><div id="wizard_clock"></div> <br><div id="formatted_IsOpenOrder"></div> </b>
<b><div id="wizard_clock"></div></b>
</div></h5>
<h1>
<center> Inward Gate Register </center>
@ -76,95 +82,81 @@
<div class="row"><br/><br/>
<div id="content" > </div>
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-6">
<div style="display: flex; justify-content: space-between; align-items: center;">
<label>Select Purchase Order No</label>
<label>Select Purchase Order No <span style="color:red; font-size: 15px;">*</span></label>
<a id="printLink" data-toggle="tooltip" href="" target="new" style="text-align: right;">
<i class="fa fa-print" data-toggle="tooltip" title="Click here to Print the Purchase Order details"></i>
</a>
</div>
<?php
$options = array("-1"=>'Purchase Order No');
if(!empty($PO_NO))
{
//print_r($PO_NO);
foreach ($PO_NO as $SI):
$options[$SI->PONO] = $SI->PONO .'-'. $SI->SupplierName ;
$PONO = $SI->PONO;
endforeach;
}
echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"');
?>
</div>
<input type="hidden" name="hiddenIsOpenOrder" id="hiddenIsOpenOrder"/>
<div class="col-md-3">
<label>Supplier Name </label>
<div class="form-group">
<?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Sup', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Invoice Number <!-- Delivery Challan/Inv No --></label>
<?php
$data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' ); // ,'onkeypress'=>'return isNumberKey(event);' );
echo form_input($data);
<?php
$options = array("-1"=>'Purchase Order No');
if(!empty($PO_NO)){
//print_r($PO_NO);
foreach ($PO_NO as $SI):
$options[$SI->PONO] = $SI->PONO .'-'. $SI->SupplierName ;
$PONO = $SI->PONO;
endforeach;
}
echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"');
?>
<span class="help-block"></span>
</div>
<input type="hidden" name="hiddenIsOpenOrder" id="hiddenIsOpenOrder"/>
<div class="col-md-6">
<label>Supplier Name </label>
<div class="form-group">
<?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Sup', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-12" style="margin: 10px 0;">
<div class="col-md-4">
<label>Invoice Number <span style="color:red; font-size: 15px;">*</span><!-- Delivery Challan/Inv No --></label>
<?php
$data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' ); // ,'onkeypress'=>'return isNumberKey(event);' );
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Invoice Date <!-- Delivery Challan/Inv Date --></label>
<?php
$data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' );
echo form_input($data);
?>
<div class="col-md-4">
<label>Invoice Date <span style="color:red; font-size: 15px;">*</span><!-- Delivery Challan/Inv Date --></label>
<?php
$data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-12">
<div class="col-md-3">
<label>Material Received Date</label>
<?php
<div class="col-md-4">
<label>Material Received Date <span style="color:red; font-size: 15px;">*</span></label>
<?php
$data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control num', 'required'=>'true' );
echo form_input($data);
?>
?>
</div>
<div class="col-md-3">
<label>Vechicle Number</label>
<?php
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', 'maxlength' => '20' );
echo form_input($data);
</div>
<div class="col-md-12" style="margin: 10px 0;">
<div class="col-md-4">
<label>Vechicle Number</label>
<?php
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', 'maxlength' => '20' );
echo form_input($data);
?>
<!-- <span pattern="" required="true"></span> -->
</div>
<div class="col-md-3">
<label>Driver Name</label>
<?php
$data = array('name' => 'DriverName','value' => set_value('DriverName'), 'id'=>'DriverName', 'class' => 'form-control', 'maxlength' => '50' );
echo form_input($data);
<div class="col-md-4">
<label>Driver Name</label>
<?php
$data = array('name' => 'DriverName','value' => set_value('DriverName'), 'id'=>'DriverName', 'class' => 'form-control', 'maxlength' => '50' );
echo form_input($data);
?>
</div>
<div class="col-md-3">
<label>Driver Mobile Number</label>
<?php
<div class="col-md-4">
<label>Driver Mobile Number</label>
<?php
$data = array('name' => 'DriverMobileNumber','value' => set_value('DriverMobileNumber'), 'id'=>'DriverMobileNumber', 'class' => 'form-control', 'maxlength' => '50' );
echo form_input($data);
echo form_input($data);
?>
</div>
<!-- <div class="col-md-3">
@ -175,17 +167,13 @@
?>
</div> -->
</div>
<!-- <div class="col-md-12">
<div class="col-md-offset-4">
<!-- <div class="col-md-12">
<div class="col-md-offset-4">
<div class="box-header">
<input type="file" accept=".png,.jpg,.pdf" id="myfile" name="myfile" />
<input type="file" accept=".png,.jpg,.pdf" id="myfile" name="myfile" />
<label for="photo">Select File to upload<br/></label>
</div>
</div>
</div>
</div>
</div> -->
@ -519,8 +507,8 @@ function validate()
$("#Sup").val(obj.SupplierName);
$("#hiddenIsOpenOrder").val(obj.IsOpenOrder);
var isOpenOrder = parseInt(obj.IsOpenOrder, 2);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Ordered Quantity PO" : "Open Order PO";
$('#formatted_IsOpenOrder').text(formatted_IsOpenOrder);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open";
$('.help-block').text(formatted_IsOpenOrder);
//$("#Add").val(obj.Address);
$("#del").val(obj.DeliveryDate);
@ -537,7 +525,7 @@ function validate()
$.ajax({
data:{id:id},
type:"POST",
url:"<?php echo base_url() ?>inwardgateregister/IGRITEM",
url:"<?php echo base_url() ?>GetIGRLineItemDetails",
success:function(data) {
@ -568,7 +556,7 @@ function validate()
'<td data-name="sel" ><input type="text" onchange="validateReceivedQuantity('+i+')"id="QuantityAsPerInvoice'+ i +'" name="QuantityAsPerInvoice'+ i +'" value="" onkeypress="return isNumberKey(event);"></td>' +
'<td><input type="text" id="Remark'+ i +'" name="Remark'+ i +'" class="form" onchange="SetRemarks('+i+')"> </td>' +
'<td><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="'+i+'" data-material="'+item.MaterialName+'"><i class="fa fa-solid fa-calculator" style="text-align: center;"></i></a> </td>' +
'<td><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="'+i+'" data-material="'+item.MaterialName+'"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +

7
app/Views/requisitionform.php
View File

@ -182,6 +182,9 @@ if (!empty($Emp)) {
<table class="table table-bordered" style="border:1px solid #333">
<div align="right" style="padding-right:10px">
<div align="right">
<!-- <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT
</div> -->
<a onclick="return validateBeforeAdd();" class="btn btn-success">Add Line Item</a>
<div class="modal fade" id="myModal1" role="dialog">
<div class="modal-dialog">
@ -576,6 +579,10 @@ if (!empty($Emp)) {
</script>
<script>
function validateBeforeAdd() {
// var isChecked = $('#IsOpenOrder').is(':checked');
// isChecked ? $('#Quantity').val(0).prop('readonly', true).prop('required', false)
// : $('#Quantity').val('').prop('readonly', false).prop('required', true);
if ($("option:selected", $("#RequestType")).val() == '-1') {
alert('Please select the Request Type ');
$("#RequestType").focus();

1309
app/Views/viewinwardgateregister.php
View File

File diff suppressed because it is too large Load Diff

4
public/assets/css/bootstrap.css vendored
View File

@ -915,12 +915,12 @@ textarea {
line-height: inherit;
}
a {
color: #428bca;
color: #5cb85c;
text-decoration: none;
}
a:hover,
a:focus {
color: #2a6496;
color: #962a2a;
text-decoration: underline;
}
a:focus {

2
public/assets/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long