FIX_NOTIFICATION_TEMPLATE_ISSUE_AND_FILTER_ISSUE
This commit is contained in:
parent
defcd39534
commit
ff46f960dd
@ -63,7 +63,7 @@ class Filters extends BaseConfig
|
|||||||
'HttpRequestLog' => ['except' => 'cli/*'],
|
'HttpRequestLog' => ['except' => 'cli/*'],
|
||||||
'Cors',
|
'Cors',
|
||||||
// 'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob','getCommission']],
|
// 'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','employeeRest/*','processjob','getCommission']],
|
||||||
'SecurityInputFilter' => ['except' => ['notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail'] ],
|
'SecurityInputFilter' => ['except' => ['/client/notification/create','/ticket/crud_mail_template/*','test_mail','leads/sendMail'] ],
|
||||||
'GlobalPostFileUploadGuard'
|
'GlobalPostFileUploadGuard'
|
||||||
// 'csrf',
|
// 'csrf',
|
||||||
// 'invalidchars',
|
// 'invalidchars',
|
||||||
|
|||||||
@ -62,7 +62,7 @@ class LoginController extends BaseController
|
|||||||
set_session_data($session_data);
|
set_session_data($session_data);
|
||||||
|
|
||||||
// Bind session to device
|
// Bind session to device
|
||||||
// set_session_data(['fingerprint' => generateFingerprint()]);
|
set_session_data(['fingerprint' => generateFingerprint()]);
|
||||||
|
|
||||||
log_message('error', 'Set The UserId : `'. $user->id .'` in Session');
|
log_message('error', 'Set The UserId : `'. $user->id .'` in Session');
|
||||||
log_message('error', 'User Login Sucessfully');
|
log_message('error', 'User Login Sucessfully');
|
||||||
|
|||||||
@ -23,11 +23,11 @@ class AuthMVC implements FilterInterface
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
// Fingerprint validation
|
// Fingerprint validation
|
||||||
// $fp = generateFingerprint();
|
$fp = generateFingerprint();
|
||||||
// // log_message('error',$fp);
|
// log_message('error',$fp);
|
||||||
// if (session()->get('fingerprint') !== $fp) {
|
if (session()->get('fingerprint') !== $fp) {
|
||||||
// return AuthLogout::logout();
|
return AuthLogout::logout();
|
||||||
// }
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1614,7 +1614,6 @@
|
|||||||
const formData = new FormData(form);
|
const formData = new FormData(form);
|
||||||
formData.append('template_name', template_name);
|
formData.append('template_name', template_name);
|
||||||
formData.append('client_id', client_id);
|
formData.append('client_id', client_id);
|
||||||
console.log(formData.template_name);
|
|
||||||
const fileInput = form.querySelector('input[type="file"]');
|
const fileInput = form.querySelector('input[type="file"]');
|
||||||
|
|
||||||
// Check if a file is selected
|
// Check if a file is selected
|
||||||
@ -1980,23 +1979,15 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#account_maneger_summary_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#account_maneger_summary_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
|
||||||
value: data.html
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(formData);
|
// Append Unlayer data
|
||||||
|
formData.append('mailContent', data.html);
|
||||||
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
|
|
||||||
|
console.log([...formData.entries()]);
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
@ -2042,23 +2033,15 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#member_welcome_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#member_welcome_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
|
||||||
value: data.html
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(formData);
|
// Append Unlayer data
|
||||||
|
formData.append('mailContent', data.html);
|
||||||
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
|
|
||||||
|
console.log([...formData.entries()]);
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
@ -2104,23 +2087,15 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#member_reminder_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#member_reminder_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
|
||||||
value: data.html
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(formData);
|
// Append Unlayer data
|
||||||
|
formData.append('mailContent', data.html);
|
||||||
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
|
|
||||||
|
console.log([...formData.entries()]);
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
@ -2166,23 +2141,15 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#member_ecard_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#member_ecard_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
|
||||||
value: data.html
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(formData);
|
// Append Unlayer data
|
||||||
|
formData.append('mailContent', data.html);
|
||||||
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
|
|
||||||
|
console.log([...formData.entries()]);
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
@ -2229,21 +2196,15 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#member_common_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#member_common_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
// Append Unlayer data
|
||||||
value: data.html
|
formData.append('mailContent', data.html);
|
||||||
});
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
formData.push({
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
console.log([...formData.entries()]);
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
@ -2289,23 +2250,15 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#member_review_and_summary_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#member_review_and_summary_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
|
||||||
value: data.html
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(formData);
|
// Append Unlayer data
|
||||||
|
formData.append('mailContent', data.html);
|
||||||
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
|
|
||||||
|
console.log([...formData.entries()]);
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
@ -2351,23 +2304,16 @@
|
|||||||
|
|
||||||
// Use the editor instance instead of unlayer directly
|
// Use the editor instance instead of unlayer directly
|
||||||
editor.exportHtml(function(data) {
|
editor.exportHtml(function(data) {
|
||||||
var formData = $('#client_hr_summary_mail_form').serializeArray();
|
|
||||||
|
|
||||||
// Append Unlayer editor data
|
var formData = new FormData($('#client_hr_summary_mail_form')[0]);
|
||||||
formData.push({
|
|
||||||
name: 'mailContent',
|
// Append Unlayer data
|
||||||
value: data.html
|
formData.append('mailContent', data.html);
|
||||||
});
|
formData.append('client_id', $('#general_PrimaryKey').val());
|
||||||
formData.push({
|
formData.append('mailJson', JSON.stringify(data.design));
|
||||||
name: 'client_id',
|
|
||||||
value: $('#general_PrimaryKey').val()
|
console.log([...formData.entries()]);
|
||||||
});
|
|
||||||
formData.push({
|
|
||||||
name: 'mailJson',
|
|
||||||
value: JSON.stringify(data.design)
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log(formData);
|
|
||||||
|
|
||||||
// Show loading indicators
|
// Show loading indicators
|
||||||
$('.loader').fadeIn();
|
$('.loader').fadeIn();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user