From 88f693759dbf76efaa5fb5a9e3d6d26a3d7619e0 Mon Sep 17 00:00:00 2001 From: cvaldes1201 Date: Wed, 31 Jan 2024 10:28:19 -0600 Subject: [PATCH] ... --- B4A/C_Cliente.bas | 50 ++++++++++++++++++++++++++++++++---------- B4A/C_Principal.bas | 2 +- B4A/C_Productos.bas | 2 +- B4A/Durakelo.b4a | 2 +- B4A/Durakelo.b4a.meta | 4 ++-- B4A/Files/cliente.bal | Bin 33517 -> 33517 bytes B4A/Subs.bas | 2 +- 7 files changed, 44 insertions(+), 18 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 235eb99..f179883 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -149,6 +149,7 @@ Sub Class_Globals Dim itemselect2 As String Dim pregunta7 As String Dim bandera As Int + Dim errorImpresora As Int = 0 End Sub Sub initialize @@ -205,6 +206,9 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + + B_VENTA.Enabled = True + If Subs.traeCliente = 0 Then B_VENTA.Enabled = False c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP")) If c.RowCount > 0 Then c.Position = 0 @@ -435,6 +439,7 @@ Sub gest_Click ' End If ' Else If la_cuenta.Text = "0" Then ' Starter.tipov = "PREVENTA" +' If Subs.traeCliente = 0 Then Starter.tipov = "ABORDO" ' B4XPages.ShowPage("Productos") ' End If Starter.tipov = "PREVENTA" @@ -1228,7 +1233,7 @@ Sub B_VENTA_Click ' Starter.tipov = "VENTA" ' B4XPages.ShowPage("Productos") ' End If -' + Starter.tipov = "VENTA" 'StartActivity(colonia2) B4XPages.ShowPage("Productos") @@ -1330,23 +1335,44 @@ Sub B_EXIBI_Click End Sub Sub Printer1_Connected (Success As Boolean) - Log("Impresora conectada.") +' If Logger Then Log("Printer1_Connected") If Success Then - Log("aqui estoy 1") - ToastMessageShow("Connected successfully", False) + ToastMessageShow("Impresora conectada", False) Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MACIMP")) - Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP", Starter.mac_impresora)) - B_IMP.Enabled = True - impresoraConectada = False -' Printer1.DisConnect + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP",Starter.mac_impresora)) + LogColor("Impresora conectada", Colors.Green) +' B_IMP2.Enabled = True + impresoraConectada = True Else -' Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") -' If Msgbox2("", "Printer Error","Reprint","Cancel","",Null) = DialogResponse.POSITIVE Then 'ignore -' StartPrinter -' End If +' Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") 'ignore +' ToastMessageShow("Error conectando la impresora", False) + LogColor("Error conectando la impresora", Colors.Red) + errorImpresora = errorImpresora + 1 + If errorImpresora > 1 Then + Starter.MAC_IMPRESORA = "0" + errorImpresora = 0 + End If End If End Sub +'Sub Printer1_Connected (Success As Boolean) +' Log("Impresora conectada.") +' If Success Then +' Log("aqui estoy 1") +' ToastMessageShow("Connected successfully", False) +' Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MACIMP")) +' Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP", Starter.mac_impresora)) +' B_IMP.Enabled = True +' impresoraConectada = False +'' Printer1.DisConnect +' Else +'' Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") +'' If Msgbox2("", "Printer Error","Reprint","Cancel","",Null) = DialogResponse.POSITIVE Then 'ignore +'' StartPrinter +'' End If +' End If +'End Sub + Sub StartPrinter Dim PairedDevices As Map Dim L As List diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 512f8ec..52c7009 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1979,7 +1979,7 @@ Sub connecta_Click Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_ruta_DUR2" + cmd.Name = "select_ruta_DUR2_2" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei) Log($"${ALMACEN},${e_ruta.text},${imei}"$) reqManager.ExecuteQuery(cmd , 0, "ruta") diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 7236a45..f14f22e 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -699,7 +699,7 @@ Sub b_prodMas_Click End If If Subs.traeCliente = 0 Then ' Log("######### "& NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)) - laCant.Text = NumberFormat2((laCant.Text - 1), 1, 0, 0, False) +' laCant.Text = NumberFormat2((laCant.Text - 1), 1, 0, 0, False) Subs.actualizaProducto(almacenX, precioX, precio2, laCant.text, nombreX, id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, Starter.tipov) ' Log("######### "& NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)) End If diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index c793db5..e23e34d 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -797,7 +797,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 4.01.23_1 + #VersionName: 4.01.28 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 7b66c77..b01c1e4 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -67,9 +67,9 @@ ModuleClosedNodes3= ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6= -ModuleClosedNodes7=1,3 +ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,B4XPage_Appear,267,0,C_Principal,Class_Globals,0,0,C_Nota,Class_Globals,0,0,C_Principal,cargar_Click,958,0,C_Cliente,Class_Globals,0,0,Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B_INV_Click,1117,0,C_Cliente,GPS_LocationChanged,362,0,C_Cliente,gest_Click,434,0,C_Cliente,B_VENTA_Click,1226,0,C_Cliente,B4XPage_Appear,296,0 +NavigationStack=Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B4XPage_Appear,204,6,Starter,Timer1_Tick,67,0,Starter,ENVIA_ULTIMA_GPS,91,0,Starter,Process_Globals,20,0,C_Productos,Class_Globals,0,0,C_Principal,trabajar_Click,437,0,C_Principal,connecta_Click,1957,0,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,438,0,C_Cliente,B_VENTA_Click,1230,0 SelectedBuild=0 VisibleModules=21,2,9,18,7,10,22,11,23,4 diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 69c877750d87cccd8f06eb174ba4304c60956ef3..45b3de627b76118d4efca9030953501a2fa984bf 100644 GIT binary patch delta 26 icmaFc%JjCCX+u{Cb9s6BWJNRa$rIvNZ}tzJrwag_