Email Service Logging

DocumentViewer Debug
MS DD References angepasst weil Ordner nur Modules
2025-06-24 14:39:24 +02:00 · 2025-06-23 08:56:47 +02:00
10 changed files with 72 additions and 88 deletions
--- a/Controls.DocumentViewer/DocumentViewer.resx
+++ b/Controls.DocumentViewer/DocumentViewer.resx
@@ -161,26 +161,6 @@
        NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy
        OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00
        LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
-        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
-        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
-        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
-        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
-        Cjwvc3ZnPgs=
 </value>
  </data>
  <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -243,6 +223,26 @@
        ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
        LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+        Cjwvc3ZnPgs=
 </value>
  </data>
  <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -65,7 +65,7 @@ Public Class DocumentViewer
    Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load
        UpdateMainUi()
    End Sub
-    'hallo
+
    Public Class ToolbarSettings
        Public Property ShowPrintButton As Boolean = True
        Public Property ShowFitWidthButton As Boolean = True
@@ -89,14 +89,9 @@ Public Class DocumentViewer
    ''' </summary>
    ''' <param name="pLogConfig">A LogConfig object</param>
    ''' <param name="pLicenseKey">The GDPicture.NET License Key</param>
-    Public Function Init(pLogConfig As LogConfig, pLicenseKey As String, Optional pToolbarSettings As ToolbarSettings = Nothing) As Boolean
+    Public Function Init(pLogConfig As LogConfig, pLicenseKey As String, pToolbarSettings As ToolbarSettings) As Boolean
        _logConfig = pLogConfig
        _logger = pLogConfig.GetLogger()
-
-        If pToolbarSettings Is Nothing Then
-            pToolbarSettings = New ToolbarSettings
-        End If
-
        Try

            _email = New Email2(pLogConfig)
@@ -119,6 +114,10 @@ Public Class DocumentViewer
        End Try
    End Function

+    'Public Function Init(pLogConfig As LogConfig, pLicenseKey As String, pToolbarSettings As ToolbarSettings) As Boolean
+    '    Return Init(pLogConfig, pLicenseKey, New ToolbarSettings())
+    'End Function
+
    ''' <summary>
    ''' Load a file from a path and display it
    ''' </summary>
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -78,21 +78,17 @@
    <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Config">
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Messaging, Version=1.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Messaging">
+      <HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -1,5 +1,4 @@
-Imports System.Globalization
-Imports System.IO
+Imports System.IO
 Imports System.Security.Cryptography
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
@@ -192,11 +191,7 @@ Public Class Form1

                WriteLog("Valid Properties: [{0}]", oResult2.ValidProperties.Count)
                For Each Prop In oResult2.ValidProperties
-                    If Prop.Value.Length > 250 Then
-                        WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value.Substring(0, 250))
-                    Else
-                        WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value)
-                    End If
+                    WriteLog("Property: [{0}] = [{1}]", Prop.Description, Prop.Value)
                Next

                WriteLog("Missing Properties: [{0}]", oResult2.MissingProperties.Count)
--- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
+++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj
@@ -53,20 +53,25 @@
    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Config, Version=1.2.2.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Interfaces">
-      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Jobs">
-      <HintPath>..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Jobs, Version=1.8.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
@@ -290,7 +295,7 @@
  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
--- a/Services.EmailService/EmailService.vb
+++ b/Services.EmailService/EmailService.vb
@@ -275,10 +275,10 @@ Public Class EmailService
        End Try
    End Function

-    Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer)
+    Private Function SendEmailFrom(pDatabase As DatabaseType, pMSSQLInstance As MSSQLServer)
        Try
            Dim oSQL As String = String.Empty
-            Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(Database, MSSQLInstance)
+            Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(pDatabase, pMSSQLInstance)
            Dim oEmailQueue As DataTable = Nothing

            If IsNothing(oEmailAccounts) Then
@@ -291,7 +291,7 @@ Public Class EmailService
                Return False
            End If

-            Select Case Database
+            Select Case pDatabase
                Case DatabaseType.Firebird
                    oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
                    oEmailQueue = _Firebird.GetDatatable(oSQL)
@@ -300,10 +300,10 @@ Public Class EmailService
                        _Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
                        oSQL = My.Settings.MSSQL_SELECT
                    Else
-                        oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
+                        oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> '' ORDER BY GUID"
                    End If

-                    oEmailQueue = MSSQLInstance.GetDatatable(oSQL)
+                    oEmailQueue = pMSSQLInstance.GetDatatable(oSQL)
            End Select

            If IsNothing(oEmailQueue) Then
@@ -326,7 +326,7 @@ Public Class EmailService

                    Dim oAccountQueue As DataRow()

-                    Select Case Database
+                    Select Case pDatabase
                        Case DatabaseType.Firebird
                            oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC")
                        Case Else
@@ -339,7 +339,7 @@ Public Class EmailService
                        Continue For
                    End If

-                    _Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count)
+                    _Logger.Info("Preparing to send [{0}] mails for Email-Account [{1}]", oAccountQueue.Count, oAccount.Guid)

                    ' ======= Initialize Sender =======

@@ -379,7 +379,7 @@ Public Class EmailService
                        Dim ATT1_RELATED_ID = String.Empty
                        Dim ATT1_REL_TYPE = String.Empty

-                        Select Case Database
+                        Select Case pDatabase
                            Case DatabaseType.Firebird
                                oGuid = oRow.Item("GUID")

@@ -421,7 +421,7 @@ Public Class EmailService
                        If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then
                            _Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...")
                            If ATT1_REL_TYPE = "EnvelopeResult" Then
-                                GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance)
+                                GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, pMSSQLInstance)
                            End If
                            If IsNothing(_AttachmentByteData) = False Then
                                Dim oTempFolder = _TempFiles.TempPath
@@ -455,13 +455,13 @@ Public Class EmailService
                            oTotalSent.Add(oEmailTo)
                            oSuccessfulSent.Add(oEmailTo)

-                            Select Case Database
+                            Select Case pDatabase
                                Case DatabaseType.Firebird
                                    oSQL = GetFirebirdUpdateString(oComment, oGuid)
                                    _Firebird.ExecuteNonQuery(oSQL)
                                Case DatabaseType.MSSQL
                                    oSQL = GetSQLUpdateString(oComment, oGuid)
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
+                                    pMSSQLInstance.ExecuteNonQuery(oSQL)
                            End Select
                            _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}")

@@ -469,7 +469,7 @@ Public Class EmailService
                            oTotalSent.Add(oEmailTo)
                            oFailedSent.Add(oEmailTo)

-                            Select Case Database
+                            Select Case pDatabase
                                Case DatabaseType.MSSQL
                                    Dim oErrorMessage As String
                                    If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
@@ -478,7 +478,7 @@ Public Class EmailService
                                        oErrorMessage = $"Could not sent email to email adress. Check log!"
                                    End If
                                    oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
-                                    MSSQLInstance.ExecuteNonQuery(oSQL)
+                                    pMSSQLInstance.ExecuteNonQuery(oSQL)

                            End Select
                        End If
--- a/Services.EmailService/My
+++ b/Services.EmailService/My
@@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>

 <Assembly: AssemblyVersion("1.7.3.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.7.3.0")>
--- a/Services.ZUGFeRDService/My
+++ b/Services.ZUGFeRDService/My
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("DDZUGFeRDService")>
 <Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.9.0.0")>
+<Assembly: AssemblyTrademark("2.8.9.0")>

 <Assembly: ComVisible(False)>

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.9.0.0")>
-<Assembly: AssemblyFileVersion("2.9.0.0")>
+<Assembly: AssemblyVersion("2.8.9.0")>
+<Assembly: AssemblyFileVersion("2.8.9.0")>
--- a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
@@ -68,7 +68,7 @@ namespace ZUGFeRDRESTService.Controllers
                AllowXRechnung_Filename = _AllowXRechnung,
                AllowZugferd_1_0_Schema = _AllowZugferd10,
                AllowZugferd_2_x_Schema = _AllowZugferd2x,
-                AllowPeppol_3_x_Schema = _AllowPeppolBISBill3x
+                AllowPeppol_3017_Schema = _AllowPeppolBISBill3x
            });
            _props = new PropertyValues(_logConfig);

@@ -86,12 +86,6 @@ namespace ZUGFeRDRESTService.Controllers
                    Concat(_propertyMap).
                    ToDictionary(kv => kv.Key, kv => kv.Value);

-            if (_AllowPeppolBISBill3x == true)
-                _propertyMap = oPropertyMap.
-                    Where(kv => kv.Value.Specification == UBL_SPEC_21).
-                    Concat(_propertyMap).
-                    ToDictionary(kv => kv.Key, kv => kv.Value);
-
            _logger.Debug("Property Map filtered: [{0}] entries found.", _propertyMap.Count);

            _logger.Debug("Validation Controller initialized!");
@@ -380,13 +374,7 @@ namespace ZUGFeRDRESTService.Controllers
        public bool InsertPropertyMap(ValidProperty pProperty, string pMessageId)
        {
            try
-            {
-                if (pProperty.ItemType == 3)
-                {
-                    // Wir speichern keine Attachment-Werte in die DB
-                    return true;
-                }
-
+            {             
                var oSql = $"INSERT INTO {pProperty.TableName} " +
                    "(REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, CREATEDWHO, SPEC_NAME, GROUP_COUNTER, IS_REQUIRED) VALUES " +
                    "(@REFERENCE_GUID, @ITEM_DESCRIPTION, @ITEM_VALUE, @CREATEDWHO, @SPEC_NAME, @GROUP_COUNTER, @IS_REQUIRED)";
--- a/WEBSERVICES/ZUGFeRDRESTService/Database.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Database.cs
@@ -5,6 +5,7 @@ using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
 using System.Data;
 using DigitalData.Modules.Logging;
+using DigitalData.Modules.Interfaces.Peppol.BISBilling30CreditNote;
 using System;

 namespace ZUGFeRDRESTService
Author	SHA1	Message	Date
Developer01	4fdab8d417	Email Service Logging DocumentViewer Debug	2025-06-24 14:39:24 +02:00
Developer01	245192eed9	MS DD References angepasst weil Ordner nur Modules	2025-06-23 08:56:47 +02:00