From 193865c6fe97df34e532858d92725c22a653fc96 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Wed, 1 May 2024 20:24:22 -0600 Subject: [PATCH] - Correccion en el codigo del B_IMP2 y el pedido sugerido!! --- B4A/C_Cliente.bas | 4 ++-- B4A/C_Principal.bas | 7 ++++++- B4A/C_Productos.bas | 2 +- B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 2 +- B4A/kms_helperSubs.bas | 4 ++-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 50d442c..3b4457d 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -1083,7 +1083,7 @@ End Sub Sub B_IMP2_Click LogColor(kh.traeDisponibleAbordo,Colors.Green) - If kh.traeDisponibleAbordo < 0 Then + If kh.traeDisponibleAbordo < 0 And la_cuenta.Text = "0" Then Msgbox2Async("No tienes venta suficiente","Atención", "Modificar pedido", "", "Borrar pedido",LoadBitmap(File.DirAssets,"alert2.png"),False) Wait For Msgbox_Result (result As Int) If result = DialogResponse.POSITIVE Then @@ -1094,7 +1094,7 @@ Sub B_IMP2_Click B4XPages.MainPage.nota.borra_Click B4XPage_Appear End If - Else If kh.traeDisponibleAbordo >= 0 Then + Else Imprime_ticket End If End Sub diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index ac993ad..5e7efe1 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -2523,6 +2523,7 @@ Sub B_PROXIMA_Click b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido where pe_cliente = 0 and pe_tipo = 'ABORDO' " ) b.Position = 0 If horaentrada Then + Log(b.GetString("CUANTOS")) If b.GetString("CUANTOS") > 0 Then ' If horaentrada Then Starter.skmt.ExecNonQuery("delete from CUENTAA") @@ -2531,7 +2532,9 @@ Sub B_PROXIMA_Click B4XPages.ShowPage("Productos") ' End If Else If b.GetString("CUANTOS") = 0 Then + Log(777) e = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO_SUGERIDO") + Log(e.RowCount) If e.RowCount > 0 Then Msgbox2Async("Tienes un pedido sugerido, ¿Deseas aceptarlo?","Atención", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png"),False) Wait For Msgbox_Result (result As Int) @@ -2558,7 +2561,7 @@ Sub B_PROXIMA_Click B4XPages.ShowPage("Productos") ' End If End If - Else If c.RowCount = 0 Then + Else ' If horaentrada Then Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("0")) @@ -2605,8 +2608,10 @@ Sub horaentrada As Boolean Log("lasDoce: " & DateUtils.TicksToString(lasDoce)) If DateTime.Now < lasDoce Then ToastMessageShow($"No puedes entrar al ABORDO antes de las ${Subs.horaNormal(lasDoce)}"$, True) + Log("False") Return False Else + Log("true") Return True End If End Sub diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index afb16e7..6ab5d74 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -664,7 +664,7 @@ Sub b_prodMas_Click End If Subs.actualizaProducto(almacenX, precioX, laCant.text, nombreX, id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, Starter.tipov) If Subs.totalPedido < 1 Then - etCantHasFocus = True + etCantHasFocus = False Log("A CERO") laCant.Text = "0" et_pCant_TextChanged(100, 0) diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index f68d033..e38e332 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -869,7 +869,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.04.30 + #VersionName: 4.05.01 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 1dc1911..9ba4594 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -88,6 +88,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,horaentrada,2602,6,Subs,fechanormal,1661,0,Subs,horaNormal,1662,2,C_Cliente,B_IMP2_Click,1088,6,C_Principal,B4XPage_CloseRequest,1963,0,C_Principal,B_OK_RES_Click,2341,0,B4XMainPage,Class_Globals,23,0,Visual Designer,principal.bal,-100,1,C_Principal,Class_Globals,1,0,C_Principal,B_PROXIMA_Click,2559,6 +NavigationStack=C_Cliente,B_IMP2_Click,1087,6,C_Productos,B4XPage_Appear,162,0,C_Productos,cuentaProds,802,0,C_Productos,b_prodMas_Click,671,0,C_Productos,et_pCant_TextChanged,700,0,C_Principal,B_PROXIMA_Click,2556,4,kms_helperSubs,string2date,808,0,kms_helperSubs,traeDisponibleAbordo,800,0,kms_helperSubs,traeVentaAbordo,791,0,kms_helperSubs,traeLimiteAbordoXInventario,778,0,B4XMainPage,Class_Globals,23,0 SelectedBuild=0 VisibleModules=1,27,11,3,12,4,28,17,23,29 diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas index b890c68..afd09c6 100644 --- a/B4A/kms_helperSubs.bas +++ b/B4A/kms_helperSubs.bas @@ -800,8 +800,8 @@ End Sub Sub traeDisponibleAbordo As Double ' Log("Venta abordo") Private disp As Double = 0 -' Log($"${traeLimiteAbordoWeb} - ${traeLimiteAbordoXInventario} - ${traeVentaAbordo}"$) - disp = NumberFormat2((traeLimiteAbordoWeb - (traeLimiteAbordoXInventario) - traeVentaAbordo), 0, 2, 2, False) + Log($"${traeLimiteAbordoWeb} - ${traeLimiteAbordoXInventario} - ${traeVentaAbordo}"$) + disp = NumberFormat2(((traeLimiteAbordoWeb - traeLimiteAbordoXInventario) - traeVentaAbordo), 0, 2, 2, False) Return disp End Sub