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

This commit is contained in:
VENKATESHWARAN 2025-05-21 11:09:56 +05:30
commit 570df5084b
2 changed files with 14 additions and 9 deletions

View File

@ -149,8 +149,13 @@
// If GST is currently validating, wait for it to complete // If GST is currently validating, wait for it to complete
if (isGSTValidating) { if (isGSTValidating) {
if($('#Owner_type').val() == 1){
toastr.info('Please wait while we validate your GST number...', 'Validating'); toastr.info('Please wait while we validate your GST number...', 'Validating');
return; return;
}else if ($('#client_type').val() == 1){
toastr.info('Please wait while we validate your GST number...', 'Validating');
return;
}
} }
// If GST validation failed, prevent submission // If GST validation failed, prevent submission
@ -228,19 +233,17 @@
if(form_type != 1){ if(form_type != 1){
setTimeout(function(){ setTimeout(function(){
$('#client_id').val(res.client_id).change(); $('#client_id').val(res.client_id).change();
$('#client_id').prepend($('<option>', { $('#client_id').prepend($('<option>', {
value: 'add_client', value: 'add_client',
text: '+ Add Client' text: '+ Add Client'
})); }));
setTimeout(function(){ setTimeout(function(){
$('#client_branch_id').val(res.branch_id).change(); $('#client_branch_id').val(res.branch_id).change();
// try {
// setTimeout(function () {(res.branch_id)},1000);
// }catch (e) {
// console.error('Error calling getBranchData:', e); // optional logging
// }
}, 1000) }, 1000)
}, 2000) }, 2000)
}else{ }else{

View File

@ -3604,10 +3604,11 @@ $('#client_type').change(function() {
$('#name').prop('required', false); $('#name').prop('required', false);
$('#mobile').prop('required', false); $('#mobile').prop('required', false);
$('#gst').prop('required', false); $('#gst').prop('required', false);
$('#email').prop('required', false);
$('#dob').prop('required', true); $('#dob').prop('required', true);
$('#phone').prop('required', true); $('#phone').prop('required', true);
$('#email').prop('required', true); $('#email2').prop('required', true);
$('#aadhar').prop('required', true); $('#aadhar').prop('required', true);
$('#owner_branch').prop('required', false); $('#owner_branch').prop('required', false);
@ -3630,10 +3631,11 @@ $('#client_type').change(function() {
$('#name').prop('required', true); $('#name').prop('required', true);
$('#mobile').prop('required', true); $('#mobile').prop('required', true);
$('#gst').prop('required', true); $('#gst').prop('required', true);
$('#email').prop('required', true);
$('#dob').prop('required', false); $('#dob').prop('required', false);
$('#phone').prop('required', false); $('#phone').prop('required', false);
$('#email').prop('required', false); $('#email2').prop('required', false);
$('#aadhar').prop('required', false); $('#aadhar').prop('required', false);
$('#owner_branch').prop('required', true); $('#owner_branch').prop('required', true);