diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index bc7a75f..1529673 100755 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -425,18 +425,32 @@ class Sales extends BaseController public function save_vehicle(){ - if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } - - - + if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } + if($this->request->getPost('formType') == 'create') { - - $client['client_name'] = $this->request->getPost('createclientName'); $client['mobile_no'] = $this->request->getPost('createclientMobile'); $client['client_type'] = $this->request->getPost('createclientType'); $client['branch_id'] = $this->session->get('logged_user_branch_id'); + $client['isactive'] = 1; + $client['created_by'] = (int)$this->session->get('logged_user'); + $existingClient1 = $this->ClientModel->where('client_name', $client['client_name'])->first(); + if ($existingClient1) { + return $this->response->setJSON([ + 'success' => true, 'code' => 404,'field'=>'create-clientName', + 'message' => 'The client name is already registered. Please use a different Name.' + ]); + } + $existingClient2 = $this->ClientModel->where('mobile_no', $client['mobile_no'])->first(); + if ($existingClient2) { + return $this->response->setJSON([ + 'success' => true,'code' => 404,'field'=>'create-clientMobile', + 'message' => 'The mobile number is already registered. Please use a different number.' + ]); + } + + $client_id = $this->ClientModel->insert($client); @@ -451,7 +465,8 @@ class Sales extends BaseController 'branch_id'=> $this->session->get('logged_user_branch_id'), 'city'=>'Chennai', 'state'=>'Tamil Nadu', - 'isactive' => 1 + 'isactive' => 1, + 'created_by' => (int)$this->session->get('logged_user') ]; } @@ -468,25 +483,22 @@ class Sales extends BaseController 'branch_id'=> $this->session->get('logged_user_branch_id'), 'city'=>'Chennai', 'state'=>'Tamil Nadu', - 'isactive' => 1 + 'isactive' => 1, + 'created_by' => (int)$this->session->get('logged_user') ]; } - - - - + // Attempt to insert the client data $id = $this->VehicleModel->insert($data); if ($id) { $vehicleData = $this->VehicleModel->where('vehicle_id',$id)->first(); - // If insertion succeeds, return success response - return $this->response->setJSON(['success' => true, 'message' => 'Client saved successfully.','vehicleData'=>$vehicleData, 'vehicle_id' => $id]); + return $this->response->setJSON(['success' => true,'code' => 200, 'message' => 'Client saved successfully.','vehicleData'=>$vehicleData, 'vehicle_id' => $id]); } else { // If insertion fails, return error response - return $this->response->setJSON(['success' => false, 'message' => 'Failed to save client.']); + return $this->response->setJSON(['success' => false, 'code' => 404,'message' => 'Failed to save client.']); } } diff --git a/app/Controllers/Vendor.php b/app/Controllers/Vendor.php index 9744196..f882b4f 100755 --- a/app/Controllers/Vendor.php +++ b/app/Controllers/Vendor.php @@ -95,7 +95,7 @@ class Vendor extends BaseController 'address' => $this->request->getPost('address'), 'city' => $this->request->getPost('city'), 'state' => $this->request->getPost('state'), - 'postal_code' => $this->request->getPost('postalcode'), + 'postal_code' => $this->request->getPost('postalcode') != '' ? $this->request->getPost('postalcode') : NULL, 'country' => $this->request->getPost('country'), 'vendortype' => $this->request->getPost('vendortype'), 'category' => $this->request->getPost('category'), diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php index 0ce1660..b62b139 100755 --- a/app/Views/job_card_form.php +++ b/app/Views/job_card_form.php @@ -88,7 +88,7 @@
- ' ?> + ' ?>
- + @@ -68,7 +68,7 @@
- '; ?> + '; ?> @@ -380,7 +380,7 @@
- +
@@ -680,7 +680,8 @@ $(document).ready(function() { $('#saveMakeBtn').click(function() { var make = $('#makes').val(); var model = $('#models').val(); - + const button = $('#saveMakeBtn'); + button.prop('disabled', true).text('Processing...'); if (make != '' && model != '') { $.ajax({ url: '', @@ -698,15 +699,18 @@ $('#saveMakeBtn').click(function() { } else { // Handle failure here, e.g., show an error message toastr.error("Failed to save make and model"); + button.prop('disabled', false).text('Save Make'); } }, error: function(xhr, status, error) { console.error('Error occurred while saving make and model:', error); toastr.error("Failed to save make and model. Please try again"); + button.prop('disabled', false).text('Save Make'); } }); } else { toastr.warning("Please fill in both make and model fields"); + button.prop('disabled', false).text('Save Make'); } }); @@ -740,6 +744,8 @@ $('#saveMakeBtn').click(function() { $('#saveModelBtn').click(function() { var makeId = $('#makeSelect').val(); var model = $('#modelInput').val(); + const button = $('#saveModelBtn'); + button.prop('disabled', true).text('Processing...'); if (makeId != '' && model != '') { $.ajax({ url: '', @@ -759,15 +765,18 @@ $('#saveMakeBtn').click(function() { toastr.error("Failed to save model"); } $('#model').val(response.model_id); + button.prop('disabled', false).text('Save Model'); }, error: function(xhr, status, error) { console.error('Error occurred while saving model:', error); toastr.error("Failed to save model. Please try again"); + button.prop('disabled', false).text('Save Model'); } }); } else { toastr.warning("Please fill in both make and model fields"); + button.prop('disabled', false).text('Save Model'); } }); @@ -895,6 +904,9 @@ $('#saveMakeBtn').click(function() { if (!$('#manufacturer_name').val() || !$('#manufacturer_quality').val()) { return false; } + const button = $('#saveManufacturersBtn'); + button.prop('disabled', true).text('Processing...'); + $.ajax({ url: '', type: 'POST', @@ -922,10 +934,12 @@ $('#saveMakeBtn').click(function() { } } + button.prop('disabled', false).text('Save Manufacturer');//doubted }, error: function(xhr, status, error) { // Handle error response here console.error(xhr.responseText); + button.prop('disabled', false).text('Save Manufacturer'); } }); } diff --git a/app/Views/purchase_form.php b/app/Views/purchase_form.php index 6703d65..6ae3407 100755 --- a/app/Views/purchase_form.php +++ b/app/Views/purchase_form.php @@ -139,8 +139,8 @@ - - + + diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php index 9c5fec8..c7b0b9e 100755 --- a/app/Views/sales_order_form.php +++ b/app/Views/sales_order_form.php @@ -42,7 +42,7 @@
- ' ?> + ' ?> > Select a Make' ?> @@ -37,7 +37,7 @@
- ' ?> + ' ?>