diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index e9277fe..9100f8c 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -518,6 +518,7 @@ data['SDLNr'] = id.split(',')[4]; data['History'] = id.split(',')[5]; data['GueltigBis'] = id.split(',')[6]; + data['Pin'] = id.split(',')[7]; $.ajax({ type: "POST", @@ -551,6 +552,7 @@ let Kennz = result[i]["4"]; let History = result[i]["7"]; let GueltigBis = result[i]["2"]; + let Pin = result[i]["8"]; let Hinweis = '

Dieser iFrame kann leider nicht korrekt geladen werden. Aktivieren Sie JS oder versuchen Sie es später erneut.

'; //alert(SDLNr + 'SDLnummer' + id.split(',')[4]); //alert(Kundennr + 'Kundennummer' + id.split(',')[2]); @@ -561,67 +563,67 @@ let customerid = '<%=Request.QueryString("CustomerID")%>'; // alert("Var:" + id.split(',')[0]+customerid); if (result[i]["0"] == 200 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ''; + iframe = ''; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 100 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 101 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 201 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 203 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' // } else if (result[i]["0"] == 204 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - // iframe = ' '; + // iframe = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' //} else if (result[i]["0"] == 205 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - // iframe = ' '; + // iframe = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' //} else if (result[i]["0"] == 206 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - // iframe = ' '; + // iframe = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 207 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 208 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 209 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 210 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 211 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 212 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 213 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 214 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 215 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 216 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 500 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } else if (result[i]["0"] == 501 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ - iframe = ' '; + iframe = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } $('#<%=tablemain.ClientID%>').append(strHTML4); @@ -701,67 +703,67 @@ // alert(result.rows.length) if (result[i]["0"] == 200 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id.split(',')[5]){ - iframe_M = ''; + iframe_M = ''; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 100 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 101 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 201 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 202 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 203 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' // } else if (result[i]["0"] == 204 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - // iframe_M = ' '; + // iframe_M = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' //} else if (result[i]["0"] == 205 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - // iframe_M = ' '; + // iframe_M = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' //} else if (result[i]["0"] == 206) && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - // iframe_M = ' '; + // iframe_M = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 207 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 208 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 209 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 210 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 211 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 212 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 213 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 214 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 215 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 216 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + ifram_M + '' } else if (result[i]["0"] == 500 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } else if (result[i]["0"] == 501 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ - iframe_M = ' '; + iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } $('#<%=tablemain_m.ClientID%>').append(strHTML4); diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index 63a2b68..e7e1c22 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -153,6 +153,7 @@ Partial Class LKWS Dim strstrstrstrtempHistory As String = String.Empty Dim strstrstrstrtempSDL As String = String.Empty Dim strstrstrstrtempGueltigBis As String = String.Empty + Dim strstrstrstrtempPin As String = String.Empty For Each l2 In list2 Dim String2 As String = String.Empty @@ -176,6 +177,7 @@ Partial Class LKWS strstrstrstrtempKundNr = l2.KundenNr.ToString strstrstrstrtempHistory = l2.History.ToString strstrstrstrtempGueltigBis = l2.GültigBis.ToString + strstrstrstrtempPin = l2.PIN.ToString If String.Equals(l2.KfzKennzeichen.ToString, l1.KfzKennzeichen.ToString) = True Then tr.Cells.Add(tc_SDL) tr.Cells.Add(tc_Bez) @@ -195,7 +197,7 @@ Partial Class LKWS strtemp2 = l1.Nationalität End If - tr1.Attributes.Add("onclick", "Javascript:doPostBack('" + tr1.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "," + strstrstrstrtempGueltigBis + "')") + tr1.Attributes.Add("onclick", "Javascript:doPostBack('" + tr1.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "," + strstrstrstrtempGueltigBis + "," + strstrstrstrtempPin + "')") cnt += 1 tbl_sidemenue.Rows.Add(tr1) Next @@ -380,6 +382,7 @@ Partial Class LKWS Dim strstrstrstrtempHistory As String = String.Empty Dim strstrstrstrtempSDL As String = String.Empty Dim strstrstrstrtempGueltigBis As String = String.Empty + Dim strstrstrstrtempPin As String = String.Empty Dim strstrtemp As String = String.Empty tc_KfzKennz_M.Text = l3.KfzKennzeichen tr1_M.Cells.Add(tc_KfzKennz_M) @@ -414,6 +417,7 @@ Partial Class LKWS strstrstrstrtempKundNr = l2.KundenNr.ToString strstrstrstrtempHistory = l2.History.ToString strstrstrstrtempGueltigBis = l2.GültigBis.ToString.Substring(0, 10) + strstrstrstrtempPin = l2.PIN.ToString If String.Equals(l2.KfzKennzeichen.ToString, l3.KfzKennzeichen.ToString) = True Then tr.Cells.Add(tc_SDL) tr.Cells.Add(tc_Bez) @@ -629,7 +633,7 @@ Partial Class LKWS End Class - Public Shared Function filltable2(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String, GueltigBis As String) As FormattedList + Public Shared Function filltable2(Kennzeichen As String, Kundennr 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(Kundennr), Kennzeichen) @@ -659,6 +663,7 @@ Partial Class LKWS Entrytemp.Add(Kdnrtext) Entrytemp.Add(SDLNr) Entrytemp.Add(History) + Entrytemp.Add(Pin) container.Add(Entrytemp) ' End If Next @@ -699,6 +704,7 @@ Partial Class LKWS Entrytemp.Add(Kdnrtext) Entrytemp.Add(SDLNr) Entrytemp.Add(History) + container.Add(Entrytemp) ' End If Next diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx b/Customers/SDL/Formtemplate EcoTAX.aspx index 298488f..827118d 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx +++ b/Customers/SDL/Formtemplate EcoTAX.aspx @@ -56,7 +56,7 @@
-
+
diff --git a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx index d46bc03..15bb3f2 100644 --- a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx +++ b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx @@ -56,7 +56,7 @@
-
+
diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx index beb2346..338f12d 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx @@ -56,7 +56,7 @@
-
+
@@ -123,12 +123,13 @@ var param5 = getParamValue('SDLNr'); var param6 = getParamValue('History'); var param7 = getParamValue('GueltigBis'); + var param8 = getParamValue('Pin'); $('txt_ClientNr').val(param1); - detailtabelle(param1, param2, param3, param4, param5, param6, param7); + detailtabelle(param1, param2, param3, param4, param5, param6, param7,param8); //alert(param1) - function detailtabelle(id,CustomerID,Cardnummer,CustomerNo,SDLNr,History,GueltigBis) { + function detailtabelle(id,CustomerID,Cardnummer,CustomerNo,SDLNr,History,GueltigBis,Pin) { // alert("Testdata:" + id) let data = {}; @@ -139,6 +140,7 @@ data['SDLNr'] = SDLNr; data['History'] = History; data['GueltigBis'] = GueltigBis; + data['Pin'] = Pin; $.ajax({ type: "POST", diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb index a6191bb..8c2d7ef 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb @@ -73,7 +73,7 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String, GueltigBis 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(Kundennr), Kennzeichen) Dim listdetails As New List(Of List(Of String)) @@ -101,9 +101,10 @@ Partial Class Customers_Default3 strtempKartenNr = CardNo - If IsNothing(l2.PIN) = False Then - strtempPin = l2.PIN.ToString - End If + + strtempPin = Pin + + If IsNothing(l2.Vermerk) = False Then strtempVermerk = l2.Vermerk.ToString End If diff --git a/Customers/SDL/Formtemplate IDS Wölfl.aspx b/Customers/SDL/Formtemplate IDS Wölfl.aspx index 5ac2785..c2fc225 100644 --- a/Customers/SDL/Formtemplate IDS Wölfl.aspx +++ b/Customers/SDL/Formtemplate IDS Wölfl.aspx @@ -56,7 +56,7 @@
-
+
diff --git a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx index 1cd2d9b..76fe091 100644 --- a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx +++ b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx @@ -50,7 +50,7 @@
-
+
diff --git a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx index 0bf18b4..f60d215 100644 --- a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx +++ b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx @@ -56,7 +56,7 @@
-
+
diff --git a/Customers/SDL/Formtemplate Plose.aspx b/Customers/SDL/Formtemplate Plose.aspx index 12c8244..feeeecd 100644 --- a/Customers/SDL/Formtemplate Plose.aspx +++ b/Customers/SDL/Formtemplate Plose.aspx @@ -57,7 +57,7 @@
-
+
diff --git a/Customers/SDL/Formtemplate VERAG_Card.aspx b/Customers/SDL/Formtemplate VERAG_Card.aspx index fbb79d5..bf07ee7 100644 --- a/Customers/SDL/Formtemplate VERAG_Card.aspx +++ b/Customers/SDL/Formtemplate VERAG_Card.aspx @@ -57,7 +57,7 @@
-
+
diff --git a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx index 6796304..6fd20a1 100644 --- a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx +++ b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx @@ -56,7 +56,7 @@
-
+
@@ -142,6 +142,7 @@ var param4 = getParamValue('CustomerNo'); var param5 = getParamValue('SDLNr'); var param6 = getParamValue('History'); + var param8 = getParamValue('PinOfCard'); $('txt_ClientNr').val(param1); diff --git a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx.vb b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx.vb index 2363753..2bcbebb 100644 --- a/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate HU_HUGO.aspx.vb @@ -73,7 +73,7 @@ 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, GueltigBis As String, Pin As String) As FormattedList 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)) Dim list As List(Of String) = New List(Of String) @@ -95,12 +95,12 @@ Partial Class Customers_Default3 If IsNothing(l2.Bestelldatum) = False Then strtempbestelltam = l2.Bestelldatum.ToString.Substring(0, 10) End If - If IsNothing(l2.KartenNr) = False Then - strtempKartenNr = l2.KartenNr.ToString.Substring(0, 10) - End If - If IsNothing(l2.PIN) = False Then - strtempPIN = l2.PIN.ToString - End If + + strtempKartenNr = CardNo + + + strtempPIN = Pin + If IsNothing(l2.OBUID) = False Then strtempOBUID = l2.OBUID.ToString End If diff --git a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx index 7bb9511..efe14dd 100644 --- a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx +++ b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx @@ -56,6 +56,7 @@
+
diff --git a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx.vb b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx.vb index c29c76c..25d9a88 100644 --- a/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate IT_Plose.aspx.vb @@ -74,7 +74,7 @@ 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)) @@ -131,9 +131,9 @@ Partial Class Customers_Default3 If IsNothing(l2.Archiviert) = False Then strtempArchivt = l2.Archiviert.ToString End If - If IsNothing(l2.KartenNr) = False Then - strtempKartenNummer = l2.KartenNr.ToString - End If + + strtempKartenNummer = CardNo + ' 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)) list.Add(strtempbestelltam) diff --git a/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx b/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx index c5a42ab..40b5675 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx +++ b/Customers/SDL/MAUT/Formtemplate MAUT IT.aspx @@ -56,7 +56,7 @@
-
+
diff --git a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx index f9fc182..c75f849 100644 --- a/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx +++ b/Customers/SDL/MAUT/Formtemplate MAUT_CZ_Plose.aspx @@ -56,6 +56,7 @@
+
@@ -113,6 +114,7 @@
+