Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
42b85f4c9a
@ -69,8 +69,8 @@ class Filters extends BaseConfig
|
|||||||
'before' => [
|
'before' => [
|
||||||
'HttpRequestLog' => ['except' => 'cli/*'],
|
'HttpRequestLog' => ['except' => 'cli/*'],
|
||||||
'Cors',
|
'Cors',
|
||||||
'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob','getCommission','downloadEmployeeEcardZip']],
|
'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob','getCommission','downloadEmployeeEcardZip', 'downloadClaimFile']],
|
||||||
'SecurityInputFilter' => ['except' => ['/client/notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail'] ],
|
'SecurityInputFilter' => ['except' => ['/client/notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail', 'ticket/reply'] ],
|
||||||
'GlobalPostFileUploadGuard'
|
'GlobalPostFileUploadGuard'
|
||||||
// 'csrf',
|
// 'csrf',
|
||||||
// 'invalidchars',
|
// 'invalidchars',
|
||||||
|
|||||||
@ -925,7 +925,6 @@ class PolicyTransactionController extends BaseController
|
|||||||
// ==========================================
|
// ==========================================
|
||||||
'client_type' => ['label' => 'Client Type', 'rules' => 'required', 'errors' => ['required' => 'Client Type must be selected.']],
|
'client_type' => ['label' => 'Client Type', 'rules' => 'required', 'errors' => ['required' => 'Client Type must be selected.']],
|
||||||
'client_id' => ['label' => 'Client', 'rules' => 'required', 'errors' => ['required' => 'Please select a Client.']],
|
'client_id' => ['label' => 'Client', 'rules' => 'required', 'errors' => ['required' => 'Please select a Client.']],
|
||||||
'client_branch_id' => ['label' => 'Client Branch', 'rules' => 'required', 'errors' => ['required' => 'Client branch is required']],
|
|
||||||
'issue_type' => ['label' => 'Business Type', 'rules' => 'required', 'errors' => ['required' => 'Please select a Business Type.']],
|
'issue_type' => ['label' => 'Business Type', 'rules' => 'required', 'errors' => ['required' => 'Please select a Business Type.']],
|
||||||
'ref' => ['label' => 'Reference', 'rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 _-]+$/]', 'errors' => [
|
'ref' => ['label' => 'Reference', 'rules' => 'permit_empty|regex_match[/^[a-zA-Z0-9 _-]+$/]', 'errors' => [
|
||||||
'regex_match' => 'The {field} can only contain letters, numbers, spaces, dashes, and underscores.'
|
'regex_match' => 'The {field} can only contain letters, numbers, spaces, dashes, and underscores.'
|
||||||
@ -1052,6 +1051,9 @@ class PolicyTransactionController extends BaseController
|
|||||||
'exp_amt.*' => ['label' => 'Expected Amount', 'rules' => 'permit_empty|decimal', 'errors' => ['decimal' => 'The Expected Amount field must contain a valid number.']]
|
'exp_amt.*' => ['label' => 'Expected Amount', 'rules' => 'permit_empty|decimal', 'errors' => ['decimal' => 'The Expected Amount field must contain a valid number.']]
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if(isset($post_data['client_type']) && $post_data['client_type'] == 1){
|
||||||
|
$rules['client_branch_id'] = ['label' => 'Client Branch', 'rules' => 'required', 'errors' => ['required' => 'Client branch is required']];
|
||||||
|
}
|
||||||
|
|
||||||
$isValid = $this->validate($rules);
|
$isValid = $this->validate($rules);
|
||||||
|
|
||||||
|
|||||||
@ -4555,17 +4555,17 @@ function ajaxRequest(formData) {
|
|||||||
$('.loader-mask').delay(350).fadeOut('slow');
|
$('.loader-mask').delay(350).fadeOut('slow');
|
||||||
|
|
||||||
console.log(res);
|
console.log(res);
|
||||||
if (res.status == 'Success' && res.code == 200) {
|
if (res.status == 'success' && res.code == 200) {
|
||||||
toastr.success('Mail sent Successfully', 'Success')
|
toastr.success('Mail sent Successfully', 'SUCCESS')
|
||||||
if(res.is_placement == true){
|
if(res.is_placement == true){
|
||||||
clearInterval(intervalId);
|
clearInterval(intervalId);
|
||||||
console.log('******** Intervel Cleared ********')
|
console.log('******** Intervel Cleared ********')
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (res.messgae) {
|
if (res.messgae) {
|
||||||
toastr.error(res.messgae, 'Error')
|
toastr.error(res.messgae, 'ERROR')
|
||||||
} else {
|
} else {
|
||||||
toastr.error('Mail send failed', 'Error')
|
toastr.error('Mail send failed', 'ERROR')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user