diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb
index c9ac4a21..18853c48 100644
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -64,14 +64,29 @@ Public Class Form1
End Function
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
- Dim oResult = FolderBrowserDialog1.ShowDialog()
+ Dim oInputPath As String = "E:\TestFiles\ZUGFERDService\Input"
+
+ Dim DI As DirectoryInfo = New DirectoryInfo(oInputPath)
+
+ Dim oResult As DialogResult = DialogResult.OK
+ If DI.Exists = False Then
+ ' Nur öffnen, wenn Pfad ungültig ist
+ oResult = FolderBrowserDialog1.ShowDialog()
+ oInputPath = FolderBrowserDialog1.SelectedPath
+ End If
If oResult = DialogResult.OK Then
Dim args As New WorkerArgs() With {
.MaxAttachmentSizeInMegaBytes = 10,
.IgnoreRejectionStatus = False,
.NamePortal = "TEST FROM FORM",
- .WatchDirectory = FolderBrowserDialog1.SelectedPath
+ .WatchDirectory = oInputPath,
+ .SuccessDirectory = "E:\TestFiles\ZUGFERDService\Result\Success",
+ .ErrorDirectory = "E:\TestFiles\ZUGFERDService\Result\Error",
+ .OriginalEmailDirectory = "E:\TestFiles\ZUGFERDService\Result\Original_eml",
+ .RejectedEmailDirectory = "E:\TestFiles\ZUGFERDService\Result\Rejected_eml",
+ .AttachmentsSubDirectory = "Attachments",
+ .RejectionTemplateId = 1
}
args = LoadPropertyMapFor(args)
diff --git a/Services.ZUGFeRDService/Config.vb b/Services.ZUGFeRDService/Config.vb
index bd0a7b4b..ae3f1000 100644
--- a/Services.ZUGFeRDService/Config.vb
+++ b/Services.ZUGFeRDService/Config.vb
@@ -41,9 +41,14 @@
''' Minimum file age. If one file is newer than this, the whole group will be skipped
''' to ensure that all files of a group have been created.
'''
- '''
Public Property MinFileAgeInMinutes As Integer = 5
+ '''
+ ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird.
+ ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE
+ '''
+ Public Property RejectionTemplateId As Integer = 0
+
Public Property AllowFacturX As Boolean = False
Public Property AllowXRechnung As Boolean = False
Public Property AllowZugferd10 As Boolean = True
diff --git a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
index e8f7013b..a4a018da 100644
--- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
+++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
@@ -48,25 +48,29 @@
On
-
+
False
- ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll
+ P:\Install .Net\0 DD - Bibliotheken\Modules\Base\DigitalData.Modules.Base.dll
-
+
False
- ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll
+ P:\Install .Net\0 DD - Bibliotheken\Modules\Config\DigitalData.Modules.Config.dll
-
+
False
- ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll
+ P:\Install .Net\0 DD - Bibliotheken\Modules\Database\DigitalData.Modules.Database.dll
-
+
False
- ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll
+ P:\Install .Net\0 DD - Bibliotheken\Modules\Interfaces\DigitalData.Modules.Interfaces.dll
-
+
False
- ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll
+ P:\Install .Net\0 DD - Bibliotheken\Modules\Jobs\DigitalData.Modules.Jobs.dll
+
+
+ False
+ P:\Install .Net\0 DD - Bibliotheken\Modules\Logging\DigitalData.Modules.Logging.dll
diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb
index 0468af9d..eecef51c 100644
--- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb
+++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
-
+
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
-
+
+
diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb
index 9662eef3..531a5448 100644
--- a/Services.ZUGFeRDService/ThreadRunner.vb
+++ b/Services.ZUGFeRDService/ThreadRunner.vb
@@ -51,7 +51,8 @@ Public Class ThreadRunner
.AllowFacturX = _config.Config.Custom.AllowFacturX,
.AllowXRechnung = _config.Config.Custom.AllowXRechnung,
.AllowZugferd10 = _config.Config.Custom.AllowZugferd10,
- .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x
+ .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x,
+ .RejectionTemplateId = _config.Config.Custom.RejectionTemplateId
}
oArgs = LoadFolderConfig(oArgs)
@@ -62,6 +63,7 @@ Public Class ThreadRunner
_logger.Debug("IgnoreRejectionStatus: [{0}]", oArgs.IgnoreRejectionStatus)
_logger.Debug("MaxAttachmentSizeInMegaBytes: [{0}]", oArgs.MaxAttachmentSizeInMegaBytes)
_logger.Debug("MinFileAgeInMinutes: [{0}]", oArgs.MinFileAgeInMinutes)
+ _logger.Debug("RejectionTemplateId: [{0}]", oArgs.RejectionTemplateId)
_jobArguments = oArgs