ZUGFeRD Service/WebService: Lesen/Auswertung neue Config-Schalter. GDPicture-Lizenz-Abfrage

Services.ZUGFeRDService/Config.vb

@@ -2,23 +2,30 @@
     Public Property Custom As New CustomConfig
 
     Public Property MSSQLConnectionString As String = ""
+
     Public Property MSSQLEmailOutAccountID As String = 1
 
     Public Property PORTAL_NAME As String = "WISAG-Portal"
 
     Public Property JobInterval As Integer = 10
+
     Public Property ExceptionEmailAddress As String = "wisag-flow@digitaldata.works"
 
     Public Property Debug As Boolean = False
 
     Public Property WatchDirectory As String = String.Empty
-    Public Property SuccessDirectory As String = String.Empty
-    Public Property ErrorDirectory As String = String.Empty
-    Public Property OriginalEmailDirectory As String = String.Empty
-    Public Property RejectedEmailDirectory As String = String.Empty
-    Public Property AttachmentsSubDirectory As String = String.Empty
-    Public Property NonZugferdDirectory As String = String.Empty
 
+    Public Property SuccessDirectory As String = String.Empty
+
+    Public Property ErrorDirectory As String = String.Empty
+
+    Public Property OriginalEmailDirectory As String = String.Empty
+
+    Public Property RejectedEmailDirectory As String = String.Empty
+
+    Public Property AttachmentsSubDirectory As String = String.Empty
+
+    Public Property NonZugferdDirectory As String = String.Empty
 
     Public Class CustomConfig
         ''' <summary>
@@ -49,9 +56,21 @@
         ''' </summary>
         Public Property RejectionTemplateId As Integer = 0
 
+        ''' <summary>
+        ''' Enthält die Version des GDPicture Modules,
+        ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES
+        ''' gelesen werden soll.
+        ''' </summary>
+        Public Property GDPictureVersion As String = ""
+
         Public Property AllowFacturX As Boolean = False
+
         Public Property AllowXRechnung As Boolean = False
+
         Public Property AllowZugferd10 As Boolean = True
+
         Public Property AllowZugferd2x As Boolean = True
+
+        Public Property AllowPeppolBISBill3x As Boolean = False
     End Class
 End Class

Services.ZUGFeRDService/ThreadRunner.vb

@@ -52,7 +52,9 @@ Public Class ThreadRunner
             .AllowXRechnung = _config.Config.Custom.AllowXRechnung,
             .AllowZugferd10 = _config.Config.Custom.AllowZugferd10,
             .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x,
-            .RejectionTemplateId = _config.Config.Custom.RejectionTemplateId
+            .AllowPeppolBISBill3x = _config.Config.Custom.AllowPeppolBISBill3x,
+            .RejectionTemplateId = _config.Config.Custom.RejectionTemplateId,
+            .GDPictureVersion = _config.Config.Custom.GDPictureVersion
         }
 
         oArgs = LoadFolderConfig(oArgs)
@@ -64,6 +66,7 @@ Public Class ThreadRunner
         _logger.Debug("MaxAttachmentSizeInMegaBytes: [{0}]", oArgs.MaxAttachmentSizeInMegaBytes)
         _logger.Debug("MinFileAgeInMinutes: [{0}]", oArgs.MinFileAgeInMinutes)
         _logger.Debug("RejectionTemplateId: [{0}]", oArgs.RejectionTemplateId)
+        _logger.Debug("GDPictureVersion: [{0}]", oArgs.GDPictureVersion)
 
         _jobArguments = oArgs