edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CreditsafeAPI erweitert, zusätzlicher Hinweis bei bereits existierender UID-Nr.

Browse Source
This commit is contained in:
d.breimaier
2023-03-31 17:15:27 +02:00
parent fcaf27b69c
commit e0e5c2c1bc
9 changed files with 2262 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -153,7 +153,7 @@ Public Class cAdressen
If If(Straße, "") = "" Then ERROR_TXT = "Bitte geben Sie die Straße an!" : Return False
If Not hasEntry Then
'Prüfung Neuanlage:
If checkUID(KD) Then ERROR_TXT = "Die UID Nummer existiert bereits!" & vbNewLine & "Bitte prüfen, damit es zu keiner doppelten Erfassung des Kunden kommt." : Return False
If checkUID(KD) Then ERROR_TXT = "Die UID Nummer existiert bereits " & getUIDKunden(KD) & "!" & vbNewLine & "Bitte prüfen, damit es zu keiner doppelten Erfassung des Kunden kommt." : Return False
End If
Return True
End Function
@@ -166,6 +166,11 @@ Public Class cAdressen
End If
Return False
End Function
Function getUIDKunden(KD As cKunde) As String
Return SQL.getValueTxtBySql("SELECT TOP(1) '(' +[Name 1] +')' FROM [Adressen] INNER JOIN Kunden ON KundenNr=AdressenNr WHERE [UstIdKz]='" & UstIdKz & "' AND [UstIdNr]='" & UstIdNr & "' and kunden.FilialenNr='" & KD.FilialenNr & "'", "FMZOLL")
End Function
Public Function SAVE(Optional newFlag = False) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
If newFlag Then INIT_NEWKD_DATA()
If AdressenNr <= 0 Then

2
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -54,6 +54,7 @@ Public Class cKundenErweitert
Property kde_CreditSaveBonitaetsScore As Object = Nothing
Property kde_CreditSaveId As String = ""
Property kde_CreditSaveNo As String = ""
Property kde_Inkasso_Uebergeben As Boolean = False
Property kde_Inkasso_UebergebenAm As Object = Nothing
Property kde_Inkasso_GemeldeterBetrag As Object = Nothing
@@ -143,6 +144,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveBonitaetsIndex", kde_CreditSaveBonitaetsIndex))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveBonitaetsScore", kde_CreditSaveBonitaetsScore))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveId", kde_CreditSaveId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CreditSaveNo", kde_CreditSaveNo))
Return list
End Function

65
VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb
View File

@@ -97,18 +97,24 @@ Public Class cCreditSafeAPI
If company IsNot Nothing Then
rest.AddQueryParam("countries", company.country)
If company.creditsafeNo <> "" Then
rest.AddQueryParam("safeNo", company.creditsafeNo)
If company.vatNo <> "" Then
rest.AddQueryParam("vatNo", company.vatNo)
Else
If company.name <> "" Then
rest.AddQueryParam("name", company.name)
If company.vatNo <> "" Then
rest.AddQueryParam("vatNo", company.vatNo)
Else
If company.name <> "" Then
rest.AddQueryParam("name", company.name)
End If
End If
End If
If company.country <> "" Then
rest.AddQueryParam("countries", company.country)
End If
End If
rest.AddHeader("Content-Type", "application/json")
@@ -146,12 +152,11 @@ Public Class cCreditSafeAPI
Shared Function searchCompanies(conpanyname As String, vatNo As String, country As String, ByRef dataTable As DataTable) As String
Shared Function searchCompanies(company As Company, ByRef dataTable As DataTable) As String
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
Dim myUrl As String = API_STRING & "/v1/companies"
Dim company = New Company(conpanyname, vatNo, country)
Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token)
@@ -218,8 +223,8 @@ Public Class cCreditSafeAPI
End Function
Shared Function companyCreditreport(id As String, Optional withPDF As Boolean = False) As String
Dim myUrl As String = API_STRING & "/v1/companies/" & id
Shared Function getReport(company As Company, withPDF As Boolean) As String
Dim myUrl As String = API_STRING & "/v1/companies/" & company.creditSafeId
Dim acceptContentType = "application/json"
If withPDF Then
acceptContentType &= "+pdf"
@@ -240,6 +245,33 @@ Public Class cCreditSafeAPI
Return "test"
End Function
Shared Function checkDateOfLastRequest(company As Company) As Date
Dim myUrl As String = API_STRING & "/v1/companies"
Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token)
Dim json As New Chilkat.JsonObject
Dim success As Boolean = json.Load(jsonRespString)
If (success <> True) Then
Debug.WriteLine(json.LastErrorText)
Return "Verbindungsfehler"
End If
Dim companies As Chilkat.JsonArray = json.ArrayOf("companies")
Dim compObj As Chilkat.JsonObject = companies.ObjectAt(0)
Dim dateTime As New Chilkat.CkDateTime
Dim dt As New Chilkat.DtObj
Dim getAsLocal As Boolean = False
success = compObj.DateOf("dateOfLatestChange", dateTime)
Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal))
Return dateTime.GetAsTimestamp(getAsLocal)
End Function
@@ -262,18 +294,25 @@ Public Class cCreditSafeAPI
Public Class Company
Public Property creditSafeId As String
Public Property name As String
Public Property vatNo As String
Public Property country As String
Public Property creditsafeNo As String
Public Property lastChecked As Date
Public Sub New(_name As String, _vatNo As String, _country As String)
Public Sub New(_name As String, _vatNo As String, _country As String, _creditsafeNo As String, _creditSafeId As String, _lastChecked As Date)
creditSafeId = _creditSafeId
name = _name
vatNo = _vatNo
country = _country
creditsafeNo = _creditsafeNo
lastChecked = _lastChecked
End Sub
Public Sub New()
End Sub
End Class
End Class