diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 7629fe3..88e8cab 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -200,10 +200,11 @@ Sub JobDone(Job As HttpJob) Dim CAT_GP_FECHA As String = records(result.Columns.Get("CAT_GP_FECHA")) Dim CAT_GP_FECHA_MOD As String = records(result.Columns.Get("CAT_GP_FECHA_MOD")) Dim CAT_GP_CLASIF As String = records(result.Columns.Get("CAT_GP_CLASIF")) - Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF) VALUES (?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD,CAT_GP_CLASIF)) + Dim CAT_GP_TIPO As String = records(result.Columns.Get("CAT_GP_TIPO")) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD,CAT_GP_CLASIF,CAT_GP_TIPO)) Next For v = 1 To 20 'Agregamos productos varios (editables) - Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF) VALUES (?,?,?,?,?,?,?,?)", Array As Object ($"VAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Alimentos Varios ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","Varios")) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO) VALUES (?,?,?,?,?,?,?,?,?)", Array As Object ($"VAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Alimentos Varios ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","VARIOS")) Next Starter.skmt.TransactionSuccessful 'Si no se pone TransactionSuccessful no se escribe NADA!! Starter.skmt.EndTransaction diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 78fcedc..6a26fc0 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -8,7 +8,7 @@ Sub Class_Globals Private Root As B4XView 'ignore Private xui As XUI 'ignore Private p_principal As Panel - Private WobbleMenu1 As WobbleMenu + Dim WobbleMenu1 As WobbleMenu Dim PCLV, PCLVM As PreoptimizedCLV Private p_meseros As Panel Private clv_prods_ll, clv As CustomListView @@ -130,6 +130,7 @@ Sub Class_Globals Private p_reabrirMesaMulti As Panel Private b_reabrirMesaMulti As Button Private b_imp2 As Button + Private p_wobble As Panel End Sub 'You can add more parameters here. @@ -155,6 +156,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) WobbleMenu1.SetTabTextIcon(2,"Inventario", Chr(0xF16B), Typeface.FONTAWESOME) WobbleMenu1.SetTabTextIcon(3,"Ordenes", Chr(0xF155), Typeface.FONTAWESOME) ' WobbleMenu1.SetTabTextIcon(5,"Cinco", Chr(0xF29D), Typeface.FONTAWESOME) + p_principal.Width = Root.Width p_principal.Height = Root.Height clv_prods_ll.GetBase.SetLayoutAnimated(0, 5dip, (l_meseroAbierta2.Top + l_meseroAbierta2.Height + 5), Root.Width - 20, Root.Height * 0.55) 'Cambiamos el tamaño y posición de la lista de productos. @@ -224,7 +226,13 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear - Starter.imprimirTicket = True +' p_transparenteCierreAdmin.Elevation = 0 +' p_wobble.Left = 0 +' p_wobble.Height = 170 +' p_wobble.Top = Root.Height - p_wobble.Height - 50 +' p_wobble.Elevation = 10 +' p_wobble.BringToFront + Starter.imprimirTicket = False reqManager.Initialize(Me, Starter.DBReqServer) B4XPages.MainPage.atrasPresionado = False ' Log(Starter.DBReqServer) @@ -262,7 +270,13 @@ Sub B4XPage_Appear PCLVM.pnlOverlay.Width = clv_mesas.AsView.Width PCLVM.B4XSeekBar1.Update p_meseros.Height = Root.Height - WobbleMenu1.Height - If p_mesas.Visible And Subs.revisaCierreAdmin Then p_transparenteCierreAdmin.Visible = True Else p_transparenteCierreAdmin.Visible = False + If p_mesas.Visible And Subs.revisaCierreAdmin Then + B4XPages.MainPage.principal.p_transparenteCierreAdmin.BringToFront + B4XPages.MainPage.principal.p_transparenteCierreAdmin.Visible = True + Log(8) + Else + p_transparenteCierreAdmin.Visible = False + End If Private c As Cursor = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP")) c.Position = 0 If c.RowCount > 0 Then @@ -278,15 +292,18 @@ Sub B4XPage_Appear ' For x = 198 To 305 ' Log(NumberFormat2(x&".52", 1,2,2,True) & " -> " & n2t.NumberToWords(x&".52")) ' Next + WobbleMenu1.mBase.As(Panel).Elevation = 10dip 'Ponemos la elevacion en 10 para que quede enfrente de los paneles semitransparentes. End Sub Sub B4XPage_CloseRequest As ResumableSub ' BACK key pressed 'Return True to close, False to cancel - If lv_categorias.Visible And Starter.nivelActual = "SubCats" Then + Log($"${lv_categorias.Visible} And ${Starter.nivelActual}, ${Starter.catActual}"$) + If (lv_categorias.Visible Or Starter.catActual = "VARIOS") And Starter.nivelActual = "SubCats" Then Log(1) -' clv_prods_ll.AsView.Visible = False -' lv_categorias.Visible = True + clv_prods_ll.AsView.Visible = False + lv_categorias.Visible = True +' Starter.nivelActual = "Cats" muestraCats else If p_reabrirMesaMulti.Visible Then p_reabrirMesaMulti.Visible = False @@ -303,7 +320,12 @@ Sub B4XPage_CloseRequest As ResumableSub clv_prods_ll.AsView.Visible = False lv_categorias.Visible = True else If p_mesa.Visible Then - If Subs.revisaCierreAdmin Then p_transparenteCierreAdmin.Visible = True Else p_transparenteCierreAdmin.Visible = False + If Subs.revisaCierreAdmin Then + p_transparenteCierreAdmin.Visible = True + Log(8) + Else + p_transparenteCierreAdmin.Visible = False + End If p_mesa.Visible = False p_mesas.Visible = True LlenaMesas(Null, Null) @@ -319,6 +341,7 @@ Sub B4XPage_CloseRequest As ResumableSub End Sub Sub muestraCats + Log("MUESTRA CATS") Private lasCats As List = Subs.traeCategorias Starter.nivelActual = "Cats" lv_categorias.Clear @@ -677,7 +700,12 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Private Sub WobbleMenu1_Tab1Click - If Subs.revisaCierreAdmin Then p_transparenteCierreAdmin.Visible = True Else p_transparenteCierreAdmin.Visible = False +' Log("TAB 1") + If Subs.revisaCierreAdmin Then + p_transparenteCierreAdmin.Visible = True + Else + p_transparenteCierreAdmin.Visible = False + End If LlenaMesas(Null, Null) ' LlenaProdsLL(Null, Null) Subs.panelVisible(p_mesas, 0, 0) @@ -691,6 +719,7 @@ Private Sub WobbleMenu1_Tab1Click End Sub Private Sub WobbleMenu1_Tab2Click +' Log("TAB 2") LlenaProdsLL(Null, Null) ' PCLVM.B4XSeekBar1.mBase.Visible = False ' PCLV.B4XSeekBar1.mBase.BringToFront @@ -705,6 +734,7 @@ Private Sub WobbleMenu1_Tab2Click End Sub Private Sub WobbleMenu1_Tab3Click +' Log("TAB 3") Subs.panelVisible(p_historial, 0, 0) p_meseros.Visible = False ' p_carrito.Visible = False @@ -1085,6 +1115,15 @@ End Sub Private Sub lv_categorias_ItemClick (Position As Int, Value As Object) ' Log("ITEM CLICKED") + Starter.catActual = value + Log(Starter.nivelActual) + If Starter.nivelActual = "Cats" And Value = "VARIOS" Then + Log(6) + Starter.nivelActual = "SubCats" + lv_categorias_ItemClick (1, "VARIOS") + Starter.nivelActual = "SubCats" + End If + If Starter.nivelActual = "Cats" Then Private lasCats As List = Subs.traeSubCategorias(Value) Starter.nivelActual = "SubCats" @@ -1168,7 +1207,6 @@ End Sub Private Sub b_cierraAdmin_Click 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 ... cd1.Initialize(Colors.gray, 10dip) b_cierraAdmin.Background = cd1 @@ -1522,10 +1560,10 @@ Sub b_imp2_Click Private catAnt As String = "" Private catTotal As String = 0 If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$) - Log("** GRUPOS **") - cs.Color(Colors.red).Append($"** GRUPOS **${CRLF}"$).pop + Log("*** GRUPOS ***") + cs.Color(Colors.red).Append($"*** GRUPOS ***${CRLF}"$).pop Printer1.WriteString(Printer1.BOLD) - If imprimirAqui Then Printer1.WriteString($"** GRUPOS **${CRLF}"$) + If imprimirAqui Then Printer1.WriteString($"*** GRUPOS ***${CRLF}"$) Printer1.WriteString(Printer1.NOBOLD) For i = 0 To c.RowCount - 1 c.Position = i @@ -1542,10 +1580,10 @@ Sub b_imp2_Click End If ' Log($">>>>>>> CAT TOTAL ${catAnt}: ${catTotal}"$ ) End If - cs.Color(Colors.red).Append($"** ${c.GetString("CAT_GP_CLASIF")} **${CRLF}"$).pop - Log($"** ${c.GetString("CAT_GP_CLASIF")} **${CRLF}"$) + cs.Color(Colors.red).Append($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$).pop + Log($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$) Printer1.WriteString(Printer1.BOLD) - If imprimirAqui Then Printer1.WriteString($"** ${c.GetString("CAT_GP_CLASIF")} **${CRLF}"$) + If imprimirAqui Then Printer1.WriteString($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$) Printer1.WriteString(Printer1.NOBOLD) Private tipoAnt As String = "" catTotal = 0 @@ -1566,7 +1604,7 @@ Sub b_imp2_Click ' If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$) If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${cuantos}..${monto} ${CRLF}"$) catTotal = catTotal + c.GetString("cuantos") - Log($">>>> ${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$) +' Log($">>>> ${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$) If i = c.RowCount - 1 Then Log($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$) cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$).pop @@ -1652,7 +1690,7 @@ Sub b_imp2_Click Next totalPagos = NumberFormat2(totalPagos, 1, 0, 0, True) If imprimirAqui Then Printer1.WriteString($"TOTAL PAGOS ......... ${i}..${totalPagos} ${CRLF}"$) - If imprimirAqui Then Printer1.WriteString($"${CRLF}${CRLF}"$) + If imprimirAqui Then Printer1.WriteString($"${CRLF}${CRLF}${CRLF}"$) cs.Color(Colors.DarkGray).Append($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$).pop Log($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$) End If @@ -2095,24 +2133,26 @@ Private Sub b_imprimirTicket_Click If imprimirEste Then Printer1.WriteString(Printer1.REVERSE) If imprimirEste Then Printer1.PrintImage(myimage) If imprimirEste Then Printer1.WriteString(Printer1.UNREVERSE) - If imprimirEste Then Printer1.WriteString("RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF) - If logger Then Log("RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF) - If imprimirEste Then Printer1.WriteString("RFC: RCI230918DAA " & CRLF) - If logger Then Log("RFC: RCI230918DAA" & CRLF) - If imprimirEste Then Printer1.WriteString("REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF) - If logger Then Log("REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF) - If imprimirEste Then Printer1.WriteString("DOM FSC: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) - If logger Then Log("DOM FSC: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) - If imprimirEste Then Printer1.WriteString("EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) - If logger Then Log("EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) - If imprimirEste Then Printer1.WriteString("TEL: 55 5207 9969" & CRLF) - If logger Then Log("TEL: 55 5207 9969" & CRLF) + If tipoPago <> "VENTA" Then 'Solo imprimimos los datos fiscales si es para b_pagoCerrar. + If imprimirEste Then Printer1.WriteString("RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF) + If logger Then Log("RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF) + If imprimirEste Then Printer1.WriteString("RFC: RCI230918DAA " & CRLF) + If logger Then Log("RFC: RCI230918DAA" & CRLF) + If imprimirEste Then Printer1.WriteString("REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF) + If logger Then Log("REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF) + If imprimirEste Then Printer1.WriteString("DOM FSC: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) + If logger Then Log("DOM FSC: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) + If imprimirEste Then Printer1.WriteString("EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) + If logger Then Log("EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF) + If imprimirEste Then Printer1.WriteString("TEL: 55 5207 9969" & CRLF) + If logger Then Log("TEL: 55 5207 9969" & CRLF) + End If + If imprimirEste Then Printer1.WriteString("CDMX " & sDate &" " & sTime & CRLF) + If logger Then Log("CDMX " & sDate &" " & sTime & CRLF) If imprimirEste Then Printer1.WriteString(Printer1.BOLD) If imprimirEste Then Printer1.WriteString("No. Ticket: " & Starter.ticketActual & CRLF) If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD) If logger Then Log("No. Ticket: " & Starter.ticketActual & CRLF) - If imprimirEste Then Printer1.WriteString("CDMX " & sDate &" " & sTime & CRLF) - If logger Then Log("CDMX " & sDate &" " & sTime & CRLF) If imprimirEste Then Printer1.WriteString($"Mesero: ${Starter.meseroActual}${Subs.rellenaHasta(15 - Starter.meseroActual.Length)}${Printer1.BOLD} # Mesa${CRLF}"$) If logger Then Log($"Mesero: ${Starter.meseroActual}${Subs.rellenaHasta(15 - Starter.meseroActual.Length)} # Mesa${CRLF}"$) If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD) @@ -2134,8 +2174,9 @@ Private Sub b_imprimirTicket_Click Private elNombre As String = c.GetString("PE_PRONOMBRE") If elNombre.Length > 30 Then elNombre.SubString2(0, 30) elSubTotal = c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100)) - If imprimirEste Then Printer1.WriteString($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), 30, ".")}${CRLF}"$) - Log($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), 30, ".")}${CRLF}"$) + Private cantXpu As String = $"${c.GetString("PE_CANT")} x ${c.GetString("PE_COSTOU")}"$ + If imprimirEste Then Printer1.WriteString($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$) + Log($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$) Next End If c = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, "0") as propina, ifnull(PT_ALMACEN, "") as ALM from PEDIDO_TICKET where PT_MESA = '${Starter.mesaActual}' and PT_PAGO = '${tipoPago}' and PT_TICKET = '${Starter.ticketActual}'"$) diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index e07348d..5804d5b 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Lanterna.b4a b/B4A/Lanterna.b4a index fd7f138..8710910 100644 --- a/B4A/Lanterna.b4a +++ b/B4A/Lanterna.b4a @@ -82,7 +82,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 4.03.13 + #VersionName: 4.03.20 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Lanterna.b4a.meta b/B4A/Lanterna.b4a.meta index 42d06ed..c33f27e 100644 --- a/B4A/Lanterna.b4a.meta +++ b/B4A/Lanterna.b4a.meta @@ -25,6 +25,6 @@ ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=47,48 -NavigationStack=C_Principal,b_mesaEditar_Click,1057,0,C_Principal,B4XPage_Created,217,0,C_Principal,B4XPage_CloseRequest,279,6,C_Principal,muestraCats,314,2,C_Principal,p_mesasItem_Click,912,0,Main,Activity_ActionBarHomeClick,35,0,B4XMainPage,Class_Globals,22,0,C_Principal,B4XPage_Appear,220,3,C_Principal,b_imp_Click,1362,0,C_Principal,b_imp2_Click,1501,6 +NavigationStack=C_Principal,B4XPage_Appear,286,0,C_Principal,p_mesasItem_Click,937,0,C_Principal,B4XPage_Created,211,0,B4XMainPage,JobDone,205,2,C_Principal,b_mesaEditar_Click,1096,0,Subs,traeSubCategorias,1411,3,C_Principal,p_mesaAbierta_Click,1106,0,C_Principal,lv_categorias_ItemClick,1111,3,C_Principal,B4XPage_CloseRequest,298,6,C_Principal,muestraCats,337,6 SelectedBuild=0 VisibleModules=1,7,8,2,3,6,4,5 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 04b460d..07929d6 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -27,7 +27,8 @@ Sub Process_Globals Dim ticketActual, mesaActual, meseroActual, comensalesActuales, totalActual, mac_impresora As String Dim formasDePago As Int = 1 Dim imprimirTicket As Boolean = False - dim nivelActual as string + Dim nivelActual As String + dim catActual as string End Sub Sub Service_Create diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 0035426..8fc17e4 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1409,6 +1409,7 @@ End Sub Sub traeSubCategorias(cat As String) As List Private c As Cursor = Starter.skmt.ExecQuery($"select distinct CAT_GP_CLASIF from CAT_GUNAPROD where CAT_GP_TIPO = '${cat}' order by CAT_GP_CLASIF"$) Private l As List + Log(c.RowCount) If c.RowCount > 0 Then l.Initialize For i = 0 To c.RowCount - 1 @@ -1498,6 +1499,7 @@ Sub revisaCierreAdmin As Boolean c.Position = 0 If c.GetString("CAT_VA_VALOR") = 1 Then ' B4XPages.MainPage.principal.p_transparenteCierreAdmin.BringToFront +' Log(7) ' B4XPages.MainPage.principal.p_transparenteCierreAdmin.Visible = True cierre = True Else