diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx index d961a84..6cc579a 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx @@ -142,8 +142,7 @@ let data = {}; data['Kennzeichen'] = id; data['Kundennr'] = CustomerID; - data['CardNo'] = Cardnummer; - data['CustomerNo'] = CustomerNo; + data['CardNo'] = Cardnummer; data['SDLNr'] = SDLNr; data['History'] = History; diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb index d64714d..44e0801 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, Cardno As String, CustomerNo As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, Cardno As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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.KfzKennzeichen = Kennzeichen And l2.KundenNr = KundenNr And l2.KartenNr = Cardno And l2.SDLNr = SDLNr And l2.History = History Then + If l2.KundenNr.ToString = KundenNr AndAlso l2.SDLNr = SDLNr And l2.KartenNr = Cardno Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempKartenNr As String = String.Empty diff --git a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx index 798772c..aec46f5 100644 --- a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx +++ b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx @@ -177,7 +177,7 @@ document.getElementById('<%=txt_CardNr.ClientID%>').setAttribute('value', result["3"]); document.getElementById('<%=txt_PIN.ClientID%>').setAttribute('value', result["4"]); document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["5"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["6"]); + document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["8"]); } diff --git a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx.vb b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx.vb index 1289dc9..c6433e6 100644 --- a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate UTA Karte.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.ToString = SDLNr And l2.KartenNr.ToString = CardNo Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempKartenNr As String = String.Empty @@ -91,6 +91,7 @@ Partial Class Customers_Default3 Dim strtempGesperrt As String = String.Empty Dim strtempDefekt As String = String.Empty Dim strtempArchivt As String = String.Empty + Dim strtempGueltigbis As String = String.Empty If IsNothing(l2.Bestelldatum) = False Then strtempbestelltam = l2.Bestelldatum.ToString @@ -128,6 +129,9 @@ Partial Class Customers_Default3 If IsNothing(l2.Archiviert) = False Then strtempArchivt = l2.Archiviert.ToString End If + If IsNothing(l2.GültigBis) = False Then + strtempGueltigbis = l2.GültigBis.ToString + End If ' list.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr, strtempKaut, strtempArchivt, strtempBelegNr, strtempErsatzkarte, strtempDefektAm, strtempFahrer, strtempGesperrtAm, strtempHistory, strtempHasEntry, strtempFlottenPIN, strtempFREJUS_CARD_Nr, strtempGestohlenAm, strtempLKWAbgemeldet, strtempLKWAbgemeldetAM, strtempLieferdatum, strtempMasterPIN, strtempMOTORWAY_CARD_Nr, strtempMSE_Kd_Nr, strtempOBUID, strtempPAN_Nr, strtempPartner, strtempPIN, strtempRefKundenNr, strtempRetourniert, strtempRetourniertAm, strtempSachbearbeiter, strtempSERIE_Nr, strtempStatus, strtempTelepassErsatzkarte, strtempTelepassErsatzkarteAm, strtempTELEPASS_Kd_Nr, strtempTELEPASS_Nr, strtempUmstellungsdatum, strtempVerloren, strtempVertragsabschlussdatum, strtempVertragsNr, strtempVIACARD, strtempAenderungsdatum, strtempVermerk)) @@ -139,6 +143,7 @@ Partial Class Customers_Default3 list.Add(strtempVermerk) list.Add(strtempRetourniert) list.Add(l2.KfzKennzeichen) + list.Add(strtempGueltigbis) 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 diff --git a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb index 59877c5..3db030c 100644 --- a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) 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 AndAlso l2.History = History Then + If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr = SDLNr And l2.KartenNr = CardNo Then Dim strtempbestellNr As String = String.Empty Dim strtempUmstellungsdatum As String = String.Empty Dim strtempVertragsabschlussdatum As String = String.Empty