diff --git a/app/Controllers/Driver.php b/app/Controllers/Driver.php index bdfedb2a..7ba0e211 100755 --- a/app/Controllers/Driver.php +++ b/app/Controllers/Driver.php @@ -207,43 +207,23 @@ class Driver extends BaseController $load = $this->request->getPost('load_type'); $sal = $this->request->getPost('salary_amount'); $food = $this->request->getPost('food_amount'); - - - + $diesel = $this->request->getPost('diesel_amount'); + $shed = $this->request->getPost('shed_amount'); $data = ['status' => false, 'message' => 'An error occurred while creating driver Trip details']; - + $driver_details = ['date' => $date,'driver_id' =>$driver_id,'invoice_number' =>$inv,'vehicle_number' =>$veh,'load_type' =>$load,'salary_amount' => $sal,'food_amount' =>$food,'diesel_amount'=> $diesel,'shed_amount' => $shed]; + if ((int)$id == 0) { log_message('error', 'LAST DriverID : ' . $id); - $driver_details = [ - 'date' => $date, - 'driver_id' =>$driver_id, - 'invoice_number' =>$inv, - 'vehicle_number' =>$veh, - 'load_type' =>$load, - 'salary_amount' => $sal, - 'food_amount' =>$food, - 'created_by' => $userId, - ]; + $driver_details['created_by'] = $userId; $this->driver_model->useDriverAttendanceTable()->insert($driver_details); $insertedId = $this->driver_model->insertID(); if ($insertedId > 0) { $data = ['status' => true, 'message' => 'Driver trip details created successfully.']; } } else { - $driver_details = [ - - 'driver_attendance_id' => $id, - 'date' => $date, - 'driver_id' =>$driver_id, - 'invoice_number' =>$inv, - 'vehicle_number' =>$veh, - 'load_type' =>$load, - 'salary_amount' => $sal, - 'food_amount' =>$food, - 'updated_by' => $userId, - ]; + $driver_details['driver_attendance_id'] = $id; + $driver_details['updated_by'] = $userId; $this->driver_model->useDriverAttendanceTable()->update($id, $driver_details); - if ($this->driver_model->affectedRows() > 0) { $data = ['status' => true, 'message' => 'Driver trip details updated successfully.']; } diff --git a/app/Views/driverAttendance.php b/app/Views/driverAttendance.php index 0ad9393a..46ef4d79 100755 --- a/app/Views/driverAttendance.php +++ b/app/Views/driverAttendance.php @@ -448,9 +448,9 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); load_type: $('#load_type').val(), salary_amount: $('#salary_amount').val(), food_amount: $('#food_amount').val(), + diesel_amount: "", + shed_amount: "" }; - - console.log(formData); $('#loader').show(); $.ajax({ @@ -555,16 +555,16 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); let gobal_driver_id = urlParams.get("gobal_driver_id"); let gobal_date = ''; - - if(gobal_date == ""){ - let inputDate = urlParams.get("month_year"); + let param_month_year = urlParams.get("month_year"); + let param_date = urlParams.get("date"); + + if(param_date == ""){ let monthMap = {"Jan": "01", "Feb": "02", "Mar": "03", "Apr": "04","May": "05", "Jun": "06", "Jul": "07", "Aug": "08","Sep": "09", "Oct": "10", "Nov": "11", "Dec": "12"}; - - let [month, year] = inputDate.split('-'); + let [month, year] = param_month_year.split('-'); gobal_date = `01-${monthMap[month]}-${year}`; }else{ - gobal_date = urlParams.get("date"); + gobal_date = param_date; } // Send data to the server using AJAX