ZUGFeRD Service: Neue Config Schalter

Interfaces/ZUGFeRDInterface/PropertyValues.vb

@@ -35,6 +35,10 @@ Public Class PropertyValues
     Public Class MissingProperty
         Public Description As String
         Public XMLPath As String
+
+        Public Overrides Function ToString() As String
+            Return XMLPath
+        End Function
     End Class
 
     Public Function CheckPropertyValues(pDocument As Object, PropertyMap As Dictionary(Of String, XmlItemProperty), MessageId As String) As CheckPropertyValuesResult

Jobs/ZUGFeRD/EmailFunctions.vb

@@ -1,13 +1,11 @@
 Imports System.Collections.Generic
 Imports System.Data
+Imports System.Data.SqlClient
 Imports System.IO
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Jobs.ImportZUGFeRDFiles
-Imports System.Data.SqlClient
-Imports FirebirdSql.Data
 Imports DigitalData.Modules.Interfaces.PropertyValues
+Imports DigitalData.Modules.Logging
 
 Namespace ZUGFeRD
     Public Class EmailFunctions

Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb

@@ -4,10 +4,10 @@ Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Linq
 Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Interfaces
 Imports DigitalData.Modules.Interfaces.Exceptions
-Imports DigitalData.Modules.Interfaces.PropertyValues
 Imports DigitalData.Modules.Jobs.Exceptions
 Imports DigitalData.Modules.Logging
 
@@ -73,8 +73,7 @@ Public Class ImportZUGFeRDFiles
 
         _logger.Debug("Registering GDPicture License")
         If _mssql IsNot Nothing Then
-            Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
-            _gdpictureLicenseKey = _mssql.GetScalarValue(oSQL)
+            _gdpictureLicenseKey = ConfigDbFunct.GetProductLicense("GDPICTURE", "11.2024", _logConfig, _mssql.CurrentConnectionString)
         Else
             _logger.Warn("GDPicture License could not be registered! MSSQL is not enabled!")
             Throw New ArgumentNullException("MSSQL")
@@ -83,7 +82,6 @@ Public Class ImportZUGFeRDFiles
 
     Public Sub Start(Arguments As Object) Implements IJob.Start
         Dim oArgs As WorkerArgs = Arguments
-        'Dim oPropertyExtractor = New PropertyValues(_logConfig)
         Dim oAttachmentExtractor = New PDFEmbeds(_logConfig)
 
         _EmailOutAccountId = oArgs.EmailOutProfileId

Jobs/ZUGFeRD/WorkerArgs.vb

@@ -18,13 +18,15 @@ Public Class WorkerArgs
     Public EmailOutProfileId As Integer = 0
     Public RejectionTemplateId As Integer = 0
 
-    ' Misc Flag Parameters
+    ' Misc Parameters
     Public ExceptionEmailAddress As String = Nothing
     Public IgnoreRejectionStatus As Boolean = False
     Public MaxAttachmentSizeInMegaBytes As Integer = -1
     Public MinFileAgeInMinutes As Integer = 5
     Public NamePortal As String = "NO PORTAL_NAME IN CONFIG"
+    Public GDPictureVersion As String = String.Empty
 
+    ' Feature Flags
     Public AllowFacturX As Boolean = True
     Public AllowXRechnung As Boolean = True
     Public AllowZugferd10 As Boolean = True