AdminADS/SIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.10.111:8383/SIG

Browse Source
This commit is contained in:
Jonathan Alexis Perez Morales
2025-03-14 13:30:01 -07:00
parent 897e8eab6e a40c5b9cb9
commit 55a43b9e6c
16 changed files with 1538 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ventas/RepPedidosSTF.aspx
View File

@@ -236,7 +236,8 @@
<ContentTemplate>
<div style="min-height: 250px; overflow-x: scroll">
<asp:GridView ID="GvE" runat="server" AutoGenerateColumns="False" EmptyDataText="No se encontraron Ventas con los filtros especificados"
CssClass="table table-striped table-advance table-hover Widthall ScrollAD" DataKeyNames="CveCliente,CveVendedor,CveSubProyecto,CvePS,CveUnidadMedida,Cantidad,PU,CveVentaDetalle,GastosEnvio" data-sort="true" GridLines="None" Width="99%">
CssClass="table table-striped table-advance table-hover Widthall ScrollAD" DataKeyNames="CveCliente,CveVendedor,CveSubProyecto,CvePS,CveUnidadMedida,Cantidad,PU,CveVentaDetalle,GastosEnvio,CveVenta,SerieFolio" data-sort="true" GridLines="None" Width="99%"
OnRowDataBound="GvE_RowDataBound">
<Columns>
<asp:BoundField HeaderText="Cliente" DataField="NombreComercial" ItemStyle-Width="30%" />
<asp:BoundField HeaderText="SerieFolio" DataField="SerieFolio" ItemStyle-Width="10%" />

17
Ventas/RepPedidosSTF.aspx.vb
View File

@@ -150,6 +150,11 @@ Partial Class Ventas_RepPedidosSTF
If e.Row.DBCampo("TipoRenglon") = "1" Then e.Row.CssClass = "SubTotales"
If UsuarioActual.TienePermisoPagina(6) Then
e.Row.Cells(1).Text = $"<a href='./Ventas.aspx?CveVenta={e.Row.DataKey("CveVenta")}' target='_blank' class ='Texto' >{e.Row.DataKey("SerieFolio")}</a>"
End If
End If
If e.Row.RowState = DataControlRowState.Edit OrElse e.Row.RowState = 5 Then
@@ -444,4 +449,16 @@ Partial Class Ventas_RepPedidosSTF
UpBodyHorariosPedidos.Update()
RegistraScript("$('#divHorariosPedidos').modal({ backdrop: 'static', keyboard: false});")
End Sub
Protected Sub GvE_RowDataBound(sender As Object, e As GridViewRowEventArgs)
If e.Row.RowType = DataControlRowType.DataRow Then
If UsuarioActual.TienePermisoPagina(6) Then
e.Row.Cells(1).Text = $"<a href='./Ventas.aspx?CveVenta={e.Row.DataKey("CveVenta")}' target='_blank' class ='Texto' >{e.Row.DataKey("SerieFolio")}</a>"
End If
End If
End Sub
End Class

8
Ventas/Ventas.aspx
View File

@@ -9028,13 +9028,13 @@
<asp:UpdatePanel class="modal-dialog" runat="server" ID="UpDvModalTipoVenta" UpdateMode="Conditional">
<ContentTemplate>
<div class="modal-content">
<div class="modal-content" style="width:650px;">
<div class="modal-header ">
<h4 class="modal-title">
<asp:Label ID="LblDvModalTipoVentaTitulo" runat="server">Tipo de Venta</asp:Label>
</h4>
</div>
<div class="modal-body" style="min-height: 233.45px">
<div class="modal-body" style="min-height: 250px">
<%--Tipo Venta--%>
<div class="row" runat="server" visible="True" id="DvModalTipoVentaPasoTipo">
@@ -9126,7 +9126,7 @@
<div class="row" runat="server" id="DVGvPSProced" visible="false">
<div class="row">
<div class="col-md-8">
<asp:CheckBox ID="ChkVerTodosPS" runat="server" Text="Ver Todos" AutoPostBack="true" OnCheckedChanged="ChkVerTodosPS_CheckedChanged" />
&nbsp;&nbsp;&nbsp;&nbsp;<asp:CheckBox ID="ChkVerTodosPS" runat="server" Text="Ver Todos los productos" AutoPostBack="true" OnCheckedChanged="ChkVerTodosPS_CheckedChanged" />
</div>
<div class="col-md-4" style="text-align: right">
<input type="text" id="TxtBus" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBus','{0}')", GvPSProced.ClientID) %>" style="display: inline-block; width: 150px;" />
@@ -9144,7 +9144,7 @@
<ajax:FilteredTextBoxExtender ID="FilTxtCantidad" runat="server" TargetControlID="TxtCantidad" FilterType="Custom, Numbers" ValidChars="." />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Cantidad" HeaderText="Cant." DataFormatString="{0:#,###.##}" ItemStyle-Width="30px">
<asp:BoundField DataField="Cantidad" HeaderText="Exist." DataFormatString="{0:#,###.##}" ItemStyle-Width="30px">
<ItemStyle HorizontalAlign="Right" />
</asp:BoundField>
<asp:BoundField DataField="CodigoPS" HeaderText="Producto">

11
Ventas/Ventas.aspx.vb
View File

@@ -40167,38 +40167,27 @@ Partial Class Ventas
Protected Sub LnkDvModalTipoVentaCancelar_Click(sender As Object, e As EventArgs)
LnkDvModalTipoVentaAceptar.Visible = False
DvModalTipoVentaPasoTipo.Visible = True
DvModalTipoVentaClientesucursal.Visible = False
DvModalTipoVentaCliente.Visible = False
DvModalTipoVentaPasoRequiereOS.Visible = False
DvModalTipoVentaPasoMedicoProcedimiento.Visible = False
ChkRequiereTecnicoModal.Enabled = True
DdlClienteSucursal.SelectedValueExist(-1)
DvModalRequiereOSFecha.Visible = False
ChkRequiereTecnicoModal.Checked = False
RBLTipoVenta.SelectedValue = Nothing
DdlMedicoModal.SelectedValueExist(-1)
DdlProcedimientoModal.SelectedValueExist(-1)
GvPSProced.DataSource = Nothing
GvPSProced.DataBind()
DVGvPSProced.Visible = False
LblDvModalTipoVentaTitulo.Text = "Tipo de Venta"
UpDvModalTipoVenta.Update()
End Sub
Protected Sub LnkDvModalTipoVentaAceptar_Click(sender As Object, e As EventArgs)
If RBLTipoVenta.SelectedValue = "2" Then 'pago directo