diff --git a/Files/login.bal b/Files/login.bal index 549947a..a777d33 100644 Binary files a/Files/login.bal and b/Files/login.bal differ diff --git a/Lanterna2.b4a b/Lanterna2.b4a index fa5eebb..9a3f044 100644 --- a/Lanterna2.b4a +++ b/Lanterna2.b4a @@ -90,7 +90,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 4.07.20 + #VersionName: 4.07.31 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: landscape #CanInstallToExternalStorage: False @@ -151,6 +151,7 @@ Sub Globals Private cb_importarDesdeWA As CheckBox Dim habilitarImportarDesdeWA As Boolean = False Private b_update As Button + Private b_borraEfectivo As Button End Sub Sub Activity_Create(FirstTime As Boolean) @@ -221,6 +222,7 @@ Sub Activity_KeyPress (key As Int) As Boolean If p_configuracion.Visible Then p_configuracion.Visible = False Else If p_login.Visible Then + Log("SALIENDO") ExitApplication Else p_configuracion.Visible = False @@ -297,6 +299,7 @@ Private Sub i_conf_Click Label1.TextColor = Colors.Black ' If user.Text = "KMTS1" Then ListView1.AddSingleLine("http://10.0.0.205:1781") ListView1.AddSingleLine("http://keymon.lat:1782") + ListView1.AddSingleLine("http://keymon.lat:9000") p_configuracion.Width = Activity.Width p_configuracion.Height = Activity.Height p_configuracion.BringToFront @@ -422,6 +425,54 @@ Sub JobDone(Job As HttpJob) ' If Principal.cb_mesero.IsInitialized Then Principal.cb_mesero.SetItems(Subs.traeMeserosLista) Starter.cargaMeseros = True End If + + If result.Tag = "traePedido" Then 'query tag +' If Starter.Logger Then Subs.logJobDoneResultados(result) + Starter.skmt.ExecNonQuery("delete from PEDIDO") + For Each records() As Object In result.Rows +' PE_TIPO , PE_COSTO_TOT , PE_COSTOU , PE_CANT , PE_PRONOMBRE , PE_PROID , PE_FECHA , PE_TICKET , PE_MESA , PE_MESERO , PE_TIPO2 , PE_ORIGEN +' PT_MESA , PT_PAGO , PT_TICKET , PT_FECHA , PT_MESERO , PT_COMENSALES , PT_NOART , PT_MONTO , PT_TARJETA , PT_PROPINA , PT_PAGO_PROPINA , PT_PAGO2 , PT_ORIGEN , PT_FACTURAR + Log(records(result.Columns.Get("PE_FECHA_SINC"))) + Dim PE_TIPO As String = records(result.Columns.Get("PE_TIPO")) + Dim PE_COSTO_TOT As String = records(result.Columns.Get("PE_COSTO_TOT")) + Dim PE_COSTOU As String = records(result.Columns.Get("PE_COSTOU")) + Dim PE_CANT As String = records(result.Columns.Get("PE_CANT")) + Dim PE_PRONOMBRE As String = records(result.Columns.Get("PE_PRONOMBRE")) + Dim PE_PROID As String = records(result.Columns.Get("PE_PROID")) + Dim PE_FECHA As String = records(result.Columns.Get("PE_FECHA")) + Dim PE_TICKET As String = records(result.Columns.Get("PE_TICKET")) + Dim PE_MESA As String = records(result.Columns.Get("PE_MESA")) + Dim PE_MESERO As String = records(result.Columns.Get("PE_MESERO")) + Dim PE_TIPO2 As String = records(result.Columns.Get("PE_TARJETA")) + Dim PE_ORIGEN As Object = records(result.Columns.Get("PE_ORIGEN")) + Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO(PE_TIPO , PE_COSTO_TOT , PE_COSTOU , PE_CANT , PE_PRONOMBRE , PE_PROID , PE_FECHA , PE_TICKET , PE_MESA , PE_MESERO , PE_TIPO2 , PE_ORIGEN) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (PE_TIPO , PE_COSTO_TOT , PE_COSTOU , PE_CANT , PE_PRONOMBRE , PE_PROID , PE_FECHA , PE_TICKET , PE_MESA , PE_MESERO , PE_TIPO2 , PE_ORIGEN)) + Next + End If + If result.Tag = "traePedidoCliente" Then 'query tag +' If Starter.Logger Then Subs.logJobDoneResultados(result) + Starter.skmt.ExecNonQuery("delete from PEDIDO_TICKET") + For Each records() As Object In result.Rows +' PE_TIPO , PE_COSTO_TOT , PE_COSTOU , PE_CANT , PE_PRONOMBRE , PE_PROID , PE_FECHA , PE_TICKET , PE_MESA , PE_MESERO , PE_TIPO2 , PE_ORIGEN +' PT_MESA , PT_PAGO , PT_TICKET , PT_FECHA , PT_MESERO , PT_COMENSALES , PT_NOART , PT_MONTO , PT_TARJETA , PT_PROPINA , PT_PAGO_PROPINA , PT_PAGO2 , PT_ORIGEN , PT_FACTURAR +' Log(records(result.Columns.Get("PE_FECHA_SINC"))) + Dim PT_MESA As String = records(result.Columns.Get("PC_MESA")) + Dim PT_PAGO As String = records(result.Columns.Get("PC_TIPO")) + Dim PT_TICKET As String = records(result.Columns.Get("PC_TICKET")) + Dim PT_FECHA As String = records(result.Columns.Get("PC_FECHA")) + Dim PT_MESERO As String = records(result.Columns.Get("PC_MESERO")) + Dim PT_COMENSALES As String = "1" + Dim PT_NOART As String = records(result.Columns.Get("PC_NOART")) + Dim PT_MONTO As String = records(result.Columns.Get("PC_MONTO")) + Dim PT_PAGO2 As String = records(result.Columns.Get("PC_TARJETA")) + Dim PT_PROPINA As String = records(result.Columns.Get("PC_PROPINA")) + If PT_PROPINA = "null" Or PT_PROPINA = "" Then PT_PROPINA = 0 + Dim PT_PAGO_PROPINA As String = records(result.Columns.Get("PC_PROPINA_PAGO")) +' Dim PT_PAGO2 As String = records(result.Columns.Get("PT_PAGO2")) + Dim PT_ORIGEN As Object = records(result.Columns.Get("PC_ORIGEN")) +' Dim PT_FACTURAR As String = records(result.Columns.Get("PT_FACTURAR")) + Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO_TICKET(PT_MESA, PT_PAGO, PT_TICKET, PT_FECHA, PT_MESERO, PT_COMENSALES, PT_NOART, PT_MONTO, PT_PAGO2, PT_PROPINA, PT_PAGO_PROPINA, PT_ORIGEN) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (PT_MESA, PT_PAGO, PT_TICKET, PT_FECHA, PT_MESERO, PT_COMENSALES, PT_NOART, PT_MONTO, PT_PAGO2, PT_PROPINA, PT_PAGO_PROPINA, PT_ORIGEN)) + Next + End If End If End If ToastMessageShow("¡Información cargada!", False) @@ -451,9 +502,20 @@ Private Sub b_reimprimirTicket_Click End Sub Private Sub b_fix_Click - Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_NOART = '25', PT_MONTO = '4625', PT_PAGO2 = 'Mifel', PT_TARJETA = 'Mifel' where PT_TICKET = '00014' and PT_MESA = '5'"$) - Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_PAGO2 is null "$) - ToastMessageShow("LISTO", True) +' Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_NOART = '25', PT_MONTO = '4625', PT_PAGO2 = 'Mifel', PT_TARJETA = 'Mifel' where PT_TICKET = '00014' and PT_MESA = '5'"$) +' Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_PAGO2 is null "$) +' ToastMessageShow("LISTO", True) + Log("B_FIX") + reqManager.Initialize(Me, "http://keymon.lat:9000") + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "traePedido_Lanter" + cmd.Parameters = Array As Object("07/28/24") + reqManager.ExecuteQuery(cmd , 0, "traePedido") + cmd.Initialize + cmd.Name = "traePedidoCliente_Lanter" + cmd.Parameters = Array As Object("07/28/24") + reqManager.ExecuteQuery(cmd , 0, "traePedidoCliente") End Sub ' Se revisa si hay una intención (intent) de abrir una base de datos y si es así, entonces se importa esa base de datos. @@ -518,3 +580,9 @@ Private Sub i_logo_LongClick ' Log("Error uploading file") ' End If End Sub + + +Private Sub b_borraEfectivo_Click + CallSubDelayed(Principal, "borrarEfectivo") + ToastMessageShow("Efectivo borrado!!", False) +End Sub \ No newline at end of file diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta index 3c9bc8b..7c488e5 100644 --- a/Lanterna2.b4a.meta +++ b/Lanterna2.b4a.meta @@ -18,7 +18,7 @@ ModuleBreakpoints6= ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= -ModuleClosedNodes0=4 +ModuleClosedNodes0=6,7,8,9,10,12,13,14,15,16,19,20,21,22 ModuleClosedNodes1= ModuleClosedNodes2= ModuleClosedNodes3= @@ -28,6 +28,6 @@ ModuleClosedNodes6=3,6 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Visual Designer,principal.bal,-100,1,Principal,Process_Globals,28,0,Principal,Activity_Create,214,0,Main,Process_Globals,30,0,Main,i_conf_Click,214,0,Main,Activity_Resume,124,3,updateAvailable,Activity_Resume,43,0,Visual Designer,login.bal,-100,3,updateAvailable,ofreceActualizacion,55,2,Principal,b_cierraAdmin_Click,1614,6 +NavigationStack=Principal,b_envioInfo_Click,3221,3,Main,b_fix_Click,418,0,Main,b_reimprimirTicket_Click,413,0,Visual Designer,login.bal,-100,3,Principal,b_impAB_Click,2627,0,Principal,b_imp2_Click,1955,0,Principal,b_cierreTotal_Click,1655,0,Principal,imprimeResumenGrupos,2033,6,Main,Process_Globals,26,0,Visual Designer,principal.bal,-100,2 SelectedBuild=0 VisibleModules=7,6,8,1 diff --git a/Principal.bas b/Principal.bas index d8ec223..747cccc 100644 --- a/Principal.bas +++ b/Principal.bas @@ -1659,7 +1659,7 @@ Private Sub b_cierreTotal_Click If mesaAnt <> c.GetString("PE_MESA") Then Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$) tm.Position = 0 - Log($"Mesa ${c.GetString("PE_MESA")} - $${tm.GetString("totalMesa")} ${CRLF}"$) +' Log($"Mesa ${c.GetString("PE_MESA")} - $${tm.GetString("totalMesa")} ${CRLF}"$) cs.Color(Colors.RGB(1,127,1)).Append($"Mesa ${c.GetString("PE_MESA")} - $${NumberFormat2(tm.GetString("totalMesa"), 1, 2, 2, True)} ${CRLF}"$).pop Private tipoAnt As String = "" End If @@ -2030,14 +2030,17 @@ Sub imprimeResumenGrupos Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$) ' Log(c.RowCount) ' If c.RowCount = 0 Then 'Si no hay mesas abiertas entonces ... - Private c As Cursor = Starter.skmt.ExecQuery("select distinct PE_PRONOMBRE, PE_PROID, CAT_GP_TIPO2, CAT_GP_CLASIF, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' and PE_TIPO <> 'MULTI-TICKET' and PE_PROID not like 'CDA%' and PE_PROID not like 'DESC%' group by CAT_GP_TIPO2, PE_PRONOMBRE order by CAT_GP_ORDEN_GRUPOS, CAT_GP_TIPO2, PE_PRONOMBRE") 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01. + Private c As Cursor = Starter.skmt.ExecQuery("select distinct PE_PRONOMBRE, PE_PROID, CAT_GP_TIPO2, CAT_GP_CLASIF, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto, PE_FECHA from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' and PE_TIPO <> 'MULTI-TICKET' and PE_PROID not like 'CDA%' and PE_PROID not like 'DESC%' group by CAT_GP_TIPO2, PE_PRONOMBRE order by CAT_GP_ORDEN_GRUPOS, CAT_GP_TIPO2, PE_PRONOMBRE") 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01. ' Log(c.RowCount) If c.RowCount > 0 Then c.Position = 0 Private catAnt As String = "" Private catTotal As String = 0 Private catMontoTotal As String = 0 - If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$) + Private laFecha() As String = Regex.Split(" ", c.GetString("PE_FECHA")) 'Traemos la fecha del PEDIDO. + If imprimirAqui Then Printer1.WriteString($"Fecha: ${laFecha(0)} ${sTime} ${CRLF}${CRLF}"$) + cs.Color(Colors.red).Append($"Fecha: ${laFecha(0)} ${sTime}${CRLF}"$).pop + Log($"Fecha: ${laFecha(0)} ${sTime} ${CRLF}${CRLF}"$) Log("*** GRUPOS ***") cs.Color(Colors.red).Append($"*** GRUPOS ***${CRLF}"$).pop Printer1.WriteString(Printer1.BOLD) @@ -3216,7 +3219,6 @@ Private Sub b_envioInfo_Click ' VALUES ((?),SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?)) ' sql.insertPedidos_Lanter=insert into LANTER.pedido_cliente(PC_FECHA_SINC, PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO, PC_LON, PC_LAT, PC_IDALMACEN, PC_RUTA, PC_COSTO_SIN, PC_DESCUENTO, PC_FACTURA) ' VALUES (SYSDATE,(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?),(?)) - Private cantTotal As Int Private ventaTotal As Double Private pt As Cursor = Starter.skmt.ExecQuery("select * from pedido_ticket") @@ -3226,8 +3228,8 @@ Private Sub b_envioInfo_Click For j = 0 To pt.RowCount - 1 pt.Position = j cmd.Initialize - cmd.Name = "insertPedidos2_Lanter" 'Inserta en tabla PEDIDO_CLIENTE - cmd.Parameters = Array As Object(pt.GetString("PT_TICKET"), pt.GetString("PT_FECHA"), 0, pt.GetString("PT_NOART"), pt.GetString("PT_MONTO"), 0, 0, pt.GetString("PT_MESA"), pt.GetString("PT_MESERO"), pt.GetString("PT_COSTO_SIN"), 0, pt.GetString("PT_FACTURA"), pt.GetString("PT_PAGO"), pt.GetString("PT_TARJETA"), pt.GetString("PT_PROPINA"), pt.GetString("PT_PAGO_PROPINA")) + cmd.Name = "insertPedidos3_Lanter" 'Inserta en tabla PEDIDO_CLIENTE + cmd.Parameters = Array As Object(pt.GetString("PT_TICKET"), pt.GetString("PT_FECHA"), 0, pt.GetString("PT_NOART"), pt.GetString("PT_MONTO"), 0, 0, pt.GetString("PT_MESA"), pt.GetString("PT_MESERO"), pt.GetString("PT_COSTO_SIN"), 0, pt.GetString("PT_FACTURA"), pt.GetString("PT_PAGO"), pt.GetString("PT_TARJETA"), pt.GetString("PT_PROPINA"), pt.GetString("PT_PAGO_PROPINA"), pt.GetString("PT_ORIGEN")) ' Log($"${pt.GetString("PT_TICKET")}, ${pt.GetString("PT_FECHA")}, 0, ${pt.GetString("PT_NOART")}, ${pt.GetString("PT_MONTO")}, 0, 0, ${pt.GetString("PT_MESA")}, ${pt.GetString("PT_MESERO")}, ${pt.GetString("PT_COSTO_SIN")}, 0, ${pt.GetString("PT_PROPINA")}, ${pt.GetString("PT_PAGO_PROPINA")}"$) reqManager.ExecuteCommand(cmd , $"insertPedidos_${pt.GetString("PT_TICKET")}"$) ' LogColor($"insertPedidos_${pt.GetString("PT_TICKET")}"$, Colors.Red) @@ -3239,8 +3241,8 @@ Private Sub b_envioInfo_Click For i = 0 To c.RowCount - 1 c.position = i cmd.Initialize - cmd.Name = "insertPedido2_Lanter" 'Inserta en tabla PEDIDO - cmd.Parameters = Array As Object("", c.getstring("PE_MESA"), c.getstring("PE_COSTO_TOT"), c.getstring("PE_COSTOU"), c.getstring("PE_CANT"), c.getstring("PE_PRONOMBRE"), c.getstring("PE_PROID"), c.getstring("PE_TICKET"), c.getstring("PE_FECHA"), "", c.getstring("PE_MESERO"), c.getstring("PE_COSTO_SIN"), 0, cantTotal, ventaTotal, c.getstring("PE_FOLIO"), c.getstring("PE_TIPO"), "", c.getstring("PE_TIPO2")) ' + cmd.Name = "insertPedido3_Lanter" 'Inserta en tabla PEDIDO + cmd.Parameters = Array As Object("", c.getstring("PE_MESA"), c.getstring("PE_COSTO_TOT"), c.getstring("PE_COSTOU"), c.getstring("PE_CANT"), c.getstring("PE_PRONOMBRE"), c.getstring("PE_PROID"), c.getstring("PE_TICKET"), c.getstring("PE_FECHA"), "", c.getstring("PE_MESERO"), c.getstring("PE_COSTO_SIN"), 0, cantTotal, ventaTotal, c.getstring("PE_FOLIO"), c.getstring("PE_TIPO"), "", c.getstring("PE_TIPO2"), c.GetString("PE_ORIGEN")) ' reqManager.ExecuteCommand(cmd , $"insertPedido_${c.GetString("PE_MESA")}_${c.GetString("PE_TIPO")}_${c.GetString("PE_TICKET")}_${c.GetString("PE_PROID")}"$) ' LogColor($"insertPedido_${c.GetString("PE_MESA")}_${c.GetString("PE_TIPO")}_${c.GetString("PE_TICKET")}_${c.GetString("PE_PROID")}"$, Colors.Blue) @@ -3281,8 +3283,7 @@ Sub JobDone(Job As HttpJob) If reqManager.reqsList.Size = 0 Then ProgressDialogHide p_transparenteResumen.Visible = False - Starter.skmt.ExecNonQuery($"delete from PEDIDO where PE_TIPO = 'EFECTIVO'"$) - Starter.skmt.ExecNonQuery($"delete from PEDIDO_TICKET where PT_PAGO = 'EFECTIVO'"$) + borrarEfectivo llenaHistorial Log(">>>>> ENVIO TERMINADO") ToastMessageShow("¡Envío terminado!", False) @@ -3291,6 +3292,13 @@ Sub JobDone(Job As HttpJob) Job.Release End Sub +Sub borrarEfectivo + Log("Borramos el efectivo") + Starter.skmt.ExecNonQuery($"delete from PEDIDO where PE_TIPO = 'EFECTIVO'"$) + Starter.skmt.ExecNonQuery($"delete from PEDIDO_TICKET where PT_PAGO = 'EFECTIVO'"$) + Starter.skmt.ExecNonQuery($"delete from PEDIDO_TICKET where PT_PAGO2 = 'Efectivo'"$) +End Sub + Private Sub b_regresarProds_Click WobbleMenu1_Tab1Click WobbleMenu1.SetCurrentTab(1) diff --git a/Starter.bas b/Starter.bas index 4c95806..c5123ab 100644 --- a/Starter.bas +++ b/Starter.bas @@ -17,6 +17,7 @@ Sub Process_Globals Dim skmt As SQL Dim Logger As Boolean = False Dim DBReqServer As String = "http://keymon.lat:1782" +' Dim DBReqServer As String = "http://keymon.lat:9000" Dim server, ruta As String 'Para los Logs Dim logs As StringBuilder @@ -52,6 +53,7 @@ Sub Service_Create #end if logs.Initialize DBReqServer = "http://keymon.lat:1782" +' DBReqServer = "http://keymon.lat:9000" If Logger Then Log($"Starter reqManager server: ${DBReqServer}"$) Logger = False End Sub