From 842f72eb64f2c834f4dcd13955a9853e9c586670 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 7 Feb 2022 11:45:11 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/LKWs.aspx                              | 2 +-
 Customers/SDL/Formtemplate IDS Tankkarte.aspx    | 2 +-
 Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index e83b863..d2f8569 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -579,7 +579,7 @@ iframe {overflow:hidden}
                         } else if (result[i]["0"] == 201 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4]){
                             iframe = ' <iframe sandbox="allow-same-origin allow-scripts" loading="lazy" seamless="seamless" runat="server" enableviewstate="true" style="width:897.5px;height:306px;overflow:hidden !important" scrolling="no" id="iframe1_MautDE" contenteditable="false" src="SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx?Kennzeichen=' + Kennz + '&CustomerID=' + customerid + '&CardNo=' + cardno + '&CustomerNo=' + Kundennr + '&SDLNr=' + SDLNr + '&History=' + History + '"></iframe>';
                             strHTML4 = '<tr style="width:897.5px" data-bs-toggle="collapse" data-bs-target="#accordion' + result[i]["3"] + '" class="clickable"><td style="width:224.375px">' + result[i]["0"] + '</td><td style="width:224.375px">' + result[i]["1"] + '</td><td style="width:224.375px">' + result[i]["2"] + '</td><td style="width:224.375px">' + result[i]["3"] + '</td><span class="sign"></span></tr><tr id="accordion' + result[i]["3"] + '" class="collapse accordion-collapse"><td colspan="4">' + iframe + '</td><tr>'
-                        } else if (result[i]["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2]  && SDLNr == id.split(',')[4]){
+                        } else if (result[i]["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4]){
                             iframe = ' <iframe sandbox="allow-same-origin allow-scripts" loading="lazy" seamless="seamless" runat="server" enableviewstate="true" style="width:897.5px;height:306px;overflow:hidden !important" scrolling="no" id="iframe1_IT_Maut" contenteditable="false" src="SDL/MAUT/Formtemplate MAUT IT.aspx?Kennzeichen=' + Kennz + '&CustomerID=' + customerid + '&CardNo=' + cardno + '&CustomerNo=' + Kundennr + '&SDLNr=' + SDLNr + '&History=' + History + '"></iframe>';
                             strHTML4 = '<tr style="width:897.5px" data-bs-toggle="collapse" data-bs-target="#accordion' + result[i]["3"] + '" class="clickable"><td style="width:224.375px">' + result[i]["0"] + '</td><td style="width:224.375px">' + result[i]["1"] + '</td><td style="width:224.375px">' + result[i]["2"] + '</td><td style="width:224.375px">' + result[i]["3"] + '</td><span class="sign"></span></tr><tr id="accordion' + result[i]["3"] + '" class="collapse accordion-collapse"><td colspan="4">' + iframe + '</td><tr>'
                         } else if (result[i]["0"] == 203 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4]){
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx
index 6cc579a..645a53e 100644
--- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx	
+++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx	
@@ -162,7 +162,7 @@
                        //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
                        //alert('Horray! 200 status code!' + result[i]);
                        // alert(result.rows.length)            
-                       if (CardNo == result["2"]) {
+                       if (Kennzeichen == result["7"] && SDLNr == result["8"]) {
                            document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result["0"]);
                            document.getElementById('<%=Txt_Lieferdat.ClientID%>').setAttribute('value', result["1"]);
                            document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result["2"]);                         
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb
index 44e0801..66adf59 100644
--- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb	
+++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb	
@@ -78,7 +78,7 @@ Partial Class Customers_Default3
         Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen)
         Dim listdetails As New List(Of List(Of String))
         For Each l2 In list2
-            If l2.KundenNr.ToString = KundenNr AndAlso l2.SDLNr = SDLNr And l2.KartenNr = Cardno Then
+            If l2.KundenNr.ToString = KundenNr AndAlso l2.SDLNr = SDLNr Then
                 Dim strtempbestelltam As String = String.Empty
                 Dim strtempLieferdatum As String = String.Empty
                 Dim strtempKartenNr As String = String.Empty
@@ -138,6 +138,7 @@ Partial Class Customers_Default3
                 list.Add(strtempGueltigBis)
                 list.Add(strtempErsatzKarte)
                 list.Add(l2.KfzKennzeichen)
+                list.Add(l2.SDLNr.ToString)
                 If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") Then
                     listdetails.Add(list)
                 End If