mirror of
https://github.com/KeymonSoft/Lanterna_H.git
synced 2026-04-17 21:06:16 +00:00
- Se corrigio que la pantalla de reasignar mesa se muestre bien.
- Se agregó que cuando se descargue informacion de web, si había mesas abiertas, se regrese la informacion a CAT_MESAS. - Se corrigio el como se ven los campos cuando se cierra la mesa.
This commit is contained in:
@@ -1,20 +1,29 @@
|
||||
Build1=Default,lanterna2.keymon.lat,HU2_PUBLIC
|
||||
Build1=Default,lanterna_h.keymon.lat,HU2_PUBLIC
|
||||
File1=candado.png
|
||||
File10=logoLanter2.bmp
|
||||
File11=logoLanterNegro.bmp
|
||||
File12=logoLanterNegro.png
|
||||
File13=logoLanterNegro2.bmp
|
||||
File14=principal.bal
|
||||
File15=proditem.bal
|
||||
File16=usuario.png
|
||||
File10=logo.png
|
||||
File11=logolanter.bmp
|
||||
File12=logoLanter.png
|
||||
File13=logoLanter_192x192.png
|
||||
File14=logoLanter2.bmp
|
||||
File15=logoLanterNegro.bmp
|
||||
File16=logoLanterNegro.png
|
||||
File17=logoLanterNegro2.bmp
|
||||
File18=mainpage.bal
|
||||
File19=mesasitem.bal
|
||||
File2=durakelo.png
|
||||
File20=principal.bal
|
||||
File21=proditem.bal
|
||||
File22=proditemcarrito.bal
|
||||
File23=resumencont.bal
|
||||
File24=usuario.png
|
||||
File25=vecteezy_white-diagonal-stripes-with-red-line-isolated-on-white.png
|
||||
File3=engrane.png
|
||||
File4=engranes.png
|
||||
File5=Layout.bal
|
||||
File6=login.bal
|
||||
File7=logo.png
|
||||
File8=logoLanter.png
|
||||
File9=logoLanter_192x192.png
|
||||
File5=errormanager.bal
|
||||
File6=formapago.bal
|
||||
File7=kmt.db
|
||||
File8=Layout.bal
|
||||
File9=login.bal
|
||||
FileGroup1=Default Group
|
||||
FileGroup10=Default Group
|
||||
FileGroup11=Default Group
|
||||
@@ -23,7 +32,16 @@ FileGroup13=Default Group
|
||||
FileGroup14=Default Group
|
||||
FileGroup15=Default Group
|
||||
FileGroup16=Default Group
|
||||
FileGroup17=Default Group
|
||||
FileGroup18=Default Group
|
||||
FileGroup19=Default Group
|
||||
FileGroup2=Default Group
|
||||
FileGroup20=Default Group
|
||||
FileGroup21=Default Group
|
||||
FileGroup22=Default Group
|
||||
FileGroup23=Default Group
|
||||
FileGroup24=Default Group
|
||||
FileGroup25=Default Group
|
||||
FileGroup3=Default Group
|
||||
FileGroup4=Default Group
|
||||
FileGroup5=Default Group
|
||||
@@ -58,7 +76,7 @@ Module4=numeroATexto
|
||||
Module5=Principal
|
||||
Module6=Starter
|
||||
Module7=Subs
|
||||
NumberOfFiles=16
|
||||
NumberOfFiles=25
|
||||
NumberOfLibraries=18
|
||||
NumberOfModules=7
|
||||
Version=12.8
|
||||
@@ -66,7 +84,7 @@ Version=12.8
|
||||
#Region Project Attributes
|
||||
#ApplicationLabel: Lanterna
|
||||
#VersionCode: 1
|
||||
#VersionName: 4.04.18
|
||||
#VersionName: 4.04.28
|
||||
'SupportedOrientations possible values: unspecified, landscape or portrait.
|
||||
#SupportedOrientations: landscape
|
||||
#CanInstallToExternalStorage: False
|
||||
@@ -151,6 +169,11 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
' Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("DESCUENTO X EFECTIVO"))
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("DESCUENTO X EFECTIVO","10"))
|
||||
End If
|
||||
Private z As ResultSet = Starter.skmt.ExecQuery2("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As String ("IMPRESION_ACTIVA"))
|
||||
If z.RowCount = 0 Then
|
||||
Log("Guardamos impresion como true")
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("IMPRESION_ACTIVA", True))
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub Activity_Resume
|
||||
@@ -163,11 +186,21 @@ Sub Activity_Resume
|
||||
Starter.imprimirTicket = ia
|
||||
End Sub
|
||||
|
||||
|
||||
Sub Activity_KeyPress (key As Int) As Boolean
|
||||
' BACK key pressed
|
||||
If key=KeyCodes.KEYCODE_BACK Then
|
||||
p_configuracion.Visible = False
|
||||
Subs.panelVisible(p_login, 0, 0)
|
||||
End If
|
||||
Return True
|
||||
' Returning False signals the system to handle the key
|
||||
End Sub
|
||||
|
||||
Sub Activity_Pause (UserClosed As Boolean)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Private Sub i_logo_Click
|
||||
|
||||
End Sub
|
||||
@@ -234,6 +267,10 @@ Private Sub i_conf_Click
|
||||
p_configuracion.Height = Activity.Height
|
||||
p_configuracion.BringToFront
|
||||
Subs.panelVisible(p_configuracion, 0, 0)
|
||||
Private z As ResultSet = Starter.skmt.ExecQuery2("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As String ("IMPRESION_ACTIVA"))
|
||||
Do While z.NextRow
|
||||
If z.GetString("CAT_VA_VALOR") = 1 Then cb_impresionActiva.Checked = True
|
||||
Loop
|
||||
End Sub
|
||||
|
||||
Private Sub b_cargaProductos_Click
|
||||
@@ -311,6 +348,14 @@ Sub JobDone(Job As HttpJob)
|
||||
Next
|
||||
Starter.skmt.TransactionSuccessful 'Si no se pone TransactionSuccessful no se escribe NADA!!
|
||||
Starter.skmt.EndTransaction
|
||||
|
||||
'Revisamos si con la carga de la información no se borró la info de alguna mesa abierta.
|
||||
Private m As ResultSet = Starter.skmt.ExecQuery($"select distinct M_ID, PT_PAGO, PT_TICKET, PT_MESERO, PT_COMENSALES from PEDIDO_TICKET join CAT_MESAS on PT_MESA = M_ID where PT_PAGO = 'VENTA' and M_ESTATUS is null "$)
|
||||
Log(m.RowCount)
|
||||
Do While m.NextRow ' Si hay registros en pedido_ticket, entonces atualizamos CAT_MESAS con la info faltante.
|
||||
Log($"${m.GetString("M_ID")}, ${m.GetString("PT_PAGO")}, ${m.GetString("PT_TICKET")}, ${m.GetString("PT_MESERO")}, ${m.GetString("PT_COMENSALES")}"$)
|
||||
Starter.skmt.ExecNonQuery($"update CAT_MESAS set M_ESTATUS = 'ABIERTA', M_TICKET = '${m.GetString("PT_TICKET")}', M_MESERO = '${m.GetString("PT_MESERO")}', M_COMENSALES = '${m.GetString("PT_COMENSALES")}' where M_ID = '${m.GetString("M_ID")}' "$)
|
||||
Loop
|
||||
End If
|
||||
|
||||
If result.Tag = "selectMeseros" Then 'query tag
|
||||
@@ -327,7 +372,7 @@ Sub JobDone(Job As HttpJob)
|
||||
Starter.skmt.TransactionSuccessful 'Si no se pone TransactionSuccessful no se escribe NADA!!
|
||||
Starter.skmt.EndTransaction
|
||||
' If Principal.cb_mesero.IsInitialized Then Principal.cb_mesero.SetItems(Subs.traeMeserosLista)
|
||||
Starter.cargaMeseros = true
|
||||
Starter.cargaMeseros = True
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user