@@ -207,12 +207,12 @@
+ name="email[]" id="email" data-parsley-trigger="change" data-parsley-type="email" onchange="validateDuplicateByClientBranch(this, 'email','branchBtnSubmit')" required>
@@ -945,54 +948,116 @@ function validateInput(input, table, field, submitBtnId){
}
-function validateDuplicateByClientBranch(input, submitButId) {
+function validateDuplicateByClientBranch(input, field, submitButId) {
let value = $(input).val().trim();
let clientId = $('#client_id_branch').val();
let branchId = $('#branch_id_primarykey').val();
- console.log(`Ln968 cId: ${clientId} | bId: ${branchId}`);
-
+ let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim();
+ let message = label ? label + " is duplicate!" : "Value is duplicate!";
+
+ console.log(`cId: ${clientId} | bId: ${branchId}`);
+
// Don't forgot be careful
// 1 Local duplication check (User entered)
let isLocalDuplicate = false;
- $('input[name="email[]"]').each(function() {
- if (this !== input && $(this).val().trim() === value && value !== '') {
+ $('input[name="' + field + '[]"]').each(function(index) {
+ let compareVal = $(this).val().trim();
+ console.log(`Entered value: ${value} | Contact ${index+1} value: ${$(this).val()}`);
+ if (this !== input && compareVal !== '' && compareVal === value) {
isLocalDuplicate = true;
- return false; // break loop
+ return false;
}
});
if (isLocalDuplicate) {
console.log(`r u n Local`);
- toastr.warning("Email is duplicate!", 'WARNING');
+ console.log(`duplicate found for ${field}`);
+ toastr.warning(message, 'WARNING');
$('#' + submitButId).prop('disabled', true);
- return; // don’t call server if duplicate in UI
+ return;
}
-
+
+ // important Skip empty values
+ if (value === '') {
+ checkAllFieldsValid(submitButId);
+ return;
+ }
+
// Don't forgot be careful
// 2 Server-side duplicate check (DB)
- if (!isLocalDuplicate && value !== '') {
- console.log(`r u n Server`);
- $.ajax({
- url: '',
- type: 'POST',
- data: {
- client_id: clientId,
- branch_id: branchId,
- value: value
- },
- dataType: 'json',
- success: function(response) {
- if (response.isDuplicate) {
- toastr.warning("Email already exists!", 'WARNING');
- $('#' + submitButId).prop('disabled', true);
- } else {
- $('#' + submitButId).prop('disabled', false);
- }
- },
- error: function(xhr, status, error) {
- console.error('AJAX Error:', error);
+ $.ajax({
+ url: '',
+ type: 'POST',
+ data: {
+ client_id: clientId,
+ branch_id: branchId,
+ value: value,
+ field: field
+ },
+ dataType: 'json',
+ success: function(response) {
+ if (response.isDuplicate) {
+ console.log(`r u n Server`);
+ console.log(`duplicate found for ${field}`);
+ toastr.warning(message, 'WARNING');
+ $('#' + submitButId).prop('disabled', true);
+ } else {
+ console.log(`No duplicate for ${field}`);
+ checkAllFieldsValid(submitButId);
}
- });
+ },
+ error: function(xhr, status, error) {
+ console.error('AJAX Error:', error);
+ }
+ });
+}
+
+
+// recheck all contacts before enabling submit
+function checkAllFieldsValid(submitButId) {
+ let emailDuplicates = false;
+ let mobileDuplicates = false;
+
+ // cross check all EMAIL duplicates
+ let emailSeen = [];
+ $('input[name="email[]"]').each(function() {
+ let val = $(this).val().trim();
+ if (val && emailSeen.includes(val)) {
+ emailDuplicates = true;
+ } else if (val) {
+ emailSeen.push(val);
+ }
+ });
+
+ // cross check all MOBILE duplicates
+ let mobileSeen = [];
+ $('input[name="mobile[]"]').each(function() {
+ let val = $(this).val().trim();
+ if (val && mobileSeen.includes(val)) {
+ mobileDuplicates = true;
+ } else if (val) {
+ mobileSeen.push(val);
+ }
+ });
+
+ if (emailDuplicates || mobileDuplicates) {
+ $('#' + submitButId).prop('disabled', true);
+ // show correct message based on what’s duplicated
+ if (emailDuplicates && mobileDuplicates) {
+ toastr.warning("Email and Mobile values are duplicate!", "WARNING");
+ console.log('Both Email and Mobile duplicates');
+ } else if (emailDuplicates) {
+ toastr.warning("Email duplicate!", "WARNING");
+ console.log('Cross Check Email duplicates');
+ } else if (mobileDuplicates) {
+ toastr.warning("Mobile duplicate!", "WARNING");
+ console.log('Cross Check Mobile duplicates');
+ }
+ console.log(`btn Dis - true`);
+ } else {
+ console.log('unique — enable');
+ console.log(`btn Dis - false`);
+ $('#' + submitButId).prop('disabled', false);
}
}
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 40cf999..dc37b06 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -115,7 +115,7 @@ body {