From 87f7734a0c486f511299dc103b7bdc5269957d0d Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 3 Mar 2025 11:47:46 +0000 Subject: [PATCH] fixes : ps --- app/Controllers/Assetdetails.php | 3 ++- app/Controllers/CostCenter.php | 14 +++++++++----- app/Models/Costcenter_model.php | 6 ++++-- app/Views/addRawMaterial.php | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index d1b2977a..8d512fcb 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -235,11 +235,12 @@ class Assetdetails extends BaseController $DateOfCommission = $this->request->getPost('DateOfCommission'); $CreatedBy = $this->session->get('userId'); $DateOfPurchase = $this->request->getPost('DateOfPurchase'); + $DOpurchase = ""; if ($DateOfPurchase != '') { $DOpurchase = get_date_time_format($DateOfPurchase); } $AssetValue = $this->request->getPost('Assetvalue'); - + $DOCommission = ""; if ($DateOfCommission != '') { $DOCommission = get_date_time_format($DateOfCommission); //$DOCommission= get_date_time_format($DateOfCommission); diff --git a/app/Controllers/CostCenter.php b/app/Controllers/CostCenter.php index d23a4a2d..478b0bfa 100755 --- a/app/Controllers/CostCenter.php +++ b/app/Controllers/CostCenter.php @@ -102,11 +102,13 @@ class CostCenter extends BaseController if(!empty($CostCenterCode)){ $updatedBy = $this->session->get('userId'); $message = $this->costcenter_model->reActivateCostCenter($CostCenterCode, $updatedBy); + return redirect()->route('costListing'); }else{ - $message = "Cost Center Code Not Avalable"; + // $message = "Cost Center Code Not Avalable"; + return redirect()->route('costListing'); } - $this->session->setFlashdata('success', $message); - return redirect()->route('costListing'); + // $this->session->setFlashdata('success', $message); + // return redirect()->route('costListing'); } @@ -121,11 +123,13 @@ class CostCenter extends BaseController if(!empty($CostCenterID)){ $updatedBy = $this->session->get('userId'); $message = $this->costcenter_model->deleteCostCenter($CostCenterID, $updatedBy); + return redirect()->route('costListing'); }else{ $message = "Cost Center Code Not Avalable"; + return redirect()->route('costListing'); } - $this->session->setFlashdata('success', $message); - return redirect()->route('costListing'); + // $this->session->setFlashdata('success', $message); + // return redirect()->route('costListing'); } diff --git a/app/Models/Costcenter_model.php b/app/Models/Costcenter_model.php index 01c6d783..ad1290a1 100755 --- a/app/Models/Costcenter_model.php +++ b/app/Models/Costcenter_model.php @@ -399,7 +399,8 @@ where Dept.DEPCode not in } } - return "Cost center $CostCenterCode Reactivated successfully."; + // return "Cost center $CostCenterCode Reactivated successfully."; + return true; } function deleteCostCenter($CostCenterCode,$UpdatedBy) @@ -426,7 +427,8 @@ where Dept.DEPCode not in } } - return "Cost center $CostCenterCode deactivated successfully."; + // return "Cost center $CostCenterCode deactivated successfully."; + return true; } function checkCostCenter($CostCenterId,$CostCenterName){ diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index f4707fda..d7d682fc 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -124,6 +124,7 @@
format('d-m-Y'); $data = array('name' => 'Date', 'value' => set_value('Date', $formattedDate), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;', 'autocomplete'=>'"off"'); echo form_input($data);