Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2024-02-26 12:42:59 +01:00
parent 39dd8a0501 df525119eb
commit 0a16c5e958
22 changed files with 2305 additions and 516 deletions
--- a/SDL/kunden/usrCntlKundenBesonderheiten.vb
+++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb
@@ -85,7 +85,9 @@ Public Class usrCntlKundenBesonderheiten
    End Sub
    Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")

-        dgvBesonderheiten.Columns.Clear()
+        If dgvBesonderheiten.Columns IsNot Nothing Then
+            dgvBesonderheiten.Columns.Clear()
+        End If

        If kdnrTmp > 0 Then Me.kdNr = kdnrTmp
        If kdNr <= 0 Then Exit Sub
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -1789,34 +1789,37 @@ Public Class usrCntlKundenuebersicht


    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        If ADRESSE.UstIdNr Is Nothing Then Exit Sub
-        If ADRESSE.UstIdKz Is Nothing Then Exit Sub
-        If ADRESSE.UstIdKz = "" Then Exit Sub
-        If ADRESSE.UstIdNr = "" Then Exit Sub

-        sender.BackgroundImage = My.Resources.wait
-        ' Button5.Visible = False
+        checkUIDNr(sender)
+
+        'If ADRESSE.UstIdNr Is Nothing Then Exit Sub
+        'If ADRESSE.UstIdKz Is Nothing Then Exit Sub
+        'If ADRESSE.UstIdKz = "" Then Exit Sub
+        'If ADRESSE.UstIdNr = "" Then Exit Sub
+
+        'sender.BackgroundImage = My.Resources.wait
+        '' Button5.Visible = False


-        Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
-        FO.initValues()
+        'Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
+        'FO.initValues()

-        If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
-            Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
-            If UID_TMP IsNot Nothing Then
-                If UID_TMP.uid_valid Then
-                    setKD(kdNr)
-                    sender.BackgroundImage = My.Resources.ok
-                Else
-                    sender.BackgroundImage = My.Resources.del
-                End If
-            Else
-                sender.BackgroundImage = My.Resources.fragezeichen
-            End If
+        'If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
+        '    Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
+        '    If UID_TMP IsNot Nothing Then
+        '        If UID_TMP.uid_valid Then
+        '            setKD(kdNr)
+        '            sender.BackgroundImage = My.Resources.ok
+        '        Else
+        '            sender.BackgroundImage = My.Resources.del
+        '        End If
+        '    Else
+        '        sender.BackgroundImage = My.Resources.fragezeichen
+        '    End If

-            FO.Call_Web_Service_MethodUID_Logout_NEU2020()
+        '    FO.Call_Web_Service_MethodUID_Logout_NEU2020()

-        End If
+        'End If

        ''  If cProgramFunctions.validUID(ADRESSE.UstIdKz, ADRESSE.UstIdNr) Then
        'Dim UID = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefung(ADRESSE.AdressenNr, True)
@@ -2764,7 +2767,7 @@ Public Class usrCntlKundenuebersicht
                        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)
+                            setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren

                        End If

@@ -2792,7 +2795,7 @@ Public Class usrCntlKundenuebersicht

    End Sub

-    Private Sub setCreditSafeEntry(company As cCreditSafeAPI.Company, PDF As Byte(), krn As Integer)
+    Private Sub setCreditSafeEntry(company As cCreditSafeAPI.Company, PDF As Byte(), krn As Integer, Optional forcedRequest As Boolean = False)

        If company.csFailure <> "" Then
            MsgBox(company.csFailure)
@@ -2816,6 +2819,7 @@ Public Class usrCntlKundenuebersicht
        cBonitaetsauskunft.ba_CreditSaveBonitaetsScore = Nothing
        cBonitaetsauskunft.ba_CreditSaveBonitaetsIndex = Nothing
        cBonitaetsauskunft.ba_CreditSaveRisikoklasse = Nothing
+        cBonitaetsauskunft.ba_forcedRequest = forcedRequest

        cBonitaetsauskunft.ba_KundenNr = (kdNr)
        cBonitaetsauskunft.ba_Datum = Now()
@@ -2848,6 +2852,7 @@ Public Class usrCntlKundenuebersicht
            cBonitaetsauskunft.ba_Hoechstkredit = 0
        End If

+        cBonitaetsauskunft.ba_UID = company.vatNo
        cBonitaetsauskunft.ba_Bankverbindung = company.csBank
        cBonitaetsauskunft.ba_Zahlungsweise = ""
        cBonitaetsauskunft.ba_GFName = company.csCEO
@@ -2973,7 +2978,7 @@ Public Class usrCntlKundenuebersicht
        genUIDEORIList(kdNr, "EORI")
    End Sub

-    Private Sub setCreditsafereportEntry(cs As cCreditSafeAPI, company As cCreditSafeAPI.Company)
+    Private Sub setCreditsafereportEntry(cs As cCreditSafeAPI, company As cCreditSafeAPI.Company, Optional forecedReqest As Boolean = False)

        Dim pdfObject As Byte() = Nothing

@@ -2989,9 +2994,29 @@ Public Class usrCntlKundenuebersicht
            setCreditSafeEntry(company, Nothing, kdNr)
            MsgBox("Fehler beim Erstellen des PDF-Dokuments" & vbNewLine & failureDesc)
        Else
-            setCreditSafeEntry(company, pdfObject, kdNr)
+            setCreditSafeEntry(company, pdfObject, kdNr, forecedReqest)
        End If

+        If company.vatNo <> "" AndAlso checkNullStr(ADRESSE.UstIdKz) = "" AndAlso checkNullStr(ADRESSE.UstIdNr) = "" Then
+            'set and check uid nr
+
+            Dim countryKz = company.vatNo.Substring(0, 2)
+
+            ADRESSE.UstIdKz = countryKz
+            ADRESSE.UstIdNr = company.vatNo.Replace(countryKz, "").Replace(" ", "")
+            ADRESSE.SAVE()
+            Dim validUID As Boolean = False
+            checkUIDNr(, validUID)
+            If Not validUID Then
+                ADRESSE.UstIdKz = ""
+                ADRESSE.UstIdNr = ""
+                ADRESSE.SAVE()
+            End If
+
+        End If
+
+
+
    End Sub


@@ -3019,4 +3044,38 @@ Public Class usrCntlKundenuebersicht
        Dim webAddress As String = "https://wiki.verag.ag/software/aviso/howtos/Creditsafe"
        Process.Start(webAddress)
    End Sub
+
+    Private Sub checkUIDNr(Optional sender As Object = Nothing, Optional ByRef validUID As Boolean = False)
+
+        If ADRESSE.UstIdNr Is Nothing Then Exit Sub
+        If ADRESSE.UstIdKz Is Nothing Then Exit Sub
+        If ADRESSE.UstIdKz = "" Then Exit Sub
+        If ADRESSE.UstIdNr = "" Then Exit Sub
+
+        If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.wait
+        ' Button5.Visible = False
+
+
+        Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
+        FO.initValues()
+
+        If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
+            Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
+            If UID_TMP IsNot Nothing Then
+                If UID_TMP.uid_valid Then
+                    setKD(kdNr)
+                    If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.ok
+                    validUID = True
+                Else
+                    If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.del
+                End If
+            Else
+                If sender IsNot Nothing Then sender.BackgroundImage = My.Resources.fragezeichen
+            End If
+
+            FO.Call_Web_Service_MethodUID_Logout_NEU2020()
+
+        End If
+
+    End Sub
 End Class
--- a/SDL/kunden/usrCntlOfferte.vb
+++ b/SDL/kunden/usrCntlOfferte.vb
@@ -415,9 +415,12 @@ Public Class usrCntlOfferte

    Private Sub btnStandardLaden_Click(sender As Object, e As EventArgs) Handles btnStandardLaden.Click

+
+
        Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(kdNr)
        Dim FIRMA_TMP = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr)

+        If Not vbYes = MsgBox("Möchten Sie die Standardofferte für den Kunden " & KUNDE.KundenNr & " laden?" & vbNewLine & "Aktuelle Offerteneinstellungen werden gelöscht.", vbYesNo) Then Exit Sub

        edit = True
        handleEditMode(edit)
@@ -431,7 +434,6 @@ Public Class usrCntlOfferte
            currentOffert.LOAD_POSITIONEN()
            If currentOffert.POSITIONEN.Count = 0 Then '
                currentOffert.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, FIRMA_TMP)
-
            End If

            dgvOfferteNew.GetOrder()