From 80d4efd8ba38339ca291ba078b78298c3d6090df Mon Sep 17 00:00:00 2001 From: pitzm Date: Fri, 10 Jan 2025 10:37:24 +0100 Subject: [PATCH] ZUGFeRD Service: Neue Config Schalter --- Interfaces/ZUGFeRDInterface/PropertyValues.vb | 4 ++++ Jobs/ZUGFeRD/EmailFunctions.vb | 6 ++---- Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb | 6 ++---- Jobs/ZUGFeRD/WorkerArgs.vb | 4 +++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Interfaces/ZUGFeRDInterface/PropertyValues.vb b/Interfaces/ZUGFeRDInterface/PropertyValues.vb index 1835e937..c7d1764f 100644 --- a/Interfaces/ZUGFeRDInterface/PropertyValues.vb +++ b/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 diff --git a/Jobs/ZUGFeRD/EmailFunctions.vb b/Jobs/ZUGFeRD/EmailFunctions.vb index 419382d2..1871bd5e 100644 --- a/Jobs/ZUGFeRD/EmailFunctions.vb +++ b/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 diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb index ace9563a..52dd8522 100644 --- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/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 diff --git a/Jobs/ZUGFeRD/WorkerArgs.vb b/Jobs/ZUGFeRD/WorkerArgs.vb index 31c36c5e..1c7e9e24 100644 --- a/Jobs/ZUGFeRD/WorkerArgs.vb +++ b/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