From 32346c075ae783bf9c2115fd832f22bb05998bd8 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 26 Apr 2024 08:59:22 +0200 Subject: [PATCH] MS Interfaces Update GDPicture --- Interfaces/My Project/AssemblyInfo.vb | 4 ++-- Interfaces/ZUGFeRDInterface/PropertyValues.vb | 4 +++- Messaging/Mail/MailSender.vb | 17 ++++++++++------- Messaging/Mail/MailSession.vb | 1 + 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Interfaces/My Project/AssemblyInfo.vb b/Interfaces/My Project/AssemblyInfo.vb index 6efc10ea..ef4ce982 100644 --- a/Interfaces/My Project/AssemblyInfo.vb +++ b/Interfaces/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Interfaces/ZUGFeRDInterface/PropertyValues.vb b/Interfaces/ZUGFeRDInterface/PropertyValues.vb index 63cfb0d7..3180d8ea 100644 --- a/Interfaces/ZUGFeRDInterface/PropertyValues.vb +++ b/Interfaces/ZUGFeRDInterface/PropertyValues.vb @@ -104,7 +104,9 @@ Public Class PropertyValues Dim oPropertyValue = oColumn.Value.ElementAtOrDefault(oRowIndex) _logger.Debug("Processing itemSpecification *TableColumn* [{0}].", oTableColumn) - + If oTableColumn = "INVOICE_SELLER_EMAIL" Then + Console.WriteLine("INVOICE_SELLER_EMAIL") + End If If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then If oColumn.Key.IsRequired Then _logger.Warn($"{MessageId} # oPropertyValue for specification [{oTableColumn}] is empty or not found but is required. Continuing with Empty String.") diff --git a/Messaging/Mail/MailSender.vb b/Messaging/Mail/MailSender.vb index eb636aaa..c3f41cfa 100644 --- a/Messaging/Mail/MailSender.vb +++ b/Messaging/Mail/MailSender.vb @@ -40,7 +40,6 @@ Namespace Mail Try Dim oSuccessfulSends As New List(Of String) Dim oFailedSends As New List(Of String) - For Each oSendToAddress In pSendTo Dim oResult = SendMailTo(oSendToAddress, pSendFrom, pSubject, pBody, pCreationTime, pAttachments, pTest) @@ -54,8 +53,11 @@ Namespace Mail Logger.Debug("Sent [{0}] mails.", pSendTo.Count) Logger.Debug("Successful [{0}]", oSuccessfulSends.Count) Logger.Debug("Failed [{0}]", oFailedSends.Count) - - Return True + If oFailedSends.Count > 0 Then + Return False + Else + Return True + End If Catch ex As Exception Logger.Warn("Error in SendMail() - while sending mail [{0} - Subject: {1}]", pSendTo, pSubject) Logger.Error(ex) @@ -74,7 +76,7 @@ Namespace Mail Return False End If - Logger.Debug("Preparing to send mail to [{0}]", pSendTo) + Logger.Debug("Preparing to send mail: {0} ...", pSendTo + "|" + pSubject) Dim oMailBuilder As New Limilabs.Mail.MailBuilder() oMailBuilder.From.Add(New Limilabs.Mail.Headers.MailBox(pSendFrom)) @@ -87,16 +89,17 @@ Namespace Mail Logger.Debug("Adding [{0}] attachments to mail", pAttachments.Count) oMailBuilder = AddAttachments(oMailBuilder, pAttachments) - Logger.Debug("Now sending mail..") + Logger.Debug("Now sending mail...") Dim oMail = oMailBuilder.Create() oClient.SendMessage(oMail) - Logger.Info("Mail to [{0}] has been sent.", pSendTo + "|" + pSubject) + Logger.Info("Mail [{0}] has been sent.", pSendTo + "|" + pSubject) Return True Catch ex As Exception - Logger.Warn("Error in SendMailTo() to [{0} - Subject: {1}]", pSendTo, pSubject) + Logger.Warn("Error in SendMailTo() - Mailinfo: {0} - Subject: {1}", pSendTo, pSubject) Logger.Error(ex) + MailSession.DisconnectFromServer() Return False End Try diff --git a/Messaging/Mail/MailSession.vb b/Messaging/Mail/MailSession.vb index 5b9fa556..df3112d9 100644 --- a/Messaging/Mail/MailSession.vb +++ b/Messaging/Mail/MailSession.vb @@ -177,6 +177,7 @@ Namespace Mail Catch ex As Exception Logger.Warn("Error while connecting with Auth type SSL!") + Logger.Warn($"Error-message: {ex.Message}") Logger.Error(ex) Session.Error = ex