diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor index 2f7bfa91..bfe18ca6 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor @@ -81,7 +81,9 @@ - + - - - + @@ -162,10 +171,14 @@ - + + + @@ -441,6 +454,8 @@ private bool _tfaEnabled; private FinalEmailType _finalEmailToCreator = FinalEmailType.No; private FinalEmailType _finalEmailToReceivers = FinalEmailType.No; + private bool _finalEmailToCreatorUserOverridden; + private bool _finalEmailToReceiversUserOverridden; private bool _sendReminderEmails; private int _firstReminderDays; private int _reminderIntervalDays; @@ -552,6 +567,20 @@ return Task.CompletedTask; } + private Task OnFinalEmailToCreatorChanged() + { + _validationMessage = null; + _finalEmailToCreatorUserOverridden = true; + return Task.CompletedTask; + } + + private Task OnFinalEmailToReceiversChanged() + { + _validationMessage = null; + _finalEmailToReceiversUserOverridden = true; + return Task.CompletedTask; + } + private Task AddReceiver() { if (IsActionLocked) @@ -1005,12 +1034,14 @@ if (_tfaEnabled) _useAccessCode = true; - if (envelopeType.FinalEmailToCreator.HasValue) + if (envelopeType.FinalEmailToCreator.HasValue && !_finalEmailToCreatorUserOverridden) _finalEmailToCreator = envelopeType.FinalEmailToCreator.Value; - if (envelopeType.FinalEmailToReceivers.HasValue) + if (envelopeType.FinalEmailToReceivers.HasValue && !_finalEmailToReceiversUserOverridden) _finalEmailToReceivers = envelopeType.FinalEmailToReceivers.Value; + ApplyEnvelopeTypeFinalEmailDefaults(envelopeType.Id); + if (envelopeType.SendReminderEmails.HasValue) _sendReminderEmails = envelopeType.SendReminderEmails.Value; @@ -1029,6 +1060,26 @@ NormalizeSettings(); } + private void ApplyEnvelopeTypeFinalEmailDefaults(EnvelopeType envelopeType) + { + if ((envelopeType == EnvelopeType.SimpleSignature || envelopeType == EnvelopeType.AdvancedSignature) + && !_finalEmailToCreatorUserOverridden) + { + _finalEmailToCreator = FinalEmailType.YesWithAttachment; + } + + if (envelopeType == EnvelopeType.ReadAndConfirm && !_finalEmailToCreatorUserOverridden) + _finalEmailToCreator = FinalEmailType.Yes; + + if ((envelopeType == EnvelopeType.SimpleSignature + || envelopeType == EnvelopeType.AdvancedSignature + || envelopeType == EnvelopeType.ReadAndConfirm) + && !_finalEmailToReceiversUserOverridden) + { + _finalEmailToReceivers = FinalEmailType.YesWithAttachment; + } + } + private void NormalizeSettings() { _language = string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language.Trim(); @@ -1099,6 +1150,8 @@ _tfaEnabled = false; _finalEmailToCreator = FinalEmailType.No; _finalEmailToReceivers = FinalEmailType.No; + _finalEmailToCreatorUserOverridden = false; + _finalEmailToReceiversUserOverridden = false; _sendReminderEmails = false; _firstReminderDays = 0; _reminderIntervalDays = 0; diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor index 31fa416a..ef6c361f 100644 --- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor +++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor @@ -134,19 +134,25 @@
- + + +
- + + +