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:
vadivelJ96 2025-10-17 12:49:16 +05:30
commit ecadc26b09
5 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/MasterController.php
View File

@ -2073,7 +2073,7 @@ class MasterController extends AdminController
} }
} }
$data = $nhanceBranchModel->where('is_active', 1)->findAll(); $data = $nhanceBranchModel->where('is_active', 1)->orderBy('id', 'DESC')->findAll();
return $this->loadLayout('nhance_branch_list', ['data' => $data]); return $this->loadLayout('nhance_branch_list', ['data' => $data]);
} elseif ($method === 'delete') { } elseif ($method === 'delete') {
@ -2156,7 +2156,7 @@ class MasterController extends AdminController
} }
} }
$data = $vehicleTypeModel->where('is_active', 1)->findAll(); $data = $vehicleTypeModel->where('is_active', 1)->orderBy('id', 'DESC')->findAll();
return $this->loadLayout('vehicle_type_master_list', ['data' => $data]); return $this->loadLayout('vehicle_type_master_list', ['data' => $data]);
} elseif ($method === 'delete') { } elseif ($method === 'delete') {
@ -2239,7 +2239,7 @@ class MasterController extends AdminController
} }
} }
$data = $rtoModel->where('is_active', 1)->findAll(); $data = $rtoModel->where('is_active', 1)->orderBy('id', 'DESC')->findAll();
return $this->loadLayout('rto_master_list', ['data' => $data]); return $this->loadLayout('rto_master_list', ['data' => $data]);
} elseif ($method === 'delete') { } elseif ($method === 'delete') {

5
app/Views/nhance_branch_list.php
View File

@ -19,10 +19,10 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if(isset($data)) { ?> <?php if(isset($data)) { $slno = 1; ?>
<?php foreach($data as $index => $row) { ?> <?php foreach($data as $index => $row) { ?>
<tr> <tr>
<td class="text-dark">&nbsp;&nbsp;<?= esc($index + 1); ?></td> <td class="text-center"><?= $slno++; ?></td>
<td><?= $row['branch_name']; ?></td> <td><?= $row['branch_name']; ?></td>
<!-- <td> <!-- <td>
<span class="<?php if($row['is_active'] == 1){ echo 'badge badge-primary'; }else{ echo 'badge badge-danger'; } ?>"> <span class="<?php if($row['is_active'] == 1){ echo 'badge badge-primary'; }else{ echo 'badge badge-danger'; } ?>">
@ -254,6 +254,7 @@
} else if(type == 'remove'){ } else if(type == 'remove'){
toastr.success(response.message, 'Success'); toastr.success(response.message, 'Success');
if(el) $(el).closest('tr').remove(); if(el) $(el).closest('tr').remove();
window.location.reload();
} else if(type == 'submit'){ } else if(type == 'submit'){
toastr.success(response.message, 'Success'); toastr.success(response.message, 'Success');
var myModal = new bootstrap.Modal(document.getElementById('con-close-modal')); var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));

40
app/Views/policy_transaction_inception_form.php
View File

@ -1505,7 +1505,7 @@
$('#client_row_div').empty(); $('#client_row_div').empty();
$('#actcual_clients').show(); $('#actcual_clients').show();
let status = $('#policy_status').val(); let status = $('#policy_status').val(); // REF : Venkatesh R - Status html Remove. Doubt here ask him - Q: why we need this? remove pannava ?.
console.log(client_id); console.log(client_id);
@ -1555,9 +1555,9 @@
}else{ }else{
$('#pre_sales_row').show(); $('#pre_sales_row').show();
$('#submitButton').show(); $('#submitButton').show();
if(status == "completed"){ // if(status == "completed"){
$('#sales_row').show(); $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if'.
} // }
} }
}) })
@ -1660,9 +1660,9 @@
let status = $('#policy_status').val(); let status = $('#policy_status').val();
$('#pre_sales_row').show(); $('#pre_sales_row').show();
$('#submitButton').show(); $('#submitButton').show();
if(status == "completed"){ // if(status == "completed"){
$('#sales_row').show(); $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if'.
} // }
var client_type = $('#client_type').val(); var client_type = $('#client_type').val();
var value = $(this).val(); var value = $(this).val();
@ -3558,7 +3558,7 @@
if (!isValid) { if (!isValid) {
$('#inception_form_id').find('input, select, textarea').each(function() { $('#inception_form_id').find('input, select, textarea').each(function() {
if ($(this).parsley().isValid() === false && !$(this).val()) { if ($(this).parsley().isValid() === false && !$(this).val()) {
console.log('Empty field ID:', this.id); console.log(' :) Empty field ID:', this.id);
} }
}); });
console.log('Form is Empty', 'Warning'); console.log('Form is Empty', 'Warning');
@ -5408,9 +5408,9 @@
let status = $('#policy_status').val(); let status = $('#policy_status').val();
$('#pre_sales_row').show(); $('#pre_sales_row').show();
$('#submitButton').show(); $('#submitButton').show();
if(status == "completed"){ // if(status == "completed"){
$('#sales_row').show(); $('#sales_row').show();// REF : Venkatesh R - Status html Remove. so i removed the 'if'.
} // }
} }
function removeClientForm(){ function removeClientForm(){
@ -5418,9 +5418,9 @@
let status = $('#policy_status').val(); let status = $('#policy_status').val();
$('#pre_sales_row').show(); $('#pre_sales_row').show();
$('#submitButton').show(); $('#submitButton').show();
if(status == "completed"){ // if(status == "completed"){
$('#sales_row').show(); $('#sales_row').show();// REF : Venkatesh R - Status html Remove. so i removed the 'if'.
} // }
} }
function getVehicleFormData() { function getVehicleFormData() {
@ -5517,9 +5517,9 @@
let status = $('#policy_status').val(); let status = $('#policy_status').val();
$('#pre_sales_row').show(); $('#pre_sales_row').show();
$('#submitButton').show(); $('#submitButton').show();
if(status == "completed"){ // if(status == "completed"){
$('#sales_row').show(); $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if'.
} // }
}, function(xhr, status, error) { }, function(xhr, status, error) {
console.error('Error fetching data:', error); console.error('Error fetching data:', error);
@ -5583,9 +5583,9 @@
let status = $('#policy_status').val(); let status = $('#policy_status').val();
$('#pre_sales_row').show(); $('#pre_sales_row').show();
$('#submitButton').show(); $('#submitButton').show();
if(status == "completed"){ // if(status == "completed"){
$('#sales_row').show(); $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if' Submit la locked. "Empty field ID: Empty field ID: policy_issue_date"
} // }
}, function(xhr, status, error) { }, function(xhr, status, error) {
console.error('Error fetching data:', error); console.error('Error fetching data:', error);

5
app/Views/rto_master_list.php
View File

@ -21,10 +21,10 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if(isset($data)) { ?> <?php if(isset($data)) { $slno = 1; ?>
<?php foreach($data as $index => $row) { ?> <?php foreach($data as $index => $row) { ?>
<tr> <tr>
<td class="text-dark">&nbsp;&nbsp;<?= esc($index + 1); ?></td> <td class="text-center"><?= $slno++; ?></td>
<td><?= $row['rto_name']; ?></td> <td><?= $row['rto_name']; ?></td>
<td><?= $row['rto_code']; ?></td> <td><?= $row['rto_code']; ?></td>
<td><?= $row['rto_state']; ?></td> <td><?= $row['rto_state']; ?></td>
@ -216,6 +216,7 @@
} else if(type == 'remove'){ } else if(type == 'remove'){
toastr.success(response.message, 'Success'); toastr.success(response.message, 'Success');
if(el) $(el).closest('tr').remove(); if(el) $(el).closest('tr').remove();
window.location.reload();
} else if(type == 'submit'){ } else if(type == 'submit'){
toastr.success(response.message, 'Success'); toastr.success(response.message, 'Success');
var myModal = new bootstrap.Modal(document.getElementById('con-close-modal')); var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));

5
app/Views/vehicle_type_master_list.php
View File

@ -19,10 +19,10 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if(isset($data)) { ?> <?php if(isset($data)) { $slno = 1; ?>
<?php foreach($data as $index => $row) { ?> <?php foreach($data as $index => $row) { ?>
<tr> <tr>
<td class="text-dark">&nbsp;&nbsp;<?= esc($index + 1); ?></td> <td class="text-center"><?= $slno++; ?></td>
<td><?= $row['vehicle_type']; ?></td> <td><?= $row['vehicle_type']; ?></td>
<!-- <td> <!-- <td>
<span class="<?php if($row['is_active'] == 1){ echo 'badge badge-primary'; }else{ echo 'badge badge-danger'; } ?>"> <span class="<?php if($row['is_active'] == 1){ echo 'badge badge-primary'; }else{ echo 'badge badge-danger'; } ?>">
@ -194,6 +194,7 @@
} else if(type == 'remove'){ } else if(type == 'remove'){
toastr.success(response.message, 'Success'); toastr.success(response.message, 'Success');
if(el) $(el).closest('tr').remove(); if(el) $(el).closest('tr').remove();
window.location.reload();
} else if(type == 'submit'){ } else if(type == 'submit'){
toastr.success(response.message, 'Success'); toastr.success(response.message, 'Success');
var myModal = new bootstrap.Modal(document.getElementById('con-close-modal')); var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));