From 82a0d460578b94701abf5933a26834893063d76a Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 19 Dec 2023 11:13:26 +0530 Subject: [PATCH] Template Raised Issues fixes : ps --- app/Views/template_creation_form.php | 54 ++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/app/Views/template_creation_form.php b/app/Views/template_creation_form.php index 1d13b4e5..540efaed 100644 --- a/app/Views/template_creation_form.php +++ b/app/Views/template_creation_form.php @@ -34,12 +34,19 @@
+ Keywords are {USER_NAME},{SCHEME_NAME},{EXPIRY_DATE}
+
Please provide.
@@ -47,9 +54,11 @@
+ Keywords are {USER_NAME},{SCHEME_NAME},{EXPIRY_DATE}
Please provide.
@@ -96,6 +105,18 @@ $('.templatemessage').prop('required',false); $('.whatsapptemplatemessage').prop('required',true); + + whatsapptemplatemessage = $('.whatsapptemplatemessage').val(); + + if ((whatsapptemplatemessage!==null) || (whatsapptemplatemessage!=='')){ + finaltemplate = whatsapptemplatemessage.replace(/<[^>]*>/g, ''); + $('.whatsapptemplatemessage').val(finaltemplate.replace(/^\s+/, '')); + } + // if(whatsapptemplatemessage == ''){ + // var regex = /(<([^>]+)>)/ig; + // finaltemplate = whatsapptemplatemessage.replace(regex, ""); + // $('.whatsapptemplatemessage').val(finaltemplate); + // } } }); @@ -134,7 +155,26 @@ event.preventDefault(); // Prevent form submission if it's not valid $('#submitBtn').prop('disabled', false); } else { - $('#submitBtn').prop('disabled', true); + var chooseMode = $('input[name="mode"]').val(); + var templatemessage = ""; + var fieldname = ""; + if (chooseMode === 'Email') { + templatemessage = $('.templatemessage').val(); + fieldname = '.templatemessage'; + } else if(chooseMode === 'Whatsapp') { + templatemessage = $('.whatsapptemplatemessage').val(); + fieldname = '.whatsapptemplatemessage'; + } + if(templatemessage == ""){ + event.preventDefault(); // Prevent form submission if it's not valid + form.reportValidity(); + alert('Template message should not be empty.'); + templatemessage = $(fieldname).focus(); + $('#submitBtn').prop('disabled', false); + }else{ + $('#submitBtn').prop('disabled', true); + } + } }); \ No newline at end of file