From e591e1b4a9119e71c74112ea2ffb9f493f7e0622 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 2 Jan 2025 13:13:19 +0000 Subject: [PATCH] FIX_Preview Modals --- app/Config/Routes.php | 1 + app/Controllers/Jobcard.php | 23 +++++++-- app/Views/job_card_form.php | 78 +++++++++++++++++++++++------ app/Views/jobs_list.php | 98 +++++++++++++++++++++++++++++++++++++ 4 files changed, 183 insertions(+), 17 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 6b1cd00..1af1be4 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -98,6 +98,7 @@ $routes->get("new_jobcard/(:any)", "Jobcard::new_jobcard/$1"); $routes->get("delete_jobcard/(:any)", "Jobcard::delete_jobcard/$1"); $routes->get("preview_jobcard_invoice/(:any)", "Jobcard::preview_jobcard_invoice/$1"); $routes->get("preview_jobcard/(:any)", "Jobcard::preview_jobcard/$1"); +$routes->get("download_jobcard_files/(:any)", "Jobcard::download_jobcard_files/$1"); // $routes->post("delete_sales_product", "Jobcard::delete_sales_product"); $routes->get("download_jobcard_invoice/(:any)", "Jobcard::download_jobcard_invoice/$1"); // $routes->post("save_vehicle", "Jobcard::save_vehicle"); diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php index 2fe5572..b2e120f 100755 --- a/app/Controllers/Jobcard.php +++ b/app/Controllers/Jobcard.php @@ -25,6 +25,7 @@ use Mpdf\Mpdf; use DateTime; use CodeIgniter\API\ResponseTrait; use App\Helpers\InvNoHelper; +use App\Helpers\ClientDetailsUpdate; class Jobcard extends BaseController { @@ -231,6 +232,19 @@ class Jobcard extends BaseController } } + public function download_jobcard_files($job_card_id) + { + try { + + $data = $this->JobcardFileModel->where(['job_card_id'=>$job_card_id,'isactive'=>1])->findAll(); + + return $this->respond(['status' => 'success','code' => 200,'data' => $data],200); + + } catch (\Exception $e) { + return $this->respond(['status' => 'failed','code' => 500,'data' => $e],500); + } + } + public function download_jobcard($job_card_id) { $data = $this->getJobCardData($job_card_id); @@ -643,8 +657,7 @@ class Jobcard extends BaseController public function add_jobs() { - - if($this->session->get('logged_user_role') == "Store Manager") { + if($this->session->get('logged_user_role') == "Store Manager") { $data['status'] = $this->request->getPost('status'); $job_card_id = $this->request->getPost('job_card_id'); $this->JobcardModel->update($job_card_id, $data); // issued status update @@ -685,7 +698,11 @@ class Jobcard extends BaseController 'total'=> $this->request->getPost('grand_total'), 'isactive' => 1 ]; - + $update_client_address = $this->request->getPost('update_client_address'); + if(isset($update_client_address) && $update_client_address == 'on') + { + ClientDetailsUpdate::updateClientAddress($this->request->getPost('vehicle_id'),$job_card_data); + } $status = $this->request->getPost('status'); // Insert or update sales order $job_card_id = $this->request->getPost('job_card_id'); diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php index 14f5d7f..25de47e 100755 --- a/app/Views/job_card_form.php +++ b/app/Views/job_card_form.php @@ -6,6 +6,19 @@ opacity: 0.5; cursor: not-allowed; } + hr{ + margin-top:0 !important; + } + .file-append-row{ + margin-bottom:-18px !important; + } + .file-append-row,.file-exist-row{ + /* margin-bottom:-18px !important; */ + margin-top:-35px !important; + } + + +