diff --git a/app/Models/PartnerStaffModel.php b/app/Models/PartnerStaffModel.php index f79f06ad..8c5ca862 100755 --- a/app/Models/PartnerStaffModel.php +++ b/app/Models/PartnerStaffModel.php @@ -16,7 +16,7 @@ class PartnerStaffModel extends Model protected $useSoftDeletes = false; // allowed fields for insert/update - protected $allowedFields = ['name','email','mobile','emp_id','role_id','email_otp','is_active','created_by','updated_by','manager_id','retention_rate']; + protected $allowedFields = ['name','email','mobile','emp_id','role_id','email_otp','is_active','created_by','updated_by','manager_id','retention_rate','nhance_branch_id']; // automatic timestamps protected $useTimestamps = true; diff --git a/app/Views/UserList.php b/app/Views/UserList.php index 1e3e2766..64b7cc3b 100755 --- a/app/Views/UserList.php +++ b/app/Views/UserList.php @@ -609,7 +609,7 @@ table.dataTable tbody td {
- +
@@ -630,10 +630,20 @@ table.dataTable tbody td {
-
+ +
+ + +
+
@@ -880,12 +890,18 @@ table.dataTable tbody td { $(document).ready(function () { $('#nhance_branch_id').select2(); + $('#partner_nhance_branch_id').select2(); + $('#rm_id').select2(); $('#nhance_branch_id') .val(null) // ✅ MUST be null .trigger('change.select2'); // ✅ correct trigger + $('#partner_nhance_branch_id') + .val(null) // ✅ MUST be null + .trigger('change.select2'); // ✅ correct trigger + var incentiveMonthPicker = flatpickr("#incentive_month", { dateFormat: "Y-m-d", // real value stored (hidden) @@ -1152,8 +1168,19 @@ table.dataTable tbody td { $('#partner_name').val(user.name); $('#email_addr').val(user.email); $('#mobile_no').val(user.mobile); - $('#locn').val(user.address); + // $('#locn').val(user.address); $('#retention_rate').val(user.retention_rate); + if (user.nhance_branch_id !== null && + user.nhance_branch_id !== "" && + user.nhance_branch_id !== 0) { + $('#partner_nhance_branch_id') + .val(user.nhance_branch_id) + .trigger('change.select2'); + } else { + $('#partner_nhance_branch_id') + .val(null) // ✅ MUST be null + .trigger('change.select2'); // ✅ correct trigger + } // $('#btnPartnerSubmit').html('Update'); $('.modal-title').html('Update Nhance Partner'); let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal')); @@ -1163,10 +1190,12 @@ table.dataTable tbody td { $('body').on('click', '.btnPartnerDelete', function () { var partner_role = $(this).attr('data-role'); var alertText = "You need to remove this user"; - if (partner_role == 2) { + if (partner_role == 3) { alertText = "You need to remove this Staff"; + } else if (partner_role == 2) { + alertText = "You need to remove this Handler"; } else if (partner_role == 1) { - alertText = "You need to remove this Manager and related agent and staff are also delete"; + alertText = "You need to remove this Manager and related Handler and Staff are also delete"; } Swal.fire({ @@ -1246,23 +1275,25 @@ table.dataTable tbody td { var name = document.getElementById('partner_name').value.trim(); var mobile = document.getElementById('mobile_no').value.trim(); var email = document.getElementById('email_addr').value.trim(); - var address = document.getElementById('locn').value.trim(); - + // var address = document.getElementById('locn').value.trim(); + var rate = document.getElementById('retention_rate').value.trim(); + var nb = document.getElementById('partner_nhance_branch_id').value.trim(); + // Validation checks - if (name === "" || mobile === "" || email === "") { - console.log(name); - console.log(mobile); - console.log(email); + if (name === "" || mobile === "" || email === "" || rate === "" || nb === "") { + // console.log(name); + // console.log(mobile); + // console.log(email); toastr.warning('Please fill all required fields.', 'Warning'); form.classList.add('was-validated'); return; } - if (address.length > 1500) { - toastr.error('Address cannot exceed 1500 characters', 'Warning'); - form.classList.add('was-validated'); - return; - } + // if (address.length > 1500) { + // toastr.error('Address cannot exceed 1500 characters', 'Warning'); + // form.classList.add('was-validated'); + // return; + // } var mobilePattern = /^[6-9]\d{9}$/; // must start with 6–9 and be 10 digits if (!mobilePattern.test(mobile)) { @@ -1857,7 +1888,9 @@ table.dataTable tbody td { $('#email_addr').val(''); $('#partner_id').val(''); $('#mobile_no').val(''); - $('#locn').val(''); + // $('#locn').val(''); + $('#retention_rate').val(''); + $('#partner_nhance_branch_id').val('0'); $('.modal-title').html('Add Nhance Partner'); $('#PartnerForm').attr('action', ''); let myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal')); diff --git a/app/Views/nhance_branch_list.php b/app/Views/nhance_branch_list.php index 4c435257..d85b83ce 100644 --- a/app/Views/nhance_branch_list.php +++ b/app/Views/nhance_branch_list.php @@ -150,6 +150,7 @@ }) function openModal(){ + resetValues(); var myModal = new bootstrap.Modal(document.getElementById('con-close-modal')); myModal.show(); }