From cf60c470b1bc34563d3c58029d4a491a61b8e61c Mon Sep 17 00:00:00 2001 From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com> Date: Wed, 9 Apr 2025 12:50:30 +0100 Subject: [PATCH] feat: add subject validation for message types and display error if missing --- ui/ui/admin/customers/list.tpl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ui/ui/admin/customers/list.tpl b/ui/ui/admin/customers/list.tpl index bdbaf2a1..3d2ab3f0 100644 --- a/ui/ui/admin/customers/list.tpl +++ b/ui/ui/admin/customers/list.tpl @@ -274,6 +274,16 @@ return; } + if (messageType == 'all' || messageType == 'inbox' || messageType == 'email' && !subject) { + Swal.fire({ + title: 'Error!', + text: "{Lang::T('Please enter a subject for the message.')}", + icon: 'error', + confirmButtonText: 'OK' + }); + return; + } + // Disable the button and show loading text $(this).prop('disabled', true).text('{Lang::T('Sending...')}'); @@ -345,15 +355,15 @@ switch (messageType) { case 'all': subjectField.placeholder = 'Enter a subject for all channels'; - subjectField.required = true; + subjectField.required = true; break; case 'email': subjectField.placeholder = 'Enter a subject for email'; - subjectField.required = true; + subjectField.required = true; break; case 'inbox': subjectField.placeholder = 'Enter a subject for inbox'; - subjectField.required = true; + subjectField.required = true; break; default: subjectField.placeholder = 'Enter message subject here';