Beautiful Open-Source Form Builder
Customised email reply to (#186)
formsdeva06a43c01c86
diff --git a/app/Mail/Forms/SubmissionConfirmationMail.php b/app/Mail/Forms/SubmissionConfirmationMail.phpindex 9c2f30e10..4ea01a394 100644--- a/app/Mail/Forms/SubmissionConfirmationMail.php+++ b/app/Mail/Forms/SubmissionConfirmationMail.php@@ -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;+ }}diff --git a/app/Notifications/Forms/FormSubmissionNotification.php b/app/Notifications/Forms/FormSubmissionNotification.phpindex d5dabf4e8..94196e3b4 100644--- a/app/Notifications/Forms/FormSubmissionNotification.php+++ b/app/Notifications/Forms/FormSubmissionNotification.php@@ -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 ShouldQueueprivate 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;}diff --git a/resources/js/components/open/forms/components/form-components/FormNotifications.vue b/resources/js/components/open/forms/components/form-components/FormNotifications.vueindex b8f620ece..03d813df5 100644--- a/resources/js/components/open/forms/components/form-components/FormNotifications.vue+++ b/resources/js/components/open/forms/components/form-components/FormNotifications.vue@@ -13,9 +13,9 @@</template><form-notifications-option />+ <form-notifications-submission-confirmation /><form-notifications-slack /><form-notifications-discord />- <form-notifications-submission-confirmation /></collapse></template>diff --git a/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue b/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vueindex d5ee53173..df478c42d 100644--- a/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue+++ b/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue@@ -33,11 +33,18 @@</h2><toggle-switch-input name="notifies" :form="form" class="mt-4"label="Receive email notifications on submission"- :help="notifiesHelp"- />- <text-area-input v-if="form.notifies" name="notification_emails" :form="form" class="mt-4"- label="Notification Emails" help="Add one email per line"+/>+ <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 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.'}},diff --git a/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue b/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vueindex 0c7fc41bc..87e7d58d2 100644--- a/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue+++ b/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue@@ -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"- :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"- :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"- :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"- :form="form" class="mt-4"- label="Include submission data" help="If enabled the confirmation email will contain form submission answers"- />+ <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 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 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 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>diff --git a/resources/views/mail/form/confirmation-submission-notification.blade.php b/resources/views/mail/form/confirmation-submission-notification.blade.phpindex e1d36d859..e77c1db0b 100644--- a/resources/views/mail/form/confirmation-submission-notification.blade.php+++ b/resources/views/mail/form/confirmation-submission-notification.blade.php@@ -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