village-hall
/
opnform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Customised email reply to (#186) 

Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
formsdev 2023-09-06 13:34:08 +05:30 committed by GitHub
parent c66c09e17b
commit a06a43c01c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Mail/Forms/SubmissionConfirmationMail.php
View File

@ -9,6 +9,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Str;
use Illuminate\Support\Arr;
class SubmissionConfirmationMail extends OpenFormMail implements ShouldQueue
{
@ -36,7 +37,7 @@ class SubmissionConfirmationMail extends OpenFormMail implements ShouldQueue
->outputStringsOnly();
return $this
->replyTo($form->creator->email)
->replyTo($this->getReplyToEmail($form->creator->email))
->from($this->getFromEmail(), $form->notification_sender)
->subject($form->notification_subject)
->markdown('mail.form.confirmation-submission-notification',[
@ -52,4 +53,10 @@ class SubmissionConfirmationMail extends OpenFormMail implements ShouldQueue
$originalFromAddress = Str::of(config('mail.from.address'))->explode('@');
return $originalFromAddress->first(). '+' . time() . '@' . $originalFromAddress->last();
}
private function getReplyToEmail($default)
{
$replyTo = Arr::get((array)$this->event->form->notification_settings, 'confirmation_reply_to', null);
return $replyTo ?? $default;
}
}

5
app/Notifications/Forms/FormSubmissionNotification.php
View File

@ -9,6 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Str;
use Illuminate\Support\Arr;
class FormSubmissionNotification extends Notification implements ShouldQueue
{
@ -68,6 +69,10 @@ class FormSubmissionNotification extends Notification implements ShouldQueue
private function getReplyToEmail($default)
{
$replyTo = Arr::get((array)$this->event->form->notification_settings, 'notification_reply_to', null);
if ($replyTo && $this->validateEmail($replyTo)) {
return $replyTo;
}
return $this->getRespondentEmail() ?? $default;
}

2
resources/js/components/open/forms/components/form-components/FormNotifications.vue
View File

@ -13,9 +13,9 @@
</template>
<form-notifications-option />
<form-notifications-submission-confirmation />
<form-notifications-slack />
<form-notifications-discord />
<form-notifications-submission-confirmation />
</collapse>
</template>

13
resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue
View File

@ -33,11 +33,18 @@
</h2>
<toggle-switch-input name="notifies" :form="form" class="mt-4"
label="Receive email notifications on submission"
/>
<template v-if="form.notifies">
<text-input name="notification_reply_to"
v-model="form.notification_settings.notification_reply_to" class="mt-4"
label="Notification Reply To"
:help="notifiesHelp"
/>
<text-area-input v-if="form.notifies" name="notification_emails" :form="form" class="mt-4"
<text-area-input name="notification_emails" :form="form" class="mt-4"
label="Notification Emails" help="Add one email per line"
/>
</template>
</modal>
</div>
</template>
@ -73,9 +80,9 @@ export default {
},
notifiesHelp () {
if (this.replayToEmailField) {
return 'Reply-to for this notification will be the email filled in the field "' + this.replayToEmailField.name + '".'
return 'If empty, Reply-to for this notification will be the email filled in the field "' + this.replayToEmailField.name + '".'
}
return 'Reply-to for this notification will be your own email. Add a single email field to your form, and it will automatically become the reply to value.'
return 'If empty, Reply-to for this notification will be your own email. Add a single email field to your form, and it will automatically become the reply to value.'
}
},

18
resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue
View File

@ -31,22 +31,32 @@
:form="form" class="mt-4"
label="Send submission confirmation" :help="emailSubmissionConfirmationHelp"
/>
<text-input v-if="form.send_submission_confirmation" name="notification_sender"
<template v-if="form.send_submission_confirmation">
<text-input name="confirmation_reply_to"
v-model="form.notification_settings.confirmation_reply_to" class="mt-4"
label="Confirmation Reply To" help="help"
>
<template #help>
If empty, Reply-to will be your own email.
</template>
</text-input>
<text-input name="notification_sender"
:form="form" class="mt-4"
label="Confirmation Email Sender Name" help="Emails will be sent from our email address but you can customize the name of the Sender"
/>
<text-input v-if="form.send_submission_confirmation" name="notification_subject"
<text-input name="notification_subject"
:form="form" class="mt-4"
label="Confirmation email subject" help="Subject of the confirmation email that will be sent"
/>
<rich-text-area-input v-if="form.send_submission_confirmation" name="notification_body"
<rich-text-area-input name="notification_body"
:form="form" class="mt-4"
label="Confirmation email content" help="Content of the confirmation email that will be sent"
/>
<toggle-switch-input v-if="form.send_submission_confirmation" name="notifications_include_submission"
<toggle-switch-input name="notifications_include_submission"
:form="form" class="mt-4"
label="Include submission data" help="If enabled the confirmation email will contain form submission answers"
/>
</template>
</modal>
</div>
</template>

2
resources/views/mail/form/confirmation-submission-notification.blade.php
View File

@ -4,7 +4,7 @@
@if($form->editable_submissions)
@component('mail::button', ['url' => $form->share_url.'?submission_id='.$submission_id])
{{$form.editable_submissions_button_text}}
{{($form->editable_submissions_button_text ?? 'Edit submission')}}
@endcomponent
@endif