From 616c4ad8dfbcc12c7138653c9eb4e184d9d43aa5 Mon Sep 17 00:00:00 2001 From: rrene Date: Mon, 4 Sep 2023 08:01:49 -0700 Subject: [PATCH] -- personalizar kilometraje --- Ventas/RepVentaDetalle.aspx | 12 +++++++++- Ventas/RepVentaDetalle.aspx.vb | 40 +++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Ventas/RepVentaDetalle.aspx b/Ventas/RepVentaDetalle.aspx index d2a2fbaf2..8b8409e9f 100644 --- a/Ventas/RepVentaDetalle.aspx +++ b/Ventas/RepVentaDetalle.aspx @@ -573,7 +573,12 @@ - + <%-- 39--%> + + + + + @@ -716,6 +721,11 @@ + + + + + diff --git a/Ventas/RepVentaDetalle.aspx.vb b/Ventas/RepVentaDetalle.aspx.vb index 652ed2836..e6752cb6c 100644 --- a/Ventas/RepVentaDetalle.aspx.vb +++ b/Ventas/RepVentaDetalle.aspx.vb @@ -360,7 +360,7 @@ Partial Class RepVentaDetalle End Sub Private Sub CargaClientes() - Dim EsWS = If(UsuarioActual.Empresa.Funcionalidad(105) = "1" Or UsuarioActual.Empresa.Funcionalidad(141) = "1", True, False) + Dim EsWS As Boolean = If(UsuarioActual.Empresa.Funcionalidad(105) = "1" Or UsuarioActual.Empresa.Funcionalidad(141) = "1", True, False) If EsWS Then DdlClientes.setEsWebService(True) Else @@ -384,14 +384,14 @@ Partial Class RepVentaDetalle End Sub Private Sub CargaDatos() - Dim AnioMes = "-1" ' If(Request("AnioMes") IsNot Nothing, Request("AnioMes").ToString, "-1").ToString - Dim Fecha = If(Request("Fecha") IsNot Nothing, Request("Fecha").ToString, "-1").ToString - Dim IVA = If(Request("IVA") IsNot Nothing, Request("IVA").ToString, "-1").ToString + Dim AnioMes As String = "-1" ' If(Request("AnioMes") IsNot Nothing, Request("AnioMes").ToString, "-1").ToString + Dim Fecha As String = If(Request("Fecha") IsNot Nothing, Request("Fecha").ToString, "-1").ToString + Dim IVA As String = If(Request("IVA") IsNot Nothing, Request("IVA").ToString, "-1").ToString Dim FechaI, FechaF, FechaIEjec, FechaFEjec As Date - Dim Anio = If(Request("Anio") IsNot Nothing, Request("Anio").ToString, "-1").ToString - Dim Mes = If(Request("Mes") IsNot Nothing, Request("Mes").ToString, "-1").ToString - Dim CveCorte = If(Request("CveCorte") IsNot Nothing AndAlso Request("CveCorte").ToEntero() > 0, Request("CveCorte").ToEntero(), -1).ToString + Dim Anio As String = If(Request("Anio") IsNot Nothing, Request("Anio").ToString, "-1").ToString + Dim Mes As String = If(Request("Mes") IsNot Nothing, Request("Mes").ToString, "-1").ToString + Dim CveCorte As String = If(Request("CveCorte") IsNot Nothing AndAlso Request("CveCorte").ToEntero() > 0, Request("CveCorte").ToEntero(), -1).ToString 'PARAMETROS DE LOS LISTBOXS Dim TipoComprobante As String = If(DdlTipoComprobante.GetSelectedValuesM = "", "-1", DdlTipoComprobante.GetSelectedValuesM) @@ -488,6 +488,7 @@ Partial Class RepVentaDetalle ChkIEPS.Checked = UsuarioActual.Empresa.Funcionalidad(713) = "1" 'empresa deduce IEPS GvDatos.Columns(9).Visible = ChkIEPS.Checked + ChkKilometraje.Visible = UsuarioActual.Empresa.Funcionalidad(558) = "1" 'empresa llantera End Sub Protected Sub GvDatos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvDatos.RowDataBound @@ -774,9 +775,10 @@ Partial Class RepVentaDetalle ListPersonalizada.Add("FormaPago") End If - If ChkUsoCFDI.Checked Then - ListPersonalizada.Add("UsoCFDI") - End If + If ChkUsoCFDI.Checked Then ListPersonalizada.Add("UsoCFDI") + + If ChkKilometraje.Checked Then ListPersonalizada.Add("Kilometraje") + If objUsuario.AddUsuariosPersonalizaciones(UsuarioActual, "RepVentaDetalles.aspx", String.Join("|", ListPersonalizada)) Then 'Alert("Personalizacion guardada") @@ -947,7 +949,6 @@ Partial Class RepVentaDetalle Case "Saldo" ChkSaldo.Checked = True Exit Select - Case "MetodoPago" ChkMetodoPago.Checked = True Exit Select @@ -957,7 +958,9 @@ Partial Class RepVentaDetalle Case "UsoCFDI" ChkUsoCFDI.Checked = True Exit Select - + Case "Kilometraje" + ChkKilometraje.Checked = True + Exit Select Case Else Exit Select End Select @@ -1014,6 +1017,7 @@ Partial Class RepVentaDetalle GvDatos.Columns(36).Visible = ChkMetodoPago.Checked GvDatos.Columns(37).Visible = ChkFormaPago.Checked GvDatos.Columns(38).Visible = ChkUsoCFDI.Checked + GvDatos.Columns(39).Visible = ChkKilometraje.Checked Personalizo = 1 If Personalizo = 1 Then @@ -1170,14 +1174,14 @@ Partial Class RepVentaDetalle Response.End() End Sub Private Function DescargarFactura(CveVenta As Integer, CveEmpresa As Integer, CveUsuarioCreo As Integer) As Byte() - Dim Url = New Uri(String.Format("{0}Compras/PopUpVerFactura.aspx?P={1}", "https://sig.adssistemas.mx/", Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1", CveVenta)))) + Dim Url As Uri = New Uri(String.Format("{0}Compras/PopUpVerFactura.aspx?P={1}", "https://sig.adssistemas.mx/", Encripta(String.Format("OP=VTA&CVEVENTA={0}&PAG=1&GUARDAR=1", CveVenta)))) Dim File As Byte() = Nothing Try - Using httpClient = New HttpClient() + Using httpClient As New HttpClient() httpClient.Timeout = New TimeSpan(0, 15, 0) - Using request = New HttpRequestMessage(HttpMethod.Get, Url) + Using request As New HttpRequestMessage(HttpMethod.Get, Url) request.Headers.Add("ADSToken", Encripta(String.Format("CVEEMPRESA={0}&TICKS={1}&CVEUSUARIO={2}", CveEmpresa, DateTime.UtcNow.Ticks, CveUsuarioCreo))) - Dim response = httpClient.SendAsync(request).Result + Dim response As HttpResponseMessage = httpClient.SendAsync(request).Result If response.StatusCode = Net.HttpStatusCode.OK Then File = response.Content.ReadAsByteArrayAsync().Result End If @@ -1217,12 +1221,12 @@ Partial Class RepVentaDetalle CondicionesPago = If(DdlCondicionesPago.selectedValue = "-1", "", String.Format(" Condiciones Pago: {0}", DdlCondicionesPago.SelectedItem.Text)) - Dim RutaFormato = String.Format("{0}Formatos\RepVentaDetalle.rdlc", UsuarioActual.Empresa.Ruta) + Dim RutaFormato As String = String.Format("{0}Formatos\RepVentaDetalle.rdlc", UsuarioActual.Empresa.Ruta) Dim Archivo As New System.IO.FileInfo(RutaFormato) Dim Imagen As New System.IO.FileInfo($"{UsuarioActual.Empresa.Ruta}/Logo.png") - Dim logouri = String.Format("file://{0}", Imagen.FullName) + Dim logouri As String = String.Format("file://{0}", Imagen.FullName) Dim dt As DataTable = DtVentas.FiltraParametros("(GPO IS NULL AND Cantidad IS NOT NULL) OR (GPO IS NOT NULL AND Cantidad IS NOT NULL)")