diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx b/Customers/SDL/Formtemplate EcoTAX.aspx index 8eede83..bed62ff 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx +++ b/Customers/SDL/Formtemplate EcoTAX.aspx @@ -154,7 +154,7 @@ detailtabelle(param1, param2, param3, param4, param5, param6,param7); //alert(param1) - function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History,Pin) { + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History,GueltigBis,Pin) { // alert("Testdata:" + id) let data = {}; @@ -164,6 +164,7 @@ data['CustomerNo'] = CustomerNo; data['SDLNr'] = SDLNr; data['History'] = History; + data['GueltigBis'] = GueltigBis; data['Pin'] = Pin; $.ajax({ @@ -189,7 +190,7 @@ document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result["3"]); document.getElementById('<%=txt_Status.ClientID%>').setAttribute('checked', result["4"]); document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('checked', result["5"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('checked', result["6"]); + document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["6"]); document.getElementById('<%=cb_retourniert%>').setAttribute('checked', result["7"]); } diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx.vb b/Customers/SDL/Formtemplate EcoTAX.aspx.vb index 21d8949..b72dce4 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx.vb +++ b/Customers/SDL/Formtemplate EcoTAX.aspx.vb @@ -72,7 +72,7 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, CardNo 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, GueltigBis As String, Pin 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)) @@ -106,9 +106,9 @@ Partial Class Customers_Default3 If IsNothing(l2.Vermerk) = False Then strtempVermerk = l2.Vermerk.ToString End If - If IsNothing(l2.GültigBis) = False Then - strtempGueltigBis = l2.GültigBis.ToString - End If + + strtempGueltigBis = GueltigBis + If IsNothing(l2.Retourniert) = False Then strtempretourniert = l2.Retourniert.ToString End If diff --git a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb index 43db2da..cfe3f9d 100644 --- a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb +++ b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx.vb @@ -74,7 +74,7 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, CardNo 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, GueltigBis As String, Pin 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)) @@ -108,9 +108,9 @@ Partial Class Customers_Default3 If IsNothing(l2.Vermerk) = False Then strtempVermerk = l2.Vermerk.ToString End If - If IsNothing(l2.GültigBis) = False Then - strtempGueltigBis = l2.GültigBis.ToString.Substring(0, 10) - End If + + strtempGueltigBis = GueltigBis + If IsNothing(l2.Retourniert) = False Then strtempRetourniert = l2.Retourniert.ToString End If diff --git a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx.vb b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx.vb index 03bfbc0..3e98662 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx.vb @@ -96,9 +96,9 @@ Partial Class Customers_Default3 If IsNothing(l2.Lieferdatum) = False Then strtempLieferdatum = l2.Lieferdatum.ToString.Substring(0, 10) End If - If IsNothing(l2.KartenNr) = False Then - strtempKartenNr = l2.KartenNr.ToString - End If + + strtempKartenNr = CardNo + If IsNothing(l2.Vermerk) = False Then strtempVermerk = l2.Vermerk.ToString End If diff --git a/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx.vb b/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx.vb index 6e48045..e0a371a 100644 --- a/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate Maut_PL.aspx.vb @@ -96,9 +96,9 @@ Partial Class Customers_Default3 If IsNothing(l2.Lieferdatum) = False Then strtempLieferdatum = l2.Lieferdatum.ToString.Substring(0, 10) End If - If IsNothing(l2.KartenNr) = False Then - strtempKartNr = l2.KartenNr.ToString - End If + + strtempKartNr = CardNo + If IsNothing(l2.Vermerk) = False Then strtempVermerk = l2.Vermerk.ToString End If