matt
/
opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

confirmation email integration fixes (#434)

This commit is contained in:
Chirag Chhatrala 2024-06-03 13:44:59 +05:30 committed by GitHub
parent 4b9db042ed
commit 31455e7c24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Service/Forms/Integrations/SubmissionConfirmationIntegration.php
View File

@ -17,6 +17,15 @@ class SubmissionConfirmationIntegration extends AbstractIntegrationHandler
public static function getValidationRules(): array public static function getValidationRules(): array
{ {
return [ return [
'respondent_email' => [
'required',
'boolean',
function ($attribute, $value, $fail) {
if ($value !== true) {
$fail('Need at least 1 email field.');
}
},
],
'confirmation_reply_to' => 'email|nullable', 'confirmation_reply_to' => 'email|nullable',
'notification_sender' => 'required', 'notification_sender' => 'required',
'notification_subject' => 'required', 'notification_subject' => 'required',

3
client/components/open/integrations/SubmissionConfirmationIntegration.vue
View File

@ -81,13 +81,14 @@ const emailSubmissionConfirmationHelp = computed(() => {
onBeforeMount(() => { onBeforeMount(() => {
for (const [keyname, defaultValue] of Object.entries({ for (const [keyname, defaultValue] of Object.entries({
respondent_email: emailSubmissionConfirmationField.value !== null,
notification_sender: "OpnForm", notification_sender: "OpnForm",
notification_subject: "We saved your answers", notification_subject: "We saved your answers",
notification_body: notification_body:
"Hello there 👋 <br>This is a confirmation that your submission was successfully saved.", "Hello there 👋 <br>This is a confirmation that your submission was successfully saved.",
notifications_include_submission: true, notifications_include_submission: true,
})) { })) {
if (props.integrationData.settings[keyname] === undefined) { if (keyname === 'respondent_email' || props.integrationData.settings[keyname] === undefined) {
props.integrationData.settings[keyname] = defaultValue props.integrationData.settings[keyname] = defaultValue
} }
} }

4
tests/Feature/Forms/ConfirmationEmailTest.php
View File

@ -8,6 +8,7 @@ it('creates confirmation emails with the submitted data', function () {
$workspace = $this->createUserWorkspace($user); $workspace = $this->createUserWorkspace($user);
$form = $this->createForm($user, $workspace); $form = $this->createForm($user, $workspace);
$integrationData = $this->createFormIntegration('submission_confirmation', $form->id, [ $integrationData = $this->createFormIntegration('submission_confirmation', $form->id, [
'respondent_email' => true,
'notifications_include_submission' => true, 'notifications_include_submission' => true,
'notification_sender' => 'Custom Sender', 'notification_sender' => 'Custom Sender',
'notification_subject' => 'Test subject', 'notification_subject' => 'Test subject',
@ -31,6 +32,7 @@ it('creates confirmation emails without the submitted data', function () {
$workspace = $this->createUserWorkspace($user); $workspace = $this->createUserWorkspace($user);
$form = $this->createForm($user, $workspace); $form = $this->createForm($user, $workspace);
$integrationData = $this->createFormIntegration('submission_confirmation', $form->id, [ $integrationData = $this->createFormIntegration('submission_confirmation', $form->id, [
'respondent_email' => true,
'notifications_include_submission' => false, 'notifications_include_submission' => false,
'notification_sender' => 'Custom Sender', 'notification_sender' => 'Custom Sender',
'notification_subject' => 'Test subject', 'notification_subject' => 'Test subject',
@ -55,6 +57,7 @@ it('sends a confirmation email if needed', function () {
$form = $this->createForm($user, $workspace); $form = $this->createForm($user, $workspace);
$this->createFormIntegration('submission_confirmation', $form->id, [ $this->createFormIntegration('submission_confirmation', $form->id, [
'respondent_email' => true,
'notifications_include_submission' => true, 'notifications_include_submission' => true,
'notification_sender' => 'Custom Sender', 'notification_sender' => 'Custom Sender',
'notification_subject' => 'Test subject', 'notification_subject' => 'Test subject',
@ -118,6 +121,7 @@ it('does send a confirmation email even when reply to is broken', function () {
$workspace = $this->createUserWorkspace($user); $workspace = $this->createUserWorkspace($user);
$form = $this->createForm($user, $workspace); $form = $this->createForm($user, $workspace);
$integrationData = $this->createFormIntegration('submission_confirmation', $form->id, [ $integrationData = $this->createFormIntegration('submission_confirmation', $form->id, [
'respondent_email' => true,
'notifications_include_submission' => true, 'notifications_include_submission' => true,
'notification_sender' => 'Custom Sender', 'notification_sender' => 'Custom Sender',
'notification_subject' => 'Test subject', 'notification_subject' => 'Test subject',