From 4ded903ae355702a6ceba1e98243bd5e33b0f1c7 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 28 Jun 2024 07:16:20 +0000 Subject: [PATCH] FIIX_Documents added : ps --- app/Controllers/Supplier.php | 72 +++++++++- app/Models/Supplier_model.php | 4 +- app/Views/addSupplier.php | 95 ++++++------- app/Views/editSupplier.php | 125 ++++++++++++------ .../DB/venbaehn_ria_demo_2024_06-21.sql | 42 +++--- 5 files changed, 226 insertions(+), 112 deletions(-) diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index 6de2b5ee..ba022a41 100644 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -200,7 +200,7 @@ class Supplier extends BaseController $EmailAddress = $this->request->getPost('emailid'); $PAN = (is_string($PAN)) ? strtoupper($PAN) : null ; $GSTNo = (is_string($GSTNo)) ? strtoupper($GSTNo) : null ; - $MSMENo = $this->request->getPost('MSMENo'); + $MSMENo = $this->request->getPost('MSME'); $accno = $this->request->getPost('accno'); $ifsc = $this->request->getPost('ifsc'); $branchname = $this->request->getPost('branchname'); @@ -214,6 +214,40 @@ class Supplier extends BaseController $supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PAN' => $PAN, 'GSTNo' => $GSTNo, 'PaymentID' => $PaymentId, 'Cert_MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'Createdby' => $Createdby, 'IsService' => $service, 'IsMaintanance' => $maintenance, 'IsRawMaterial' => $rawmaterial); //,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT); + $file1 = $this->request->getFile('Cert_MSME'); + $file2 = $this->request->getFile('Cert_GST'); + $file3 = $this->request->getFile('Cert_BANK'); + $path = ROOTPATH.'public/uploads/images/'; + + if ($file2 && $file2->isValid() && !$file2->hasMoved()) { + if(!is_dir($path)) { mkdir($path, 0777, true); } + $GST_DOC = $file2->getName(); + $file2->move($path,$GST_DOC); + $supplier['Cert_GST'] = $GST_DOC; + } + else{ + $supplier['Cert_GST'] = NULL; + } + + if ($file1 && $file1->isValid() && !$file1->hasMoved()) { + if(!is_dir($path)) { mkdir($path, 0777, true); } + $MSME_DOC = $file1->getName(); + $file1->move($path,$MSME_DOC); + $supplier['Cert_MSME'] = $MSME_DOC; + } + else{ + $supplier['Cert_MSME'] = NULL; + } + + if ($file3 && $file3->isValid() && !$file3->hasMoved()) { + if(!is_dir($path)) { mkdir($path, 0777, true); } + $BANK_DOC = $file3->getName(); + $file3->move($path,$BANK_DOC); + $supplier['Cert_BANK'] = $BANK_DOC; + } + else{ + $supplier['Cert_BANK'] = NULL; + } $result = $this->supplier_model->addNewsupplier($supplier); if ($result > 0) { @@ -262,8 +296,42 @@ class Supplier extends BaseController $PaymentId = $this->request->getPost('paymentid'); $supplier = array(); - $supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PaymentID' => $PaymentId, 'Cert_MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'UpdatedBy' => $UpdatedBy, 'IsActive' => $IsActive, 'IsService' => $service, 'IsMaintanance' => $maintanance, 'IsRawMaterial' => $rawmaterial); //'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment); + $supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PaymentID' => $PaymentId, 'MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'UpdatedBy' => $UpdatedBy, 'IsActive' => $IsActive, 'IsService' => $service, 'IsMaintanance' => $maintanance, 'IsRawMaterial' => $rawmaterial); //'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment); //SupplierID, SupplierName, Address, ContactNumber, AlternateContactNumber, EmailAddress, Exiseregistration, TIN, PAN, CSTNO, CSTDate, GSTNO, GSTRange, CollectrateAddress, UANumber, PaymentTerms, PaymentDays, PayableAT, Cert_EMS, Cert_TS, Cert_IMS, Cert_ISO, Cert_OSHAS, BankAcNumber, IFSCCode, BranchName, BankAddress, Createdby, UpdatedBy, Updatedon, CreatedOn, IsActive); + $file1 = $this->request->getFile('Cert_MSME'); + $file2 = $this->request->getFile('Cert_GST'); + $file3 = $this->request->getFile('Cert_BANK'); + $path = ROOTPATH.'public/uploads/images/'; + + if ($file2 && $file2->isValid() && !$file2->hasMoved()) { + if(!is_dir($path)) { mkdir($path, 0777, true); } + $GST_DOC = $file2->getName(); + $file2->move($path,$GST_DOC); + $supplier['Cert_GST'] = $GST_DOC; + } + else{ + $supplier['Cert_GST'] = $this->request->getPost('hidden_Cert_GST') ? $this->request->getPost('hidden_Cert_GST') : NULL; + } + + if ($file1 && $file1->isValid() && !$file1->hasMoved()) { + if(!is_dir($path)) { mkdir($path, 0777, true); } + $MSME_DOC = $file1->getName(); + $file1->move($path,$MSME_DOC); + $supplier['Cert_MSME'] = $MSME_DOC; + } + else{ + $supplier['Cert_MSME'] = $this->request->getPost('hidden_Cert_MSME') ? $this->request->getPost('hidden_Cert_MSME') : NULL; + } + + if ($file3 && $file3->isValid() && !$file3->hasMoved()) { + if(!is_dir($path)) { mkdir($path, 0777, true); } + $BANK_DOC = $file3->getName(); + $file3->move($path,$BANK_DOC); + $supplier['Cert_BANK'] = $BANK_DOC; + } + else{ + $supplier['Cert_BANK'] = $this->request->getPost('hidden_Cert_BANK') ? $this->request->getPost('hidden_Cert_BANK') : NULL; + } $result = $this->supplier_model->UpdateSupplier($supplier, $SupplierID); diff --git a/app/Models/Supplier_model.php b/app/Models/Supplier_model.php index 76434a03..e04d956c 100644 --- a/app/Models/Supplier_model.php +++ b/app/Models/Supplier_model.php @@ -127,7 +127,7 @@ class Supplier_model extends Model function getSupplierInfo($supplierID = '') { - //->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.Cert_EMS, SD.Cert_TS, SD.Cert_IMS, SD.Cert_ISO, SD.Cert_OSHAS, SD.BankAcNumber, SD.IsService, SD.IsMaintanance, SD.IsRawMaterial, SD.IFSCCode, SD.BranchName, SD.BankAddress, SD.IsActive, SD.PaymentID,PT.PaymentTerms'); + //->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') ->where('SD.SupplierID', $supplierID); @@ -172,7 +172,7 @@ class Supplier_model extends Model { $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.Cert_MSME, + 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') diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index 200f3182..82cf2049 100644 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -204,18 +204,15 @@