Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
VENKATESHWARAN 2025-09-06 15:43:39 +05:30
commit 0093ed8ab3
2 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/TicketController.php
View File

@ -713,7 +713,10 @@ class TicketController extends BaseController
$claim_status_id = 25; $claim_status_id = 25;
}else if($ticket_type == 4){ }else if($ticket_type == 4){
$claim_status_id = 35; $claim_status_id = 35;
}else{ }else if($ticket_type == 8){
$claim_status_id = 62;
}
else{
$claim_status_id = 1; $claim_status_id = 1;
} }
} }

114
app/Views/ticket_form_motor.php
View File

@ -89,8 +89,8 @@
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="label-font-size" for="vehicle">Vehicle <span class="text-danger">*</span></label> <label class="label-font-size" for="vehicle_id">Vehicle <span class="text-danger">*</span></label>
<select class="form-control" id="vehicle" name="vehicle" required> <select class="form-control" id="vehicle_id" name="vehicle_id" required>
<option value="0">Select Vehicle Number</option> <option value="0">Select Vehicle Number</option>
</select> </select>
</div> </div>
@ -109,10 +109,10 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="label-font-size" for="insurer_name">Insurer </label> <label class="label-font-size" for="insurer_name">Insurer </label>
<input type="hidden" id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>"> <input type="text" id="insurer_id" name="insurer_id" value="<?= isset($ticket_data['insurer_id']) ? $ticket_data['insurer_id'] : '' ?>">
<input type="hidden" id="agent_id" name="agent_id" value="<?= isset($ticket_data['agent_id']) ? $ticket_data['agent_id'] : '' ?>"> <input type="text" id="agent_id" name="agent_id" value="<?= isset($ticket_data['agent_id']) ? $ticket_data['agent_id'] : '' ?>">
<input type="hidden" id="manager_id" name="manager_id" value="<?= isset($ticket_data['manager_id']) ? $ticket_data['manager_id'] : '' ?>"> <input type="text" id="manager_id" name="manager_id" value="<?= isset($ticket_data['manager_id']) ? $ticket_data['manager_id'] : '' ?>">
<input type="hidden" id="policy_no" name="policy_no" value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>"> <input type="text" id="policy_no" name="policy_no" value="<?= isset($ticket_data['policy_no']) ? $ticket_data['policy_no'] : '' ?>">
<input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly> <input type=text class="form-control" id="insurer_name" placeholder="Insurer" value="<?= isset($ticket_data['insurer_name']) ? $ticket_data['insurer_name'] : '' ?>" readonly>
</div> </div>
@ -182,21 +182,15 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="label-font-size" for="claim_status">Status <span class="text-danger">*</span></label> <label class="label-font-size" for="claim_status">Status <span class="text-danger">*</span></label>
<select class="form-control" id="claim_status_id" name="claim_status_id" required> <select class="form-control" id="claim_status_id" name="claim_status_id" required>
<option value="1" <?= (isset($ticket_data) && $ticket_data['claim_status_id'] == 1 ? 'selected' : '') ?>>Open</option> <option value="0">Select status</option>
<option value="2" <?= (isset($ticket_data) && $ticket_data['claim_status_id'] == 2 ? 'selected' : '') ?>>Inprogress</option> <?php
<option value="3" <?= (isset($ticket_data) && $ticket_data['claim_status_id'] == 3 ? 'selected' : '') ?>>Rejected</option>
<option value="4" <?= (isset($ticket_data) && $ticket_data['claim_status_id'] == 4 ? 'selected' : '') ?>>Closed</option>
<!-- because - in ticket_claim_status table no ticket type 8 in to him-->
<!-- <option value="0">Select status</option> -->
<!-- <?php
if (isset($claim_status) && count($claim_status)) { if (isset($claim_status) && count($claim_status)) {
foreach ($claim_status as $key => $value) { foreach ($claim_status as $key => $value) {
$selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : ''; $selected = (isset($ticket_data) && $ticket_data['claim_status_id'] == $value['id']) ? 'selected' : '';
echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>"; echo "<option value=" . $value['id'] . " $selected>" . $value['claim_status'] . "</option>";
} }
} }
?> --> ?>
</select> </select>
</div> </div>
@ -354,7 +348,7 @@
</div> </div>
<!-- Info Modal --> <!-- Info Modal -->
<!-- <div class="modal fade" id="moreInfoModal" tabindex="-1" role="dialog" aria-labelledby="fullWidthModalLabel" aria-hidden="true"> <div class="modal fade" id="moreInfoModal" tabindex="-1" role="dialog" aria-labelledby="fullWidthModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl" role="document"> <div class="modal-dialog modal-xl" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -368,7 +362,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> --> </div>
<script> <script>
// let GlobelExtraFields = []; // let GlobelExtraFields = [];
@ -903,47 +897,47 @@
// // }); // // });
// // } // // }
// </script> // </script>
// <script> <script>
// $("#infoIcon").click(function() { $("#infoIcon").click(function() {
// var ticket_id = $('#ticket_master_id').val(); var ticket_id = $('#ticket_master_id').val();
// getDataForInfo(ticket_id, function(data) { getDataForInfo(ticket_id, function(data) {
// console.log("data: ", data); console.log("data: ", data);
// if (data && Object.keys(data).length) { if (data && Object.keys(data).length) {
// // openModal(); // openModal();
// var myModal = new bootstrap.Modal(document.getElementById('moreInfoModal')); var myModal = new bootstrap.Modal(document.getElementById('moreInfoModal'));
// myModal.show(); myModal.show();
// appendHtmlToModal(data); appendHtmlToModal(data);
// } else { } else {
// // toastr.warning("No Data Found"); // toastr.warning("No Data Found");
// } }
// }); });
// }); });
// function getDataForInfo(ticketId, callback) { function getDataForInfo(ticketId, callback) {
// $.ajax({ $.ajax({
// url: "<?= base_url('ticket/getMoreInfo') ?>", url: "<?= base_url('ticket/getMoreInfo') ?>",
// type: "POST", type: "POST",
// data: { data: {
// ticket_id: ticketId ticket_id: ticketId
// }, },
// success: function(response) { success: function(response) {
// if (response.status) { if (response.status) {
// console.log("Info Response: ", response); console.log("Info Response: ", response);
// callback(response.data); // pass data to the callback callback(response.data); // pass data to the callback
// } else { } else {
// toastr.warning("No Data Found"); toastr.warning("No Data Found");
// callback(null); callback(null);
// } }
// }, },
// error: function(xhr, status, error) { error: function(xhr, status, error) {
// console.error(xhr.responseText); console.error(xhr.responseText);
// console.error(status, error); console.error(status, error);
// callback(null); callback(null);
// } }
// }); });
// } }
// function appendHtmlToModal(data) { // function appendHtmlToModal(data) {
// var container = document.getElementById('dynamicDivFillInfo'); // var container = document.getElementById('dynamicDivFillInfo');
@ -1019,7 +1013,7 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$("#emp_client_policy").select2(); $("#emp_client_policy").select2();
$("#vehicle").select2(); $("#vehicle_id").select2();
$("#client_name").select2(); $("#client_name").select2();
<?php if (isset($ticket_data) && !empty($ticket_data)) : ?> <?php if (isset($ticket_data) && !empty($ticket_data)) : ?>
@ -1036,7 +1030,7 @@
}); });
// Fetch vehicles & policies with preselect // Fetch vehicles & policies with preselect
fetchVehiclePolicy(clientId, vehicleId, policyId); fetchVehiclePolicy(clientId, vehicleId, policyId, "edit");
// Readonly fields // Readonly fields
setReadonlyField("emp_mail", "<?= $ticket_data['emp_mail'] ?? '' ?>", 'Mail ID'); setReadonlyField("emp_mail", "<?= $ticket_data['emp_mail'] ?? '' ?>", 'Mail ID');
@ -1076,13 +1070,13 @@
} }
} }
function fetchVehiclePolicy(id, vehicleId = null, policyId = null) { function fetchVehiclePolicy(id, vehicleId = null, policyId = null, mode = "add") {
$.ajax({ $.ajax({
url: '<?php echo base_url('ticket/fetchVehiclePolicy/');?>' + id, url: '<?php echo base_url('ticket/fetchVehiclePolicy/');?>' + id,
method: "GET", method: "GET",
success: function (res) { success: function (res) {
// Vehicle dropdown // Vehicle dropdown
let $vehicleSelect = $('#vehicle'); let $vehicleSelect = $('#vehicle_id');
$vehicleSelect.empty().append('<option value="0">Select vehicle</option>'); $vehicleSelect.empty().append('<option value="0">Select vehicle</option>');
$.each(res.data.vehicle_list, function(index, item) { $.each(res.data.vehicle_list, function(index, item) {
let selected = (vehicleId && vehicleId == item.id) ? "selected" : ""; let selected = (vehicleId && vehicleId == item.id) ? "selected" : "";
@ -1103,10 +1097,12 @@
$policySelect.select2(); $policySelect.select2();
// Readonly contact fields // Readonly contact fields
if (mode === "add") {
setReadonlyField("emp_mail", res.data.email ?? "", 'Mail ID'); setReadonlyField("emp_mail", res.data.email ?? "", 'Mail ID');
$("#emp_mail").val(res.data.email ?? ""); $("#emp_mail").val(res.data.email ?? "");
setReadonlyField("emp_mobile", res.data.phone ?? "", 'Mobile No'); setReadonlyField("emp_mobile", res.data.phone ?? "", 'Mobile No');
$("#emp_mobile").val(res.data.phone ?? ""); $("#emp_mobile").val(res.data.phone ?? "");
}
}, },
error: function (xhr, status, error) { error: function (xhr, status, error) {
console.error("Error:", error, xhr.responseText); console.error("Error:", error, xhr.responseText);