From dd3927f796cdf647d439e2642426a159196f5a60 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Mon, 17 Feb 2025 19:06:36 -0600 Subject: [PATCH] - VERSION 5.02.16 - Se activo la encuesta de Pedigree - Se corrigio un error al borrar productos de promos desde Nota --- C_Bitacora.bas => B4A/C_Bitacora.bas | 0 B4A/C_Cliente.bas | 15 +++++++-------- B4A/C_Nota.bas | 4 ++-- B4A/Guna Vistas V3.1.b4a | 4 ++-- B4A/Guna Vistas V3.1.b4a.meta | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) rename C_Bitacora.bas => B4A/C_Bitacora.bas (100%) diff --git a/C_Bitacora.bas b/B4A/C_Bitacora.bas similarity index 100% rename from C_Bitacora.bas rename to B4A/C_Bitacora.bas diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 51db06b..5a0c22f 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1402,7 +1402,6 @@ End Sub Sub gest_Click If B_IMP.Visible = True Then - If Not(Subs.revisaImpreso) Then c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info2 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") c.Position = 0 @@ -1490,13 +1489,13 @@ Sub compra ' Or (ALMACEN = 79 And rutasEncuesta.IndexOf(LA_RUTA.As(Int)) > -1) ' Encuesta Pedigree -' If (alamcenesEncuesta.IndexOf(ALMACEN.As(Int)) > -1 ) Or (ALMACEN = 6 And LA_RUTA = 3) Then -' Log($"${cuest.encuestaIniciada} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$) -' If Not(cuest.encuestaIniciada) And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then -' cuest.agregaPreguntaCheckbox("1", "¿Qué productos de Kileo Perro encuentras en esta tienda?", Array As String("Pedigree Adulto", "Pedigree Cachorro", "Pedigree Razas Pequeñas", "Champ", "PAL","DOG CHOW ADULTO","DOG CHOW CACHORRO","DOG CHOW RAZAS PEQUEÑAS","Campeon","Ganador","Poder canino","Perron","Silverkan","Woow","Chapetes","Dyno","Beriscan","Nogacan","Nutrescan","Fidus","Amigo Gourmet","Otros","Ninguno de los anteriores")) -' Return False -' End If -' End If + If (alamcenesEncuesta.IndexOf(ALMACEN.As(Int)) > -1 ) Or (ALMACEN = 6 And LA_RUTA = 3) Then + Log($"${cuest.encuestaIniciada} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$) + If Not(cuest.encuestaIniciada) And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then + cuest.agregaPreguntaCheckbox("1", "¿Qué productos de Kileo Perro encuentras en esta tienda?", Array As String("Pedigree Adulto", "Pedigree Cachorro", "Pedigree Razas Pequeñas", "Champ", "PAL","DOG CHOW ADULTO","DOG CHOW CACHORRO","DOG CHOW RAZAS PEQUEÑAS","Campeon","Ganador","Poder canino","Perron","Silverkan","Woow","Chapetes","Dyno","Beriscan","Nogacan","Nutrescan","Fidus","Amigo Gourmet","Otros","Ninguno de los anteriores")) + Return False + End If + End If If TOMAR_FOTO = 0 Then Cuestionario diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index d41bce3..6904c62 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -342,8 +342,8 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) ' Log(nom) nom = nom.Trim Private cedis As String = X(X.Length-1) - c=B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID,PE_CANT, PE_FOLIO, PE_CEDIS, PE_PRONOMBRE FROM PEDIDO where pe_pronombre = '${nom}' AND PE_CEDIS = '${cedis}' and pe_cliente in (Select CUENTA from cuentaa)"$) - Log($"select PE_PROID,PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO where pe_pronombre = '${nom}' AND PE_CEDIS = '${cedis}' and pe_cliente in (Select CUENTA from cuentaa)"$) + c=B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID,PE_CANT, PE_FOLIO, PE_CEDIS, PE_PRONOMBRE FROM PEDIDO where (pe_pronombre = '${nom}' or pe_pronombre = '${nom} ') AND PE_CEDIS = '${cedis}' and pe_cliente in (Select CUENTA from cuentaa)"$) + Log($"select PE_PROID,PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO where (pe_pronombre = '${nom}' or pe_pronombre = '${nom} ') AND PE_CEDIS = '${cedis}' and pe_cliente in (Select CUENTA from cuentaa)"$) Log(c.RowCount) c.Position=0 ' If c.RowCount > 0 Then diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index b9be0d8..c3b4411 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -243,7 +243,7 @@ Module25=Starter Module26=Subs Module27=Tracker Module3=BatteryUtilities -Module4=|relative|..\C_Bitacora +Module4=C_Bitacora Module5=C_Cliente Module6=C_Clientes Module7=C_Cuestionario @@ -257,7 +257,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 5.02.10 + #VersionName: 5.02.16 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Guna Vistas V3.1.b4a.meta b/B4A/Guna Vistas V3.1.b4a.meta index a00c280..abbb56f 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=5,6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,Printer_Connected,2770,0,C_Nota,borra_Click,155,0,C_Nota,ListView1_ItemLongClick,231,0,Subs,guardaAppInfo,1214,0,Subs,TraeMontoProd,1237,0,C_Principal,Class_Globals,0,0,Subs,TraeMontoProd2,1245,6,B4XMainPage,B4XPage_Created,144,0,C_Cliente,B4XPage_Appear,876,6,C_Cliente,GPS_LocationChanged,1081,0 +NavigationStack=Subs,guardaAppInfo,1214,0,Subs,TraeMontoProd,1237,0,C_Principal,Class_Globals,0,0,Subs,TraeMontoProd2,1245,6,B4XMainPage,B4XPage_Created,144,0,C_Cliente,B4XPage_Appear,876,6,C_Nota,ListView1_ItemLongClick,338,1,C_Cliente,GPS_LocationChanged,1078,0,C_Cliente,gest_Click,1397,0,C_Cliente,compra,1491,0 SelectedBuild=0 VisibleModules=25,2,14,26,5,10,15,20,4