From 16a604afbae0542816d8b7020b496b64dab339d5 Mon Sep 17 00:00:00 2001
From: JORGE LUIS CAUDILLO ESPARZA <caudillo_90@hotmail.com>
Date: Thu, 4 Feb 2021 00:41:17 -0700
Subject: [PATCH]

---
 App_Code/ClsSisUsuarios.vb |  3 ++-
 Compras/eFacturas.aspx     | 12 ++++++------
 Compras/eFacturas.aspx.vb  |  4 ++--
 LogIn.aspx.vb              |  4 ++--
 vwd.webinfo                |  2 ++
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/App_Code/ClsSisUsuarios.vb b/App_Code/ClsSisUsuarios.vb
index c1f9e640a..d1ff35a2d 100644
--- a/App_Code/ClsSisUsuarios.vb
+++ b/App_Code/ClsSisUsuarios.vb
@@ -191,7 +191,7 @@ Public Class ClsSisUsuarios
         End Try
         Return Retorno
     End Function
-    Public Function ValidaUsuario(Usuario As String, Password As String, tIMEI As String, Optional CveEmpresa As Integer = -1) As Usuario
+    Public Function ValidaUsuario(Usuario As String, Password As String, tIMEI As String, Optional CveEmpresa As Integer = -1, Optional CvePlataforma As Integer = -1) As Usuario
         Dim Retorno As Usuario = Nothing
         DataAdapter("PA_Sis_UsuariosGet")
         With SqlAdapter.SelectCommand.Parameters
@@ -199,6 +199,7 @@ Public Class ClsSisUsuarios
             .Add("@CveRol", SqlDbType.Int).Value = -1
             .Add("@Usuario", SqlDbType.VarChar).Value = Usuario
             .Add("@Contraseña", SqlDbType.VarChar).Value = Password
+            .Add("@CvePlataforma", SqlDbType.Int).Value = CvePlataforma
             .Add("@EsLogIn", SqlDbType.Bit).Value = 1
         End With
         Try
diff --git a/Compras/eFacturas.aspx b/Compras/eFacturas.aspx
index 3f7b5b01f..89b63605c 100644
--- a/Compras/eFacturas.aspx
+++ b/Compras/eFacturas.aspx
@@ -210,7 +210,7 @@
                                 </asp:TemplateField>
                                 <asp:TemplateField HeaderText="Proveedor">
                                     <ItemTemplate>
-                                        <asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_newtab" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink>
+                                        <asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_blank" rel="opener"  Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink>
                                     </ItemTemplate>
                                     <ItemStyle HorizontalAlign="Left" />
                                 </asp:TemplateField>
@@ -236,7 +236,7 @@
                                 <asp:TemplateField HeaderText="Prov">
                                     <ItemTemplate>
                                         <%--<asp:Literal ID="LtlProv" runat="server"></asp:Literal>--%>
-                                        <asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" Target="_blank"><i class="fa fa-pencil"></i></asp:HyperLink>
+                                        <asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" Target="_blank" rel="opener"><i class="fa fa-pencil"></i></asp:HyperLink>
                                     </ItemTemplate>
                                     <ItemStyle HorizontalAlign="Center" />
                                 </asp:TemplateField>
@@ -250,7 +250,7 @@
                                 <asp:TemplateField HeaderText="Agregar">
                                     <ItemTemplate>
                                         <%--<asp:Image ID="ImgAgregar" runat="server" Style="cursor: pointer;" Visible='<%# Eval("CveProveedor").ToString <> "" %>' ToolTip="Agregar Factura" ImageUrl="/Imagenes/Nota.gif" Height="18px" />--%>
-                                        <asp:HyperLink ID="HplAgregar" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" rel="opener" Target="_blank"><i class="fa fa-plus"></i></asp:HyperLink>
+                                        <asp:HyperLink ID="HplAgregar" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" rel="opener" Target="_blank" ><i class="fa fa-plus"></i></asp:HyperLink>
                                         <asp:LinkButton ID="LnkAgregarPago" runat="server" OnClick="LnkAgregarPago_Click" CssClass="btn btn-sm blue" Visible="false" data-toggle="tooltip" title="Vincular Pago"><i class="fa fa-check"></i></asp:LinkButton>
                                     </ItemTemplate>
                                     <ItemStyle HorizontalAlign="Center" />
@@ -324,7 +324,7 @@
                                     </asp:TemplateField>
                                     <asp:TemplateField HeaderText="Proveedor">
                                         <ItemTemplate>
-                                            <asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_newtab" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink>
+                                            <asp:HyperLink ID="HplProveedor" runat="server" CssClass="Texto" Target="_blank" rel="opener" Text='<%# Eval("NombreProveedor") %>'></asp:HyperLink>
                                         </ItemTemplate>
                                         <ItemStyle HorizontalAlign="Left" />
                                     </asp:TemplateField>
@@ -348,7 +348,7 @@
                                     </asp:TemplateField>
                                     <asp:TemplateField HeaderText="Prov">
                                         <ItemTemplate>
-                                            <asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" Target="_blank"><i class="fa fa-pencil"></i></asp:HyperLink>
+                                            <asp:HyperLink ID="HplProv" runat="server" Visible='False' CssClass="btn btn-circle btn-sm blue" ToolTip="Agregar Proveedor" rel="opener" Target="_blank"><i class="fa fa-pencil"></i></asp:HyperLink>
                                         </ItemTemplate>
                                         <ItemStyle HorizontalAlign="Center" />
                                     </asp:TemplateField>
@@ -361,7 +361,7 @@
                                     </asp:TemplateField>
                                     <asp:TemplateField HeaderText="Agregar">
                                         <ItemTemplate>
-                                            <asp:HyperLink ID="HplAgregarP" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" Target="_blank"><i class="fa fa-plus"></i></asp:HyperLink>
+                                            <asp:HyperLink ID="HplAgregarP" runat="server" CssClass="btn btn-circle btn-sm green" Visible='<%# Eval("CveProveedor").ToString <> "" %>' data-toggle="tooltip" title="Agregar Factura" Target="_blank" rel="opener"><i class="fa fa-plus"></i></asp:HyperLink>
                                             <asp:LinkButton ID="LnkAgregarPagoP" runat="server" OnClick="LnkAgregarPago_Click" CssClass="btn btn-sm blue" Visible="false" data-toggle="tooltip" ></asp:LinkButton>
                                         </ItemTemplate>
                                         <ItemStyle HorizontalAlign="Center" />
diff --git a/Compras/eFacturas.aspx.vb b/Compras/eFacturas.aspx.vb
index 3b39e3541..ff7b71be6 100644
--- a/Compras/eFacturas.aspx.vb
+++ b/Compras/eFacturas.aspx.vb
@@ -898,7 +898,7 @@ Partial Class Compras_eFacturas
 
             End If
             If e.Row.DBCampo("CveCompra") <> "" Then
-                e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_newtab');"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio"))  '1\Compras\GAPC480413QL3\A-69.xml
+                e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_blank' rel='opener'  );"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio"))  '1\Compras\GAPC480413QL3\A-69.xml
             End If
 
             If e.Row.DBCampo("CveProveedor") = "" Then
@@ -1059,7 +1059,7 @@ Partial Class Compras_eFacturas
 
             End If
             If e.Row.DBCampo("CveCompra") <> "" Then
-                e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_newtab');"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio"))  '1\Compras\GAPC480413QL3\A-69.xml
+                e.Row.FCLiteral("LtlFolio").Text = String.Format("<a class=""Texto"" style=""cursor:pointer;text-decoration: underline;"" href='/Compras/Compras.aspx?CveCompra={0}' target='_blank' rel='opener');"">{1}</a>", e.Row.DBCampo("CveCompra"), e.Row.DBCampo("SerieFolio"))  '1\Compras\GAPC480413QL3\A-69.xml
             End If
 
             If e.Row.DBCampo("CveProveedor") = "" Then
diff --git a/LogIn.aspx.vb b/LogIn.aspx.vb
index bff8ad86f..7235394c6 100644
--- a/LogIn.aspx.vb
+++ b/LogIn.aspx.vb
@@ -198,13 +198,13 @@ Partial Class LogIn
             Dim Usuario As Usuario = Nothing
             'Dim UsuarioAsignaciones As Usuario = Nothing
 
-            Usuario = ObjUsuario.ValidaUsuario(txtUsuario.Text, Encripta(TxtContraseña.Text.Trim), IMEI)
+            Dim isgps = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper())
+            Usuario = ObjUsuario.ValidaUsuario(txtUsuario.Text, Encripta(TxtContraseña.Text.Trim), IMEI, CvePlataforma:=If(isgps, 3, 1))
             'UsuarioAsignaciones = ObjUsuario.ValidaUsuarioAsignacion(Usuario.CveUsuario, Usuario.CveEmpresa)
 
             ADSSessionConfig.sessionUser = Usuario
             ADSSessionConfig.sessionDpage = False
             ObjUsuario.Dispose()
-            Dim isgps = Request.Url.Host.ToUpper().Contains("SIGNALSGPS".ToUpper())
             If Usuario IsNot Nothing AndAlso (
                  Usuario.CveRol = 1 OrElse (
                 (isgps AndAlso (Usuario.CvePlataforma = 3 OrElse Usuario.CveRol = 1200)) OrElse
diff --git a/vwd.webinfo b/vwd.webinfo
index 37b42e3cc..d553518ff 100644
--- a/vwd.webinfo
+++ b/vwd.webinfo
@@ -174,6 +174,8 @@
     
   
     
+  
+