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:
Srinivas-Saravanan 2025-05-13 12:41:16 +05:30
commit abc16e74e4
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/EmployeeServiceController.php
View File

@ -1383,11 +1383,11 @@ class EmployeeServiceController extends AdminController
{ {
// dd($employee); // dd($employee);
$existing_endorsements = $this->empEndorsementModel->where('actions','d') $existing_endorsements = $this->empEndorsementModel->where('actions','d')
->where('table_name','employees') ->where('table_name','employee_polices')
->where('endorsement_id is null') ->where('endorsement_id is null')
->where('emp_code',$employee['emp_code']) ->where('emp_code',$employee['emp_code'])
->where('name',$employee['name']) ->where('name',$employee['name'])
->where('field_name','emp_status') ->where('field_name','status')
->where('status !=','truncated') ->where('status !=','truncated')
->where('is_active', 1) ->where('is_active', 1)
->findAll(); ->findAll();

16
app/Views/leads_form_handler.php
View File

@ -458,9 +458,19 @@ if (isset($selected_lead_type)) {
<script> <script>
$(document).ready(async function () { $(document).ready(async function () {
handleEbAndNonEbEdit(
<?= json_encode($lead_edit_data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP) ?> $('.loader').fadeIn();
); $('.loader-mask').fadeIn();
setTimeout(() => {
$('.loader').fadeIn();
$('.loader-mask').fadeIn();
handleEbAndNonEbEdit(
<?= json_encode($lead_edit_data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP) ?>
);
}, 1000);
}); });
function handleEbAndNonEbEdit(data){ function handleEbAndNonEbEdit(data){