From c7a1548122f0f0e6f4eae1d24b4f2a13ba1d7104 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 13 Apr 2024 01:48:10 -0600 Subject: [PATCH] =?UTF-8?q?-=20Se=20quit=C3=B3=20que=20la=20busqueda=20est?= =?UTF-8?q?e=20limitada=20por=20categoria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Principal.bas | 8 ++++++-- B4A/Lanterna.b4a | 4 ++-- B4A/Lanterna.b4a.meta | 2 +- B4A/Subs.bas | 9 +++++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 7ae48d8..159b494 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -2595,8 +2595,12 @@ Private Sub b_leyendaDescuento_Click If elNombre.Length > 30 Then elNombre.SubString2(0, 30) If c.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then ' Log($">> APLICAMOS DESC POR ALIMENTOS"$) - elSubTotal = c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100)) + Private elSubTIndividual As String = c.GetString("PE_COSTOU") - (c.GetString("PE_COSTOU") * (c.GetString("DESC") / 100)) + elSubTotal = Ceil(elSubTIndividual) * c.GetString("PE_CANT") +' elSubTotal = c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100)) +' Log(c.GetString("PE_COSTOU")) elSubTotal = Ceil(elSubTotal) + Log(elSubTotal) elPU = Ceil(c.GetString("PE_COSTOU") - (c.GetString("PE_COSTOU") * (c.GetString("DESC") / 100))) Else elSubTotal = c.GetString("PE_COSTO_TOT") @@ -2690,7 +2694,7 @@ Private Sub b_leyendaDescuento_Click End Sub Private Sub et_buscar_TextChanged (Old As String, New As String) - Private c As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_GP_IMG from cat_gunaprod where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' and CAT_GP_TIPO = '${Starter.catActual}' and CAT_GP_NOMBRE like '%${New}%' order by CAT_GP_NOMBRE"$) + Private c As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_GP_IMG from cat_gunaprod where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' and CAT_GP_NOMBRE like '%${New}%' order by CAT_GP_NOMBRE"$) ' and CAT_GP_TIPO = '${Starter.catActual}' LlenaProdsLL(c, Null) Log(c.RowCount) End Sub diff --git a/B4A/Lanterna.b4a b/B4A/Lanterna.b4a index be985c7..6264261 100644 --- a/B4A/Lanterna.b4a +++ b/B4A/Lanterna.b4a @@ -83,7 +83,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 4.04.01 + #VersionName: 4.04.08 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -101,7 +101,7 @@ Sub Process_Globals End Sub Sub Globals - + End Sub Sub Activity_Create(FirstTime As Boolean) diff --git a/B4A/Lanterna.b4a.meta b/B4A/Lanterna.b4a.meta index fdf4ff1..994ddf2 100644 --- a/B4A/Lanterna.b4a.meta +++ b/B4A/Lanterna.b4a.meta @@ -25,6 +25,6 @@ ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=47,48 -NavigationStack=Subs,Process_Globals,15,0,C_Principal,b_mesaCerrar_Click,1126,0,C_Principal,agregaFormaDePago,2255,0,Main,Globals,21,0,Visual Designer,principal.bal,-100,6,Visual Designer,login.bal,-100,2,Subs,rellenaHasta,1546,0,B4XMainPage,b_entrar_Click,129,0,B4XMainPage,b_envioBD_Click,153,2,B4XMainPage,b_server_Click,136,0 +NavigationStack=Visual Designer,login.bal,-100,2,B4XMainPage,b_entrar_Click,129,0,B4XMainPage,b_envioBD_Click,153,2,B4XMainPage,b_server_Click,136,0,B4XMainPage,Class_Globals,27,0,C_Principal,b_leyendaDescuento_Click,2626,6,Subs,traeTotalTicketActual_P,1176,6,Visual Designer,principal.bal,-100,6,C_Principal,lv_categorias_ItemClick,1181,0,C_Principal,et_buscar_TextChanged,2690,0,Main,Globals,21,0 SelectedBuild=0 VisibleModules=1,7,8,2,3,6,4,5 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 3ebc9cb..f535c69 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1165,19 +1165,24 @@ End Sub Sub traeTotalTicketActual_P(tipoPago As String) As String Private st As String = 0 Private desc As String = 0 - Private p As Cursor = Starter.skmt.ExecQuery($"select PE_COSTO_TOT, ifnull(PE_DESC, 0) as DESC, CAT_GP_NOMBRE, CAT_GP_TIPO from PEDIDO join CAT_GUNAPROD on CAT_GP_ID = PE_PROID where PE_TICKET = '${Starter.ticketActual}' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}'"$) + Private p As Cursor = Starter.skmt.ExecQuery($"select PE_COSTO_TOT, PE_COSTOU, PE_CANT, ifnull(PE_DESC, 0) as DESC, CAT_GP_NOMBRE, CAT_GP_TIPO from PEDIDO join CAT_GUNAPROD on CAT_GP_ID = PE_PROID where PE_TICKET = '${Starter.ticketActual}' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}'"$) ' Log($"${p.RowCount} - select PE_COSTO_TOT, ifnull(PE_DESC, 0) as DESC, CAT_GP_TIPO from PEDIDO join CAT_GUNAPROD on CAT_GP_ID = PE_PROID where PE_TICKET = '${Starter.ticketActual}' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}'"$) If p.RowCount > 0 Then For j = 0 To p.RowCount - 1 p.Position = j + Log(p.GetString("CAT_GP_TIPO")) If p.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then desc = p.GetString("DESC") / 100 ' desc = Ceil(desc) Else desc = 0 End If +' Log(desc) + Private elSubTIndividual As String = p.GetString("PE_COSTOU") - (p.GetString("PE_COSTOU") * desc) + Private st2 As String = Ceil(elSubTIndividual) * p.GetString("PE_CANT") ' Log(">>>>>>> " & p.GetString("CAT_GP_NOMBRE") & " - " & (p.GetString("PE_COSTO_TOT") * desc)) - st = st + Ceil((p.GetString("PE_COSTO_TOT") - (p.GetString("PE_COSTO_TOT") * desc))) 'Sumamos el subtotal anterior mas el REDONDEO del producto con descuento. +' Log(" >>>>>> " & st & " + " & st2) + st = st + st2 'Sumamos el subtotal anterior mas el REDONDEO del producto con descuento. Next End If 'st = Ceil(st)