Merge Commit. Was kann schon schief gehen...
This commit is contained in:
@@ -3888,15 +3888,15 @@ Public Class AvisoStatusFunctions
|
||||
Dim EMails_CC As String = ""
|
||||
Dim EMails_BCC As String = ""
|
||||
|
||||
Dim Emails_list_sent As New SDL.cEmailBenachrichtigungList
|
||||
Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
|
||||
|
||||
|
||||
eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr)
|
||||
|
||||
'Frächter und Avisierer werden getrennt voneinander eingelesen, damit es kein Problem mit gesendeten VBD/Steuerbescheiden gibt!
|
||||
If AVISO.Frächter_KdNr <> AVISO.Auftraggeber_KdNr Then
|
||||
eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr)
|
||||
End If
|
||||
|
||||
@@ -3905,14 +3905,14 @@ Public Class AvisoStatusFunctions
|
||||
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
|
||||
Next
|
||||
For Each s In SENDUNG_LIST
|
||||
eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr)
|
||||
eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr)
|
||||
|
||||
eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr)
|
||||
eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr)
|
||||
Next
|
||||
|
||||
@@ -3937,14 +3937,14 @@ Public Class AvisoStatusFunctions
|
||||
Dim EMails_BCC As String = ""
|
||||
|
||||
|
||||
Dim Emails_list_sent As New SDL.cEmailBenachrichtigungList
|
||||
Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
|
||||
|
||||
eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr, ForceMail)
|
||||
|
||||
'Frächter und Avisierer werden getrennt voneinander eingelesen, damit es kein Problem mit gesendeten VBD/Steuerbescheiden gibt!
|
||||
If AVISO.Frächter_KdNr <> AVISO.Auftraggeber_KdNr Then
|
||||
eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr, ForceMail)
|
||||
End If
|
||||
|
||||
@@ -3953,14 +3953,14 @@ Public Class AvisoStatusFunctions
|
||||
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
|
||||
Next
|
||||
For Each s In SENDUNG_LIST
|
||||
eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr, ForceMail)
|
||||
eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr, ForceMail)
|
||||
|
||||
eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr, ForceMail)
|
||||
eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
|
||||
Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr, ForceMail)
|
||||
Next
|
||||
|
||||
@@ -4033,15 +4033,15 @@ Public Class AvisoStatusFunctions
|
||||
mailsTXT &= "BCC: " & EMails_BCC & "<br><br>"
|
||||
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, getAbsenderEmail(), False, False, "", "", anhaenge)
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge)
|
||||
|
||||
Else
|
||||
|
||||
|
||||
EMails_BCC &= If(EMails_BCC <> "", ";", "") & getAbsenderEmail() 'Damit Mails gespeichert werden.
|
||||
EMails_BCC &= If(EMails_BCC <> "", ";", "") & VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail() 'Damit Mails gespeichert werden.
|
||||
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge) Then
|
||||
If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge) Then
|
||||
Dim txt = " E-Mail gesendet an: " & EMails
|
||||
If EMails_CC.ToString.Trim <> "" Then txt &= " CC: " & EMails_CC
|
||||
If EMails_BCC.ToString.Trim <> "" Then txt &= " BCC: " & EMails_BCC
|
||||
@@ -4067,15 +4067,7 @@ Public Class AvisoStatusFunctions
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Shared Function getAbsenderEmail() As String
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Case "IMEX" : Return "noreply@imex-group.at"
|
||||
Case "ATILLA" : Return "noreply@verag.ag"
|
||||
Case "UNISPED" : Return "No-Reply@unisped.at"
|
||||
Case "FRONTOFFICE" : Return "noreply@front-office.eu"
|
||||
Case Else : Return "noreply@verag.ag"
|
||||
End Select
|
||||
End Function
|
||||
|
||||
|
||||
Public Function setVorbereitet(AvisoID) As Boolean
|
||||
'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
|
||||
@@ -5238,140 +5230,6 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
' End Function
|
||||
|
||||
Shared Sub eMails_einlesen(Kdnr As String, art As Integer, ByRef Emails As String, ByRef Emails_CC As String, ByRef Emails_BCC As String, Emails_list_sent As SDL.cEmailBenachrichtigungList)
|
||||
'ART:
|
||||
'1=Ankunft
|
||||
'2=Freigabe
|
||||
'3=Ankunft Export
|
||||
'4=Freigabe Export
|
||||
Dim Firmen As New cFirmenDAL
|
||||
Dim Firma As New cFirma
|
||||
|
||||
Emails = ""
|
||||
Emails_CC = ""
|
||||
Emails_BCC = ""
|
||||
|
||||
If Kdnr Is Nothing OrElse Not IsNumeric(Kdnr) Then Exit Sub
|
||||
' Dim Avisierer As New cKunde(hAuftraggeber_kdnr)
|
||||
' Dim Fraechter As New cKunde(hFrächter_kdnr)
|
||||
Dim Kdnr_Mails As New SDL.cEmailBenachrichtigungList(Kdnr, art)
|
||||
' Dim Fraechter_Mails As New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
|
||||
' If hAuftraggeber_kdnr <> hFrächter_kdnr Then Fraechter_Mails = New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
|
||||
|
||||
Dim Emails_list As New SDL.cEmailBenachrichtigungList
|
||||
Dim Emails_CC_list As New SDL.cEmailBenachrichtigungList
|
||||
Dim Emails_BCC_list As New SDL.cEmailBenachrichtigungList
|
||||
|
||||
'Dim Emails As String
|
||||
For Each i In Kdnr_Mails.LIST
|
||||
If i.eb_bcc Then
|
||||
If Not existing(Kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(Kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
ElseIf i.eb_cc Then
|
||||
If Not existing(Kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(Kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
Else
|
||||
If Not existing(Kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(Kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
End If
|
||||
Next
|
||||
'For Each i In Fraechter_Mails.LIST
|
||||
' If i.eb_bcc Then
|
||||
' If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
' ElseIf i.eb_cc Then
|
||||
' If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
' Else
|
||||
' If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
' End If
|
||||
'Next
|
||||
|
||||
For Each i In Emails_list.LIST
|
||||
Emails &= i.eb_EMail & ";"
|
||||
Next
|
||||
For Each i In Emails_CC_list.LIST
|
||||
Emails_CC &= i.eb_EMail & ";"
|
||||
Next
|
||||
For Each i In Emails_BCC_list.LIST
|
||||
Emails_BCC &= i.eb_EMail & ";"
|
||||
Next
|
||||
|
||||
For Each i In Emails_list.LIST : Emails_list_sent.LIST.Add(i) : Next
|
||||
For Each i In Emails_CC_list.LIST : Emails_list_sent.LIST.Add(i) : Next
|
||||
For Each i In Emails_BCC_list.LIST : Emails_list_sent.LIST.Add(i) : Next
|
||||
|
||||
End Sub
|
||||
|
||||
Shared Sub eMails_einlesenOLD(hFrächter_kdnr As String, hAuftraggeber_kdnr As String, art As Integer, ByRef Emails As String, ByRef Emails_CC As String, ByRef Emails_BCC As String, Emails_list_sent As SDL.cEmailBenachrichtigungList)
|
||||
'ART:
|
||||
'1=Ankunft
|
||||
'2=Freigabe
|
||||
'3=Ankunft Export
|
||||
'4=Freigabe Export
|
||||
Dim Firmen As New cFirmenDAL
|
||||
Dim Firma As New cFirma
|
||||
|
||||
Emails = ""
|
||||
Emails_CC = ""
|
||||
Emails_BCC = ""
|
||||
|
||||
' Dim Avisierer As New cKunde(hAuftraggeber_kdnr)
|
||||
' Dim Fraechter As New cKunde(hFrächter_kdnr)
|
||||
Dim Avisierer_Mails As New SDL.cEmailBenachrichtigungList(hAuftraggeber_kdnr, art)
|
||||
Dim Fraechter_Mails As New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
|
||||
If hAuftraggeber_kdnr <> hFrächter_kdnr Then Fraechter_Mails = New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
|
||||
|
||||
Dim Emails_list As New SDL.cEmailBenachrichtigungList
|
||||
Dim Emails_CC_list As New SDL.cEmailBenachrichtigungList
|
||||
Dim Emails_BCC_list As New SDL.cEmailBenachrichtigungList
|
||||
|
||||
'Dim Emails As String
|
||||
For Each i In Avisierer_Mails.LIST
|
||||
If i.eb_bcc Then
|
||||
If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
ElseIf i.eb_cc Then
|
||||
If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
Else
|
||||
If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
End If
|
||||
Next
|
||||
For Each i In Fraechter_Mails.LIST
|
||||
If i.eb_bcc Then
|
||||
If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
ElseIf i.eb_cc Then
|
||||
If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
Else
|
||||
If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
|
||||
End If
|
||||
Next
|
||||
|
||||
For Each i In Emails_list.LIST
|
||||
Emails &= i.eb_EMail & ";"
|
||||
Next
|
||||
For Each i In Emails_CC_list.LIST
|
||||
Emails_CC &= i.eb_EMail & ";"
|
||||
Next
|
||||
For Each i In Emails_BCC_list.LIST
|
||||
Emails_BCC &= i.eb_EMail & ";"
|
||||
Next
|
||||
|
||||
For Each i In Emails_list.LIST : Emails_list_sent.LIST.Add(i) : Next
|
||||
|
||||
End Sub
|
||||
Shared Function existing(KundenNr As Integer, Email As String, Emails_list As List(Of SDL.cEmailBenachrichtigung), Optional ListEmails_CC_list As List(Of SDL.cEmailBenachrichtigung) = Nothing, Optional ListEmails_BCC_list As List(Of SDL.cEmailBenachrichtigung) = Nothing) As Boolean
|
||||
If Emails_list IsNot Nothing Then
|
||||
For Each i In Emails_list
|
||||
If i.eb_EMail = Email And i.eb_KundenNr = KundenNr Then Return True
|
||||
Next
|
||||
End If
|
||||
If ListEmails_CC_list IsNot Nothing Then
|
||||
For Each i In ListEmails_CC_list
|
||||
If i.eb_EMail = Email And i.eb_KundenNr = KundenNr Then Return True
|
||||
Next
|
||||
End If
|
||||
If ListEmails_BCC_list IsNot Nothing Then
|
||||
For Each i In ListEmails_BCC_list
|
||||
If i.eb_EMail = Email And i.eb_KundenNr = KundenNr Then Return True
|
||||
Next
|
||||
End If
|
||||
Return False
|
||||
End Function
|
||||
|
||||
Shared Function getGrenzstelleZollstelle(hGrenzstelle As String, AVISO As VERAG_PROG_ALLGEMEIN.cAviso) As String
|
||||
If hGrenzstelle <> "" Then
|
||||
|
||||
Reference in New Issue
Block a user