From 641eee998b8fe8352d70a411569fae316467620c Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 25 Oct 2024 11:29:38 -0600 Subject: [PATCH] - VERSION 4.10.23 - Correcciones en No Venta, Resumen Dia y otros detalles!! --- B4A/C_NoVenta.bas | 1 + B4A/C_Principal.bas | 12 +++++++----- B4A/C_Productos.bas | 3 ++- B4A/Files/principal.bal | Bin 50933 -> 50924 bytes B4A/Guna Vistas V3.1.b4a | 2 +- B4A/Guna Vistas V3.1.b4a.meta | 8 ++++---- B4A/Subs.bas | 4 ++++ 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index 9d24344..f562550 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -61,6 +61,7 @@ Sub B4XPage_Appear ToastMessageShow("Es necesario tener el GPS encendido", True) StartActivity(Starter.gps.LocationSettingsIntent) End If + r_1.Checked = True End Sub Sub GPS_LocationChanged (Location1 As Location) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 4d2e26c..180ecc9 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -97,7 +97,7 @@ Sub Class_Globals Private ImageView5 As ImageView Private L_TICKPROM As Label Private L_MARCAS As ListView - Private Panel11 As Panel + Private p_ruta2 As Panel Private E_RUTA2 As EditText Private resdia As ImageView Private hacer_ped As ImageView @@ -274,7 +274,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") f.Close - + p_principal.Width = Root.Width : p_principal.Height = Root.Height ' ro = B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info2") ' ro.Position = 0 ' l_ru_pri.Text = ro.GetString("CAT_CL_RUTA") @@ -343,6 +343,8 @@ End Sub Sub B4XPage_Appear ' LogColor($"########## ${Subs.traeRuta} ##########"$, Colors.red) p_principal.Visible = True + E_RUTA2.Text = "" + p_ruta2.Visible = False Subs.validaPromoProcterPRO3009 HORAINGRESO ="000000" Btn_Ubicar.Left = (Root.Width/2) - (Btn_Ubicar.Width/2) @@ -1046,7 +1048,7 @@ Sub cargar_Click If E_RUTA2.text <> "" Then B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text)) E_RUTA2.Visible = False - Panel11.Visible = False + p_ruta2.Visible = False cmd.Initialize cmd.Name = "select_cat_clientes_guna_GV2" @@ -1979,7 +1981,7 @@ Sub connecta_Click Private revisaActualizacion As Map = Subs.revisaForzarActualizacion Log(revisaActualizacion) If E_RUTA2.Text = e_ruta.Text Then - Msgbox("La ruta principal y la de suplencia NO puede ser la misma.","ERROR") + Msgbox("La ruta principal y la de suplencia NO pueden ser la misma.","ERROR") Else If e_ruta.Text = "KMTS1" Then cargar.Visible = True @@ -2137,7 +2139,7 @@ Sub e_ruta_EnterPressed If e_ruta.Text = "SUPLENCIA" Then e_ruta.Text = "" E_RUTA2.Visible = True - Panel11.Visible = True + p_ruta2.Visible = True End If End Sub diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index b8f31b8..21f68c1 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -544,7 +544,7 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) Dim pnl As B4XView = pnl0.GetView(0) Dim laCant As B4XView = pnl.GetView(2).GetView(3) Dim esteTag As List = Regex.Split("\|", laCant.Tag) - If esteTag.Get(1) < new then laCant.Text = esteTag.Get(1) + If esteTag.Get(1) < New Then laCant.Text = esteTag.Get(1) If Not(Old = "0" And New = "") And etCantHasFocus Then Log(esteTag) Subs.actualizaProducto(Subs.traeAlmacen, esteTag.Get(0), laCant.Text, Subs.traeProdNombre(esteTag.Get(2)), esteTag.Get(2), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) @@ -708,6 +708,7 @@ Private Sub b_continuar_Click ' Subs.guardaProducto(Subs.traeAlmacen, p1.Get("precio"), p1.Get("cant"), pn, p, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta) ' End If ' Next + etCantHasFocus = False Log("promos-inv, prods-inv, cat-vis") lv_promos.Visible = False clv_productos.AsView.Visible = False diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 38b827f61ed3984e26ae565d2867d458a8de8e94..50d1e9ec4b4af2ebd09159077fd5af15a5aa685a 100644 GIT binary patch delta 56 zcmey`%lxL7c|#5>H#-9ZLqU8|X-T5dlMAvHC)aJ~*t~G3 GH!lDvD--(w diff --git a/B4A/Guna Vistas V3.1.b4a b/B4A/Guna Vistas V3.1.b4a index e14f685..2cae0ea 100644 --- a/B4A/Guna Vistas V3.1.b4a +++ b/B4A/Guna Vistas V3.1.b4a @@ -251,7 +251,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Guna Preventa #VersionCode: 1 - #VersionName: 4.10.21 + #VersionName: 4.10.23 '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 c5931f7..12b8f10 100644 --- a/B4A/Guna Vistas V3.1.b4a.meta +++ b/B4A/Guna Vistas V3.1.b4a.meta @@ -55,8 +55,8 @@ ModuleClosedNodes1=11,13,14 ModuleClosedNodes10= ModuleClosedNodes11= ModuleClosedNodes12=6 -ModuleClosedNodes13=3 -ModuleClosedNodes14= +ModuleClosedNodes13= +ModuleClosedNodes14=17,18,20 ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17=4 @@ -76,6 +76,6 @@ ModuleClosedNodes6=8,9,10,11 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,B4XPage_Appear,337,6,C_Principal,e_ruta2_TextChanged,2568,4,C_Principal,cargar_Click,1068,4,C_Principal,Subir_Click,531,0,C_Cliente,b_Inicio_Fin_venta_Click,4744,0,C_Cliente,B4XPage_Created,445,0,C_Principal,e_ruta_EnterPressed,2106,0,C_Principal,t2_tick,2101,6,Subs,traeProdNombre,658,0,Subs,traeRuta,672,6 +NavigationStack=C_Principal,Class_Globals,0,0,C_Principal,B4XPage_Appear,338,0,C_Principal,B4XPage_Created,286,5,Main,Activity_Create,32,0,Visual Designer,principal.bal,-100,3,C_NoVenta,Class_Globals,0,0,C_NoVenta,GUARDA_Click,74,0,C_NoVenta,GPS_LocationChanged,60,0,C_NoVenta,B4XPage_Appear,55,3,C_NoVenta,B4XPage_Created,49,0,Subs,bitacora,1289,0 SelectedBuild=0 -VisibleModules=23,2,24,13,14,4,25,9,19 +VisibleModules=23,2,24,13,14,4,25,9,19,10 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 54a54a7..54eeb04 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1550,6 +1550,10 @@ Sub revisaForzarActualizacion As Map m.Put("forzar", 0) m.Put("nuevaVersion", nuevaVersion) End If + If nuevaVersion = "" Or nuevaVersion = Null Or nuevaVersion = "null" Then + m.Put("forzar", 0) + m.Put("nuevaVersion", "") + End If Return m End Sub