From f73a49bb4b6a1bdf27958252c9eb273170d2681e Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 25 Dec 2024 19:46:18 +0530 Subject: [PATCH] stock module-2 vadivel J 25-12-2024 --- app/Controllers/Assetdetails.php | 3 +++ app/Controllers/CostCenter.php | 2 ++ app/Controllers/Supplier.php | 1 + app/Models/Assetdetails_model.php | 2 +- app/Models/Costcenter_model.php | 6 +++--- app/Views/addRawMaterial.php | 2 +- app/Views/addSupplier.php | 2 +- app/Views/addasset.php | 2 +- app/Views/addconfig.php | 2 +- app/Views/costListing.php | 2 +- app/Views/editOldasset.php | 2 +- app/Views/editRawmaterial.php | 2 +- app/Views/editSupplier.php | 2 +- app/Views/editconfig.php | 2 +- app/Views/transporterListing.php | 2 +- 15 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index ddd3a208..d1b2977a 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -346,9 +346,12 @@ class Assetdetails extends BaseController function checkAssetName(){ $data = $this->request->getPost(); + $assetId = $data['assetId']??''; $assetName = str_replace(" ","",$data['assetName']) ; + $result = $this->assetdetails_model->checkAssetName($assetId,$assetName); + return $this->response->setJSON($result); } diff --git a/app/Controllers/CostCenter.php b/app/Controllers/CostCenter.php index c5825f51..d23a4a2d 100755 --- a/app/Controllers/CostCenter.php +++ b/app/Controllers/CostCenter.php @@ -140,6 +140,8 @@ class CostCenter extends BaseController $CostCenterId = $data['CostCenterId']; $CostCenterName = $data['CostCenterName']; + $CostCenterName = str_replace(' ', '', $CostCenterName); + $result = $this->costcenter_model->checkCostCenter( $CostCenterId,$CostCenterName); return $this->response->setJSON($result); diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index 2e0a5441..2dc8337f 100755 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -478,6 +478,7 @@ class Supplier extends BaseController $data = $this->request->getPost(); $transporterId = $data['transporterid']??''; $transporterName = $data['transportername']; + $transporterName = str_replace(' ', '', $transporterName); $message = $this->supplier_model->checkTransporter($transporterId,$transporterName); return $this->response->setJSON($message); diff --git a/app/Models/Assetdetails_model.php b/app/Models/Assetdetails_model.php index 4cd4dee9..db2b81cf 100755 --- a/app/Models/Assetdetails_model.php +++ b/app/Models/Assetdetails_model.php @@ -278,7 +278,7 @@ class Assetdetails_model extends Model $builder = $builder->where('AssetCode !=', $assetId); } - $builder = $builder->where('REPLACE(AssetName , " ", "") ',$assetName); + $builder = $builder->where('REPLACE(AssetName, " ", "")',$assetName); $query = $builder->get(); diff --git a/app/Models/Costcenter_model.php b/app/Models/Costcenter_model.php index c23a0f47..01c6d783 100755 --- a/app/Models/Costcenter_model.php +++ b/app/Models/Costcenter_model.php @@ -429,18 +429,18 @@ where Dept.DEPCode not in return "Cost center $CostCenterCode deactivated successfully."; } - function checkCostCenter($CostCenterId,$CostCenterName){ + function checkCostCenter($CostCenterId,$CostCenterName){ $builder = $this->db->table('t_costcenter_master') ->select('CostCenterName,IsActive'); if(!empty($CostCenterId)){ $builder = $builder -> where('id !=' ,$CostCenterId); } - $builder = $builder->where('REPLACE(CostCenterName , " ", "") ',$CostCenterName); + $builder = $builder->where('REPLACE(CostCenterName," ", "")',$CostCenterName); $query = $builder->get(); return $query->getResult(); - + } diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index 89c0ed44..bce148fe 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -314,7 +314,7 @@ var count = data.length; if (count >= 1) { $('#loader').hide(); - if(data[0].IsActive == 1){ + if(data[0]?.IsActive == 1){ alert('Material name already existed ! '); }else{ alert('Material name already existing in the deleted section.!!'); diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index 077ebcf9..70d0f87d 100755 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -274,7 +274,7 @@ var count = data?data.length:0; if (count >= 1) { $('#loader').hide(); - if(data[0].IsActive == 1){ + if(data[0]?.IsActive == 1){ alert('supplier already existed ! '); }else{ alert('supplier already existing in the deleted section..!! '); diff --git a/app/Views/addasset.php b/app/Views/addasset.php index 5a6c2770..2736f2cf 100755 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -444,7 +444,7 @@ $.ajax({ data:{assetId,assetName}, success: function(data){ if(data && data.length>0){ - let IsActive = data[0].IsActive; + let IsActive = data[0]?.IsActive; if(IsActive == 1){ alert("Asset Name Exists..!!"); $('#AssetName').val(''); diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index b61ae06f..81a5f4e6 100755 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -399,7 +399,7 @@ success: function (data) { if(data && data.length > 0){ - if(data[0].isActive == 1){ + if(data[0]?.isActive == 1){ alert("This Configuration Name is already present. kindly change it..!!"); $('#configurationname').val(''); return; diff --git a/app/Views/costListing.php b/app/Views/costListing.php index d2864f13..cc7011d1 100755 --- a/app/Views/costListing.php +++ b/app/Views/costListing.php @@ -231,7 +231,7 @@ }, success: function (data) { $('#loader').hide(); - let isactive =data[0].IsActive; + let isactive =data[0]?.IsActive; if (data && data.length > 0) { diff --git a/app/Views/editOldasset.php b/app/Views/editOldasset.php index f0cc7847..d8cf9059 100755 --- a/app/Views/editOldasset.php +++ b/app/Views/editOldasset.php @@ -439,7 +439,7 @@ if (!empty($assetList)) { data:{assetId,assetName}, success: function(data){ if(data && data.length>0){ - let IsActive = data[0].IsActive; + let IsActive = data[0]?.IsActive; if(IsActive == 1){ alert("Asset Name Exists..!!"); $('#AssetName').val(''); diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index abf8f109..6c741993 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -462,7 +462,7 @@ if ($total <= $reorder) { if (count >= 1) { $('#loader').hide(); - if(data[0].IsActive == 1){ + if(data[0]?.IsActive == 1){ alert('Material name already existed ! '); }else{ alert('Material name already existing in the deleted section.!!'); diff --git a/app/Views/editSupplier.php b/app/Views/editSupplier.php index 9d71f04b..a1d76407 100755 --- a/app/Views/editSupplier.php +++ b/app/Views/editSupplier.php @@ -612,7 +612,7 @@ if (!empty($supplier)) { var count = data.length; if (count >= 1) { $('#loader').hide(); - if(data[0].IsActive == 1){ + if(data[0]?.IsActive == 1){ alert('supplier already existed ! '); }else{ alert('supplier already existing in the deleted section..!! '); diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php index b68609fe..7506a322 100755 --- a/app/Views/editconfig.php +++ b/app/Views/editconfig.php @@ -506,7 +506,7 @@ if (!empty($master)) { if (data && data.length > 0) { - if (data[0].isActive == 1) { + if (data[0]?.isActive == 1) { alert("This Configuration Name is already present. kindly change it..!!"); $('#ConfigName').val(''); return; diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index ec1bf08b..f78f3161 100755 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -275,7 +275,7 @@ success: function (data) { if (data && data.length > 0) { - let isactive = data[0].isactive; + let isactive = data[0]?.isactive; if (isactive == 1 ) { alert(" Transporter with this Name Exists..!!"); } else { alert(" Transporter with this Name Existing in deleted section ..!!"); }