From 1a7507e86850975fb8ecc537ed6a6f60ae4c19b4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 1 Sep 2025 09:20:20 +0200 Subject: [PATCH] creditsafe, etc. --- .../usrCntlKundenuebersicht.Designer.vb | 42 ++++++------- SDL/kunden/usrCntlKundenuebersicht.vb | 61 +++++++++---------- .../Creditsafe/cCreditSafeAPI.vb | 9 +-- 3 files changed, 52 insertions(+), 60 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 63e99dc3..52ce76a1 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -109,6 +109,7 @@ Partial Class usrCntlKundenuebersicht Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.lblBesonderheiten = New System.Windows.Forms.Label() Me.Panel4 = New System.Windows.Forms.Panel() + Me.pbCreditsafeChanges = New System.Windows.Forms.PictureBox() Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnCreditsafe = New System.Windows.Forms.Button() @@ -262,7 +263,6 @@ Partial Class usrCntlKundenuebersicht Me.btnOP = New System.Windows.Forms.Button() Me.ContextMenuStrip5 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() - Me.PictureBox7 = New System.Windows.Forms.PictureBox() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() Me.tbOfferten.SuspendLayout() @@ -282,6 +282,7 @@ Partial Class usrCntlKundenuebersicht Me.Panel9.SuspendLayout() Me.pnlVERAGSnspr.SuspendLayout() Me.Panel4.SuspendLayout() + CType(Me.pbCreditsafeChanges, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel5.SuspendLayout() Me.Panel7.SuspendLayout() @@ -315,7 +316,6 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip4.SuspendLayout() Me.ContextMenuStrip5.SuspendLayout() - CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'cntxtAddVM @@ -1404,7 +1404,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel4.Controls.Add(Me.PictureBox7) + Me.Panel4.Controls.Add(Me.pbCreditsafeChanges) Me.Panel4.Controls.Add(Me.PictureBox6) Me.Panel4.Controls.Add(Me.FlatButton2) Me.Panel4.Controls.Add(Me.btnCreditsafe) @@ -1423,12 +1423,24 @@ Partial Class usrCntlKundenuebersicht Me.Panel4.Size = New System.Drawing.Size(662, 26) Me.Panel4.TabIndex = 37 ' + 'pbCreditsafeChanges + ' + Me.pbCreditsafeChanges.BackgroundImage = Global.SDL.My.Resources.Resources.warning2 + Me.pbCreditsafeChanges.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.pbCreditsafeChanges.Cursor = System.Windows.Forms.Cursors.Hand + Me.pbCreditsafeChanges.Location = New System.Drawing.Point(638, 3) + Me.pbCreditsafeChanges.Name = "pbCreditsafeChanges" + Me.pbCreditsafeChanges.Size = New System.Drawing.Size(18, 19) + Me.pbCreditsafeChanges.TabIndex = 133 + Me.pbCreditsafeChanges.TabStop = False + Me.pbCreditsafeChanges.Visible = False + ' 'PictureBox6 ' Me.PictureBox6.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBox6.Location = New System.Drawing.Point(308, 2) + Me.PictureBox6.Location = New System.Drawing.Point(531, 3) Me.PictureBox6.Name = "PictureBox6" Me.PictureBox6.Size = New System.Drawing.Size(18, 19) Me.PictureBox6.TabIndex = 132 @@ -1495,7 +1507,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label68.AutoSize = True Me.Label68.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label68.Location = New System.Drawing.Point(441, 6) + Me.Label68.Location = New System.Drawing.Point(416, 6) Me.Label68.Name = "Label68" Me.Label68.Size = New System.Drawing.Size(30, 13) Me.Label68.TabIndex = 4 @@ -1519,7 +1531,7 @@ Partial Class usrCntlKundenuebersicht Me.lblHoechstkredit.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblHoechstkredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHoechstkredit.ForeColor = System.Drawing.Color.Black - Me.lblHoechstkredit.Location = New System.Drawing.Point(335, 5) + Me.lblHoechstkredit.Location = New System.Drawing.Point(310, 5) Me.lblHoechstkredit.MaxLineLength = -1 Me.lblHoechstkredit.MaxLines_Warning = "" Me.lblHoechstkredit.MaxLines_Warning_Label = Nothing @@ -1615,7 +1627,7 @@ Partial Class usrCntlKundenuebersicht Me.lblBonitaetsdatum.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblBonitaetsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblBonitaetsdatum.ForeColor = System.Drawing.Color.Black - Me.lblBonitaetsdatum.Location = New System.Drawing.Point(472, 6) + Me.lblBonitaetsdatum.Location = New System.Drawing.Point(447, 6) Me.lblBonitaetsdatum.MaxLineLength = -1 Me.lblBonitaetsdatum.MaxLines_Warning = "" Me.lblBonitaetsdatum.MaxLines_Warning_Label = Nothing @@ -3430,18 +3442,6 @@ Partial Class usrCntlKundenuebersicht Me.ToolStripMenuItem12.Size = New System.Drawing.Size(150, 30) Me.ToolStripMenuItem12.Text = "Schnelldruck" ' - 'PictureBox7 - ' - Me.PictureBox7.BackgroundImage = Global.SDL.My.Resources.Resources.warning2 - Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox7.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBox7.Location = New System.Drawing.Point(638, 3) - Me.PictureBox7.Name = "PictureBox7" - Me.PictureBox7.Size = New System.Drawing.Size(18, 19) - Me.PictureBox7.TabIndex = 133 - Me.PictureBox7.TabStop = False - Me.PictureBox7.Visible = False - ' 'usrCntlKundenuebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3489,6 +3489,7 @@ Partial Class usrCntlKundenuebersicht Me.pnlVERAGSnspr.PerformLayout() Me.Panel4.ResumeLayout(False) Me.Panel4.PerformLayout() + CType(Me.pbCreditsafeChanges, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel5.ResumeLayout(False) Me.Panel5.PerformLayout() @@ -3531,7 +3532,6 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip4.ResumeLayout(False) Me.ContextMenuStrip5.ResumeLayout(False) - CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3763,5 +3763,5 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents EORI As DataGridViewTextBoxColumn Friend WithEvents NL As DataGridViewTextBoxColumn Friend WithEvents BIN As DataGridViewTextBoxColumn - Friend WithEvents PictureBox7 As PictureBox + Friend WithEvents pbCreditsafeChanges As PictureBox End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 306d23dd..3bf61a51 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -672,7 +672,7 @@ Public Class usrCntlKundenuebersicht ' Button4.Visible = False ' Button5.Visible = False - PictureBox7.Visible = IIf(KUNDE_ERW.kde_CreditSaveId <> "", True, False) + pbCreditsafeChanges.Visible = IIf(KUNDE_ERW.kde_CreditSaveId <> "", True, False) AndAlso False 'aktuell noch deaktiviert!! Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Es ist ein Fehler beim Laden der Firmendaten - Allgemein aufgetreten!") @@ -1590,16 +1590,16 @@ Public Class usrCntlKundenuebersicht dgvAufschub.Rows.Clear() If AUFSCHUB IsNot Nothing Then - For Each AB In AUFSCHUB - Dim art = "" - Select Case AB.kdAkto_art - Case "10" : art = "10 - ZOLL/EUST" - Case "15" : art = "15 - ZOLL" - Case "20" : art = "20 - EUST" - End Select - dgvAufschub.Rows.Add(AB.kdAkto_id, art, AB.kdAkto_hauptzollamt, AB.kdAkto_kontonummer, AB.kdAkto_eori, AB.kdAkto_eoriNL, AB.kdAkto_bin) - Next - End If + For Each AB In AUFSCHUB + Dim art = "" + Select Case AB.kdAkto_art + Case "10" : art = "10 - ZOLL/EUST" + Case "15" : art = "15 - ZOLL" + Case "20" : art = "20 - EUST" + End Select + dgvAufschub.Rows.Add(AB.kdAkto_id, art, AB.kdAkto_hauptzollamt, AB.kdAkto_kontonummer, AB.kdAkto_eori, AB.kdAkto_eoriNL, AB.kdAkto_bin) + Next + End If dgvAufschub.ClearSelection() @@ -2839,7 +2839,7 @@ Public Class usrCntlKundenuebersicht If lblBonitaetsdatum._value <> Nothing Then - Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) + Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-1)) If lastChecked = Today Then @@ -2859,26 +2859,26 @@ Public Class usrCntlKundenuebersicht If cs.checkDateOfLastRequest(company) < lastChecked Then - Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo) - If a = vbYes Then + Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo) + If a = vbYes Then - setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren - - End If - - Else - setCreditsafereportEntry(cs, company) + setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren End If - Else + Else setCreditsafereportEntry(cs, company) End If - - Else - MsgBox("Authentifizierungsfehler bei Creditsafe-User") + + setCreditsafereportEntry(cs, company) + + End If + + + Else + MsgBox("Authentifizierungsfehler bei Creditsafe-User") End If @@ -3263,18 +3263,17 @@ Public Class usrCntlKundenuebersicht End Sub - Private Sub PictureBox7_Click(sender As Object, e As EventArgs) Handles PictureBox7.Click + Private Sub PictureBox7_Click(sender As Object, e As EventArgs) Handles pbCreditsafeChanges.Click Dim lastChecked As Date = Date.ParseExact(lblBonitaetsdatum._value, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) - Dim cs = New cCreditSafeAPI("creditsafe") If cs.authenticate() = "200" Then Dim company As New cCreditSafeAPI.Company("", "", "", "", KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "") company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-1)) Dim dt As New DataTable() - cs.getCompanyEvents(company, dt) + cs.getCompanyEvents(company, dt, True) If dt.Rows.Count > 0 Then Dim frm As New Form @@ -3287,11 +3286,6 @@ Public Class usrCntlKundenuebersicht If dt.Columns.Contains("globalEventCode") Then dt.Columns("globalEventCode").ColumnMapping = MappingType.Hidden If dt.Columns.Contains("createdDate") Then dt.Columns("createdDate").ColumnMapping = MappingType.Hidden - If dgv.Columns.Contains("newValue") Then dgv.Columns("newValue").HeaderText = "Nachher" - If dgv.Columns.Contains("oldValue") Then dgv.Columns("oldValue").HeaderText = "Vorher" - If dgv.Columns.Contains("eventDate") Then dgv.Columns("eventDate").HeaderText = "Geändert am" - - dgv.DataSource = dt If dgv IsNot Nothing Then @@ -3304,12 +3298,13 @@ Public Class usrCntlKundenuebersicht dgv.ReadOnly = True frm.Controls.Add(dgv) frm.StartPosition = FormStartPosition.CenterScreen + frm.ShowDialog() End If Else - MsgBox("Keine Creditsafe-Änderungen seit " & lastChecked.ToShortDateString) + MsgBox("Keine Creditsafe-Änderungen seit " & lastChecked.ToShortDateString) End If End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index 5a7c9163..38f4a394 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -1,9 +1,6 @@  Imports System.Net -Imports System.Runtime.InteropServices.ComTypes Imports System.Threading -Imports System.Web.UI -Imports Microsoft.VisualBasic.ApplicationServices Public Class cCreditSafeAPI @@ -133,6 +130,7 @@ Public Class cCreditSafeAPI If isMonitoring Then + Dim json As New Chilkat.JsonObject success = json.UpdateString("id", company.creditSafeId) success = json.UpdateString("personalReference", "VERAG AG") @@ -358,12 +356,12 @@ Public Class cCreditSafeAPI End Function - Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable) As String + Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False) As String VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() Dim failureDesc As String - Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" + Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & company.lastChecked, "") Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc) @@ -731,7 +729,6 @@ Public Class cCreditSafeAPI rest.AddQueryParam("countries", company.country) - If company.creditsafeNo <> "" Then 'Eindeutiger Schlüssel rest.AddQueryParam("safeNo", company.creditsafeNo)