diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 92eb3bb..2f4dc7d 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1264,13 +1264,14 @@ Sub gest_Click ' LA_RUTA = 732 ' Or (ALMACEN = 79 And rutasEncuesta.IndexOf(LA_RUTA.As(Int)) > -1) - 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 + ' 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 TOMAR_FOTO = 0 Then Cuestionario diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 358ce38..036110f 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -239,6 +239,7 @@ Sub Class_Globals Dim tipo_venta As String = Subs.traeTipoVentaDeBD Private b_abordo As Button Dim bitacora As C_Bitacora + Private l_version As Label End Sub 'You can add more parameters here. @@ -256,6 +257,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) SCROLL_RESDIA.Height = Root.Height B_OK_RES.color = Colors.Red B_OK_RES.TextColor = Colors.White + l_version.Text = Application.VersionName EJECUTANDO=1 Dim ruta As String img2.Visible =False @@ -609,7 +611,7 @@ Sub Subir_Click End If c.Close - c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info2 where CAT_CL_NUM_SERIEFISICO IS NOT NULL") + c=B4XPages.MainPage.skmt.ExecQuery("SELECT CAT_CL_NUM_SERIEFISICO,CAT_CL_CODIGO ,CAT_CL_LONG,CAT_CL_LAT, CAT_CL_FOTO FROM kmt_info2 where CAT_CL_NUM_SERIEFISICO IS NOT NULL and gestion <> '0'") If c.RowCount>0 Then For i=0 To c.RowCount -1 c.Position=i diff --git a/B4A/C_Promos.bas b/B4A/C_Promos.bas index 6a1170c..9c80a1d 100644 --- a/B4A/C_Promos.bas +++ b/B4A/C_Promos.bas @@ -343,7 +343,7 @@ Private Sub b_terminar1_Click ' Log($"${prodsIds}${CRLF}${prodsCants}${CRLF}${prodsPrecios}"$) For t = 0 To prodsIds.Size - 1 'Guardamos los productos fijos de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds.Get(t)) - If prodsCants.Get(t) > 0 Then Subs.guardaProducto(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) + If prodsCants.Get(t) > 0 Then Subs.guardaProducto(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn&" ", prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) Next For t = 0 To prodsIds2.Size - 1 'Guardamos los productos variables de la promocion en pedido. Private pn As String = Subs.traeProdNombre(prodsIds2.Get(t)) diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 47a23ec..62c4071 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index bdbd043..72f4550 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -250,12 +250,12 @@ Module9=C_Mapas NumberOfFiles=94 NumberOfLibraries=32 NumberOfModules=26 -Version=13 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 5.01.05 + #VersionName: 5.01.28 '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 a619b73..26ff3ed 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -79,6 +79,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=5,6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,GPS_LocationChanged,951,0,C_Cliente,B4XPage_Appear,930,3,C_NuevoCliente,Class_Globals,0,0,C_NuevoCliente,GUARDA_Click,88,2,C_NuevoCliente,B4XPage_Appear,62,6,Subs,traeRuta,663,6,Subs,traeProdNombre,658,0,B4XMainPage,b_aceptar_Click,884,0,C_Principal,B4XPage_Created,317,0,C_Principal,B4XPage_Appear,441,0,C_Bitacora,mandaBitacora,39,0 +NavigationStack=C_Promos,b_terminar1_Click,339,2,Visual Designer,cliente.bal,-100,3,C_Principal,Class_Globals,223,0,Visual Designer,principal.bal,-100,4,C_Principal,B4XPage_Created,253,4,C_Principal,Initialize,242,0,B4XMainPage,Class_Globals,21,0,C_Principal,B4XPage_Appear,442,0,C_Principal,Subir_Click,651,4,DBRequestManager,WriteObject,144,0,C_Cliente,gest_Click,1243,0 SelectedBuild=0 -VisibleModules=24,2,14,25,4,5,7,6,15,12 +VisibleModules=24,2,14,25,4,5,7,6,15,12,16,20