From db91ef6d392519b3e3d060548fa51afdba9802cf Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Sat, 4 May 2024 09:16:03 +0530 Subject: [PATCH 1/2] CHANGE_CSS_ADD : AADHAVAN --- app/Config/Routes.php | 1 + app/Controllers/Make.php | 1 + app/Controllers/Vehicle.php | 13 +++ app/Views/bike_model_list.php | 2 +- app/Views/branch_list.php | 2 +- app/Views/business_list.php | 2 +- app/Views/client_list.php | 2 +- app/Views/complaint_list.php | 2 +- app/Views/invoice_pdf_template.php | 16 +-- app/Views/invoice_pdf_template_jobcard.php | 16 +-- app/Views/job_card_form.php | 118 +++++++++++++-------- app/Views/jobs_list.php | 2 +- app/Views/make_list.php | 22 ++-- app/Views/manufacturer_list.php | 8 +- app/Views/product_list.php | 10 +- app/Views/purchase_list.php | 2 +- app/Views/return_list.php | 2 +- app/Views/sales_list.php | 2 +- app/Views/sales_order_form.php | 79 +++++++++----- app/Views/service_list.php | 8 +- app/Views/user_list.php | 2 +- app/Views/user_list_super_admin.php | 4 +- app/Views/vehicle_form.php | 40 ++++++- app/Views/vehicle_list.php | 2 +- app/Views/vendor_list.php | 6 +- 25 files changed, 231 insertions(+), 133 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 310f51e..8e9bfe7 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -111,6 +111,7 @@ $routes->post("add_vehicle", "Vehicle::add_vehicle"); $routes->get("new_vehicle/(:any)", "Vehicle::new_vehicle/$1"); $routes->get("delete_vehicle/(:any)", "Vehicle::delete_vehicle/$1"); $routes->post("get_models_vehicle", "Vehicle::get_models"); +$routes->post("checkRegisterNo", "Vehicle::checkRegisterNo"); //end Vehicle diff --git a/app/Controllers/Make.php b/app/Controllers/Make.php index b5382aa..243ecf1 100644 --- a/app/Controllers/Make.php +++ b/app/Controllers/Make.php @@ -42,6 +42,7 @@ class Make extends BaseController ]; if (!$make_id) { try { + $data['business_id'] = $this->session->get('logged_user_business_id'); $inserted = $BikemakeModel->insert($data); } catch (\CodeIgniter\Database\Exceptions\DatabaseException $e) { diff --git a/app/Controllers/Vehicle.php b/app/Controllers/Vehicle.php index 8e3dc9f..db65a0a 100644 --- a/app/Controllers/Vehicle.php +++ b/app/Controllers/Vehicle.php @@ -152,5 +152,18 @@ class Vehicle extends BaseController return $this->response->setJSON($formatted_models); } + + public function checkRegisterNo(){ + + // if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } + $VehicleModel = new VehicleModel(); + + $reg_no = $this->request->getPost('register_number'); + + $register_find = $VehicleModel->where('reg_no',$reg_no)->first(); + + + return json_encode($register_find); + } } \ No newline at end of file diff --git a/app/Views/bike_model_list.php b/app/Views/bike_model_list.php index 03abaaa..a14b3fb 100644 --- a/app/Views/bike_model_list.php +++ b/app/Views/bike_model_list.php @@ -8,7 +8,7 @@
  1. - + Add Model
diff --git a/app/Views/branch_list.php b/app/Views/branch_list.php index e28b536..9d293e7 100644 --- a/app/Views/branch_list.php +++ b/app/Views/branch_list.php @@ -7,7 +7,7 @@
  1. - + Add Branch
    2. diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 0516b15..4526915 100644 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -6,7 +6,7 @@

    Clilent List

      -
    1. " class="btn btn-primary waves-effect"> +
    2. " class="btn btn-primary waves-effect"> Add Client
    diff --git a/app/Views/complaint_list.php b/app/Views/complaint_list.php index b4caab5..853569f 100644 --- a/app/Views/complaint_list.php +++ b/app/Views/complaint_list.php @@ -6,7 +6,7 @@

    Complaints List

      -
      2. +
    2. Add Complaint
    diff --git a/app/Views/invoice_pdf_template.php b/app/Views/invoice_pdf_template.php index 98bd871..5420f00 100644 --- a/app/Views/invoice_pdf_template.php +++ b/app/Views/invoice_pdf_template.php @@ -158,17 +158,17 @@ - product_name ?> - - qty ?> - - tax ?>% - + product_name ?> + + qty ?> + + tax ?>% + - + - amount ?> + amount ?> diff --git a/app/Views/invoice_pdf_template_jobcard.php b/app/Views/invoice_pdf_template_jobcard.php index 558fff3..f4d847e 100644 --- a/app/Views/invoice_pdf_template_jobcard.php +++ b/app/Views/invoice_pdf_template_jobcard.php @@ -240,15 +240,15 @@ p { - - - - nos - % - - + + + + nos + % + + - + diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php index 4e7bae7..00f67a2 100644 --- a/app/Views/job_card_form.php +++ b/app/Views/job_card_form.php @@ -29,7 +29,7 @@ ' ?> - > Select a vehicle' ?> @@ -204,7 +204,7 @@
-
+
@@ -648,11 +648,15 @@ $(document).ready(async function() { $(document).ready(function() { $('#submit-btn').click(function(event) { - // Prevent the default form submission - event.preventDefault(); - data_contruction_for_save(); - $("#delete_items").val(JSON.stringify(delete_items_id)); - $('#form-submit').submit(); + var isValid = $('#form-submit')[0].checkValidity(); + + + // event.preventDefault(); + if (isValid) { + data_contruction_for_save(); + $("#delete_items").val(JSON.stringify(delete_items_id)); + $('#form-submit').submit(); + } }); }); @@ -1243,45 +1247,69 @@ $(document).ready(async function() { var ifStatementCondition = "createclientName !== '' && createclientMobile !== '' && createclientType !== '' && reg_no !== '' && model !== '' && make !== ''"; } - console.log(ifStatementCondition); + + if (reg_no) { + $.ajax({ + url: '', // URL to your controller method for fetching models + type: 'POST', + dataType: 'json', + data: { register_number: reg_no }, + success: function(response) { + if (response) { + $('#reg_no').val(""); + toastr.warning("Register Number Already Added!"); + }else{ + if( eval(ifStatementCondition) ){ + + // Send AJAX request to save the client + $.ajax({ + url: '', // URL to your save_client method + method: 'POST', + data: { + client_id: clientName, + mobile_no: clientMobile, + reg_no:reg_no, + model:model, + make:make, + createclientName:createclientName, + createclientMobile:createclientMobile, + createclientType:createclientType, + formType:formType, + + }, + success: function(response) { + if (response.success) { + $('#addVehicleModal').modal('hide'); + toastr.success("Vehicle saved successfully!"); + window.location.reload(); + + } else { + toastr.warning("Failed to save vehicle. Please try again"); + } + }, + error: function(xhr, status, error) { + console.error('Error occurred while saving vehicle:', error); + toastr.warning("Failed to save vehicle. Please try again"); + } + }); + + }else{ + toastr.warning("Please Fill All Data"); + } + } + + }, + error: function(xhr, status, error) { + console.error(error); // Log any errors to the console + } + }); + + } + + + + - if( eval(ifStatementCondition) ){ - - // Send AJAX request to save the client - $.ajax({ - url: '', // URL to your save_client method - method: 'POST', - data: { - client_id: clientName, - mobile_no: clientMobile, - reg_no:reg_no, - model:model, - make:make, - createclientName:createclientName, - createclientMobile:createclientMobile, - createclientType:createclientType, - formType:formType, - - }, - success: function(response) { - if (response.success) { - $('#addVehicleModal').modal('hide'); - toastr.success("Vehicle saved successfully!"); - window.location.reload(); - - } else { - toastr.warning("Failed to save vehicle. Please try again"); - } - }, - error: function(xhr, status, error) { - console.error('Error occurred while saving vehicle:', error); - toastr.warning("Failed to save vehicle. Please try again"); - } - }); - - }else{ - toastr.warning("Please Fill All Data"); - } }); diff --git a/app/Views/jobs_list.php b/app/Views/jobs_list.php index f7b065f..75f7d46 100644 --- a/app/Views/jobs_list.php +++ b/app/Views/jobs_list.php @@ -16,7 +16,7 @@

Job Card List

    -
  1. " class="btn btn-primary waves-effect"> Add New +
  2. " class="btn btn-primary waves-effect"> Add Job Card
diff --git a/app/Views/make_list.php b/app/Views/make_list.php index df79eda..0ff4d76 100644 --- a/app/Views/make_list.php +++ b/app/Views/make_list.php @@ -9,7 +9,7 @@
  1. - + Add Make
@@ -217,14 +217,14 @@ row += ''; // Check the isactive status and set the icon color accordingly - row += ''; + row += ''; - row +=''; - row +=''; + row +=''; + row +=''; if (item.isactive == 1) { - row += ''; + row += ''; } else if (item.isactive == 0) { - row += ''; + row += ''; } row += ''; @@ -298,14 +298,14 @@ row += ''; // Check the isactive status and set the icon color accordingly - row += ''; + row += ''; - row +=''; - row +=''; + row +=''; + row +=''; if (item.isactive == 1) { - row += ''; + row += ''; } else if (item.isactive == 0) { - row += ''; + row += ''; } row += ''; diff --git a/app/Views/manufacturer_list.php b/app/Views/manufacturer_list.php index b594ed7..6bf2244 100644 --- a/app/Views/manufacturer_list.php +++ b/app/Views/manufacturer_list.php @@ -8,9 +8,7 @@
  1. - - - + Add Manufacturer
@@ -36,10 +34,10 @@ - +       " class="view-list-button" title="Model List" style="margin-left: 16px;"> - + diff --git a/app/Views/product_list.php b/app/Views/product_list.php index e681c3f..39d5324 100644 --- a/app/Views/product_list.php +++ b/app/Views/product_list.php @@ -7,7 +7,7 @@
    -
  1. " class="btn btn-primary waves-effect"> Add New +
  2. " class="btn btn-primary waves-effect"> Add Product
@@ -32,7 +32,7 @@ SKU Id Product Name - Manufacturer Name + Category Unit Price Qty in Stock @@ -48,7 +48,7 @@ - + @@ -58,9 +58,9 @@ " class="edit-button"> + class="ri-pencil-line" style="font-size:20px;">      " - class="delete-button"> + class="delete-button"> diff --git a/app/Views/purchase_list.php b/app/Views/purchase_list.php index 66f0dad..292a227 100644 --- a/app/Views/purchase_list.php +++ b/app/Views/purchase_list.php @@ -27,7 +27,7 @@

Purchase Order List

    -
  1. " class="btn btn-primary waves-effect"> Add New +
  2. " class="btn btn-primary waves-effect"> Add Purchase Order
diff --git a/app/Views/return_list.php b/app/Views/return_list.php index 3b6e683..6094a1a 100644 --- a/app/Views/return_list.php +++ b/app/Views/return_list.php @@ -27,7 +27,7 @@

Purchase Return List

    -
  1. " class="btn btn-primary waves-effect"> Add New +
  2. " class="btn btn-primary waves-effect"> Add Purchase Return
diff --git a/app/Views/sales_list.php b/app/Views/sales_list.php index d1a1d63..5a68dbc 100644 --- a/app/Views/sales_list.php +++ b/app/Views/sales_list.php @@ -28,7 +28,7 @@

Sales Order List

    -
  1. " class="btn btn-primary waves-effect"> Add New +
  2. " class="btn btn-primary waves-effect"> Add Sale Order
diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php index b2463fa..78f858a 100644 --- a/app/Views/sales_order_form.php +++ b/app/Views/sales_order_form.php @@ -30,7 +30,7 @@ ' ?> + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
- +
+ +
- - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
- -
- - - -
-
-
-
- + +
+
+ + + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Views/business_form.php b/app/Views/business_form.php index db5acbd..e3b29ab 100644 --- a/app/Views/business_form.php +++ b/app/Views/business_form.php @@ -1,24 +1,19 @@
-
-
-

-
-
    - - - -
-
+
+
+

+
+
    +
+
-
" method="post">
diff --git a/app/Views/business_list.php b/app/Views/business_list.php index cbdf085..6f7fa42 100644 --- a/app/Views/business_list.php +++ b/app/Views/business_list.php @@ -1,15 +1,13 @@
-
+

Business List

  1. " class="btn btn-primary waves-effect">Add Business -
    2. - +
@@ -20,12 +18,7 @@
- - - - - - @@ -76,10 +69,58 @@
-
-
- \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/Views/client_form.php b/app/Views/client_form.php index e962a9a..5d74b00 100644 --- a/app/Views/client_form.php +++ b/app/Views/client_form.php @@ -1,27 +1,22 @@
-
-
-

-
+
+
+

+
" class="btn btn-secondary waves-effect">Cancel -
    - - - -
-
+
    +
+
-
- +
" method="post"> -

Client Details :

+

Client Details :

@@ -78,9 +73,9 @@
- -
+ + \ No newline at end of file diff --git a/app/Views/complaint_list.php b/app/Views/complaint_list.php index 853569f..872b768 100644 --- a/app/Views/complaint_list.php +++ b/app/Views/complaint_list.php @@ -16,7 +16,7 @@
- +
@@ -86,6 +86,7 @@ + - \ No newline at end of file + + diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index 3355ad6..0106059 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -5,11 +5,6 @@

    - - - -
diff --git a/app/Views/edit_account_form.php b/app/Views/edit_account_form.php index 335426a..70b9ae3 100644 --- a/app/Views/edit_account_form.php +++ b/app/Views/edit_account_form.php @@ -10,165 +10,145 @@ - - - -
-
-
-
-

-

@

+
+
+
+

+

@

+
+
+
Name
+ + + + + + + + + + + + + - -
-
-
Full Name :
Mobile :
Email :
- - - - - - - - - - - - - - - -
Full Name :
Mobile :
Email :
-
+ +
- - - - - -
-
- -
-
-
-
-
- -
Personal Info
- -
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - - -
-
-
-
- -
-
-
- - -
- -
+
- -
-
-
-
-
- -
Change Password
- +
+
+
+
+
+
+
+
Personal Info
+
- -
- -
- - - -
-
+ +
-
- +
- -
- -
- - - -
-
+ +
-
- +
+
+
- -
- -
- - - -
-
+ + +
- -
- +
+
+ +
+ +
+ -
-
+
+ +
+
+
+
+
+ +
Change Password
+ +
+
+
+ +
+ +
+ + + +
+
+
+
+ +
+
+ +
+ +
+ + + +
+
+
+
+ +
+
+ +
+ +
+ + + +
+
+
+
+ +
+ +
+
+
+ +
+
+
- - - - - - - - - - - - + + diff --git a/app/Views/manufacturer_list.php b/app/Views/manufacturer_list.php index 6bf2244..b8069f2 100644 --- a/app/Views/manufacturer_list.php +++ b/app/Views/manufacturer_list.php @@ -68,8 +68,7 @@
- @@ -78,7 +77,7 @@
- +
@@ -96,7 +95,7 @@ - function submitMake(params) { + function submitManufacturer(params) { var formData = { manufacturername: $('#manufacturer_name').val(), quality: $('#quality').val() diff --git a/app/Views/product_form.php b/app/Views/product_form.php index 67230d0..e9bab74 100644 --- a/app/Views/product_form.php +++ b/app/Views/product_form.php @@ -53,6 +53,7 @@
+ ' ?> + +
+
+ + +
+ +
+ +
+ + +
+
+
+
+ +
@@ -21,39 +43,57 @@
- - - + - + + + + + + + + + - + + - - - + -
+ + + + + + + + + + + + + +
SKU Id Product NameManufacturer Name Category Unit Price Qty in Stock Rack No Actions
@@ -65,16 +105,13 @@ -
-
-
@@ -122,7 +159,27 @@ "language": { "search": "Search: " // Customize search label }, + // "ordering": false }); }); + + + + \ No newline at end of file diff --git a/app/Views/reorder_level_list.php b/app/Views/reorder_level_list.php index ae504a6..1153c41 100644 --- a/app/Views/reorder_level_list.php +++ b/app/Views/reorder_level_list.php @@ -22,7 +22,7 @@ - +
@@ -62,4 +62,53 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php index 78f858a..66657c0 100644 --- a/app/Views/sales_order_form.php +++ b/app/Views/sales_order_form.php @@ -67,7 +67,7 @@ () - @@ -88,6 +88,18 @@ + + + +
> +
+
@@ -950,9 +962,20 @@ $(document).on('click', '#selectClient', function() { } \ No newline at end of file diff --git a/app/Views/service_form.php b/app/Views/service_form.php index 0a84a0d..04d8ff2 100644 --- a/app/Views/service_form.php +++ b/app/Views/service_form.php @@ -61,8 +61,8 @@
- - + + - diff --git a/app/Views/service_list.php b/app/Views/service_list.php index 8ed3e61..59d1112 100644 --- a/app/Views/service_list.php +++ b/app/Views/service_list.php @@ -19,7 +19,7 @@
-
+
@@ -64,4 +64,53 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/Views/user_list.php b/app/Views/user_list.php index 736d81f..9c27518 100644 --- a/app/Views/user_list.php +++ b/app/Views/user_list.php @@ -27,7 +27,7 @@ -
Service Name
+
@@ -69,4 +69,52 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/app/Views/vehicle_list.php b/app/Views/vehicle_list.php index fab19e4..ff45730 100644 --- a/app/Views/vehicle_list.php +++ b/app/Views/vehicle_list.php @@ -17,7 +17,7 @@
-
#
@@ -58,4 +58,53 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/Views/vendor_list.php b/app/Views/vendor_list.php index 7a09e1c..14d77b2 100644 --- a/app/Views/vendor_list.php +++ b/app/Views/vendor_list.php @@ -27,7 +27,7 @@ -
+
@@ -65,6 +65,53 @@ - - - \ No newline at end of file + + + \ No newline at end of file
#