Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

EnvelopeGenerator.Common/Entities/EmailData.vb

@@ -13,12 +13,6 @@ Public Class EmailData
     Public Property SignatureLink As String
     Public Property Message As String
 
-    Public ReadOnly Property EmailSubjectTranslated
-        Get
-            Return String.Format(My.Resources.Email.Sie_haben_ein_Dokument_zur_Unterschrift_erhalten___0_, EmailSubject)
-        End Get
-    End Property
-
     Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver)
         EmailAdress = pReceiver.Email
         EmailSubject = pEnvelope.Subject

EnvelopeGenerator.Common/Entities/EmailTemplate.vb

@@ -13,9 +13,13 @@ Public Class EmailTemplate
 
     Private _replaceDictionary As Dictionary(Of String, String)
 
-    Public Sub New()
+    Private DbConfig As DbConfig
+
+    Public Sub New(pState As State)
         InitBodyTemplates()
         InitSubjectTemplates()
+
+        DbConfig = pState.DbConfig
     End Sub
 
     Private Sub InitSubjectTemplates()
@@ -36,16 +40,16 @@ Public Class EmailTemplate
             "<MESSAGE>",
             "",
             "Mit freundlichen Grüßen",
-            "<NAME_SENDER>"
+            "<NAME_PORTAL>"
         }
 
         _DocumentSignedBodyTemplate = New List(Of String) From {
             "Guten Tag, <NAME_RECEIVER>",
             "",
-            "Ihre Unterschrift auf dem Dokument <DOCUMENT_TITLE> wurde gespeichert.",
+            "hiermit bestätigen wir Ihnen die erfolgreiche Signatur für den Vorgang <DOCUMENT_TITLE>.",
             "",
             "Mit freundlichen Grüßen",
-            "<NAME_SENDER>"
+            "<NAME_PORTAL>"
         }
 
         _DocumentDeletedBodyTemplate = New List(Of String) From {
@@ -54,7 +58,7 @@ Public Class EmailTemplate
             "Der User <NAME_SENDER> hat den Umschlag <DOCUMENT_TITLE> gelöscht.",
             "",
             "Mit freundlichen Grüßen",
-            "<NAME_SENDER>"
+            "<NAME_PORTAL>"
         }
 
         _DocumentCompletedBodyTemplate = New List(Of String) From {
@@ -63,7 +67,7 @@ Public Class EmailTemplate
             "Das Dokument <DOCUMENT_TITLE> wurde von allen Beteiligten unterschrieben.",
             "",
             "Mit freundlichen Grüßen",
-            "<NAME_SENDER>"
+            "<NAME_PORTAL>"
         }
     End Sub
 
@@ -71,6 +75,7 @@ Public Class EmailTemplate
         _replaceDictionary = New Dictionary(Of String, String) From {
             {"<NAME_RECEIVER>", pEmailData.ReceiverName},
             {"<NAME_SENDER>", pEmailData.SenderName},
+            {"<NAME_PORTAL>", DbConfig.ExternalProgramName},
             {"<SIGNATURE_TYPE>", "signieren"},
             {"<LINK_TO_DOCUMENT>", pEmailData.SignatureLink},
             {"<LINK_TO_DOCUMENT_TEXT>", $"{pEmailData.SignatureLink.Truncate(40)}.."},

EnvelopeGenerator.Common/Entities/EnvelopeReceiver.vb

@@ -1,7 +1,9 @@
 Imports System.Drawing
+Imports System.Runtime.Serialization
 Imports DevExpress.Utils.Svg
 Imports DigitalData.Modules.Base
 Imports EnvelopeGenerator.Common.Constants
+Imports Newtonsoft.Json
 
 Public Class EnvelopeReceiver
     Public Property Id As Integer = 0
@@ -13,6 +15,7 @@ Public Class EnvelopeReceiver
         End Get
     End Property
 
+    <JsonIgnore>
     Public ReadOnly Property Image As SvgBitmap
         Get
             Try