From cec0b4fa6cc726aa818fbefe0f5ce3611dfd95a3 Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 7 May 2024 09:00:47 +0530 Subject: [PATCH] CHANGE_jobcard_invoice_ccomplaint_addition:ss --- app/Config/Routes.php | 2 +- app/Controllers/Jobcard.php | 3 ++- app/Controllers/Model.php | 30 ++++++++++++---------- app/Models/JobcardModel.php | 9 +++++++ app/Views/invoice_pdf_template_jobcard.php | 4 +-- app/Views/job_card_form.php | 1 + 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index a9156e3..87df898 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -140,7 +140,7 @@ $routes->get('dashboard', 'Users::dashboard'); // Model // $routes->get('bike_model_index/(:any)', 'Model::index/$1'); - $routes->post('create_model/(:any)', 'Model::create_model/$1'); + $routes->post('create_model', 'Model::create_model'); $routes->post('status_model', 'Model::status_model'); // Model End's// diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php index 652bc70..e5c7f96 100644 --- a/app/Controllers/Jobcard.php +++ b/app/Controllers/Jobcard.php @@ -76,7 +76,8 @@ class Jobcard extends BaseController $servicedata = $this->JobcardModel->get_jobcard_service($job_card_id); $complaintdata = $this->JobcardModel->get_jobcard_complaint($job_card_id); - $labourcost = array_merge($servicedata, $complaintdata); + $customcomplaintdata = $this->JobcardModel->get_jobcard_custom_complaint($job_card_id); + $labourcost = array_merge($servicedata, $complaintdata,$customcomplaintdata); /** CALCULATE LABOURCOST WITH TAX */ $totalAmount = 0; $totalTax = 0; diff --git a/app/Controllers/Model.php b/app/Controllers/Model.php index 61b0bf2..925c18b 100644 --- a/app/Controllers/Model.php +++ b/app/Controllers/Model.php @@ -13,7 +13,8 @@ class Model extends BaseController public $session; use ResponseTrait; - + public $BikemodelsModel; + public $BikemakeModel; public function __construct() { @@ -41,7 +42,7 @@ class Model extends BaseController } - public function create_model($model_id) + public function create_model() { try { $make_id = $this->request->getPost('make_id'); @@ -53,7 +54,7 @@ class Model extends BaseController 'model_name' => $model_name ]; - if (!$model_id) { + // if (!$model_id) { try { $inserted = $BikemodelsModel->insert($data); @@ -63,23 +64,24 @@ class Model extends BaseController } if ($inserted) { $result = $data; - $model_list = $BikemodelsModel->where('make_id',$make_id)->orderBy('make','asc')->findAll(); + $model_list = $BikemodelsModel->where('make_id',$make_id)->orderBy('make_id','asc')->findAll(); return $this->respond(['status' => 'success','code' => 200,'data' => $result,'model_list'=>$model_list],200); } else { $result = "No Match's"; return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); } - }else{ - $updated = $BikemodelsModel->update($model_id ,$data); - if ($updated) { - $result = $data; - return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); - } else { - $result = "No Match's"; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); - } - } + // } + // else{ + // $updated = $BikemodelsModel->update($model_id ,$data); + // if ($updated) { + // $result = $data; + // return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + // } else { + // $result = "No Match's"; + // return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + // } + // } } catch (\Exception $exception) { return $this->respond(['status' => 'failed','code' => 500,'data' => $exception],500); diff --git a/app/Models/JobcardModel.php b/app/Models/JobcardModel.php index ebc91b0..59f3cc1 100644 --- a/app/Models/JobcardModel.php +++ b/app/Models/JobcardModel.php @@ -98,6 +98,15 @@ class JobcardModel extends Model return $this->findAll(); } + public function get_jobcard_custom_complaint($job_id) + { + $this->select('job_card.*, job_card_custom_complaint.*, job_card_custom_complaint.name as product_name, job_card_custom_complaint.labour_cost as labour_amount'); + $this->join('job_card_custom_complaint', 'job_card_custom_complaint.job_card_id = job_card.job_card_id'); + $this->where('job_card.isactive', 1); + $this->where('job_card.job_card_id', $job_id); + return $this->findAll(); + } + public function get_jobcard_labourcost($job_id) { $this->select('job_card.*, job_card_service.job_card_id, job_card_service.service_id, job_card_complaint.job_card_id, job_card_complaint.complaint_id, services.labour_cost, complaints.labour_charge,services.tax ,complaints.tax, services.labour_cost, complaints.labour_charge'); diff --git a/app/Views/invoice_pdf_template_jobcard.php b/app/Views/invoice_pdf_template_jobcard.php index ba84884..52cd97f 100644 --- a/app/Views/invoice_pdf_template_jobcard.php +++ b/app/Views/invoice_pdf_template_jobcard.php @@ -241,9 +241,9 @@ p { - + - nos + % diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php index 6cd7111..a0daa28 100644 --- a/app/Views/job_card_form.php +++ b/app/Views/job_card_form.php @@ -739,6 +739,7 @@ $(document).ready(async function() { data_contruction_for_save(); $("#delete_items").val(JSON.stringify(delete_items_id)); $('#form-submit').submit(); + $('#submit-btn').prop('disabled', true); } }); });