cheveguerra/Lanterna_H
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Lanterna_H.git synced 2026-04-18 05:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: cheveguerra:v5.02.13
Branches Tags
cheveguerra:main
cheveguerra:5.06.03 cheveguerra:4.09.11 cheveguerra:v5.02.13 cheveguerra:5.05.27
...
compare: cheveguerra:5.05.27
Branches Tags
cheveguerra:main
cheveguerra:5.06.03 cheveguerra:4.09.11 cheveguerra:v5.02.13 cheveguerra:5.05.27

3 Commits
v5.02.13 ... 5.05.27

Author SHA1 Message Date
Jose Alberto Guerra Ugalde
242499326c - VERSION 5.05.27 
- Se cambio el sevidor a keymon.net
- Se cambio el puerto al 1783
 2025-05-28 13:40:22 -06:00
Jose Alberto Guerra Ugalde
f64757a786 - VERSION 5.05.12 
- Se cambio "Mifel" por "Banorte"
 2025-05-16 14:41:29 -06:00
Jose Alberto Guerra Ugalde
928521fce2 - VERSION 5.03.28 
- Se corrigió que no guardaba los montos cuando se editaba una mesa con un solo tipo de pago en Resumen Dia
 2025-03-30 16:35:00 -06:00
5 changed files with 37 additions and 32 deletions
Expand all files Collapse all files

BIN
Files/principal.bal
View File

Binary file not shown.

7
Lanterna2.b4a
View File

@@ -90,7 +90,7 @@ Version=12.8
#Region Project Attributes
#ApplicationLabel: Lanterna
#VersionCode: 1
#VersionName: 5.02.13
#VersionName: 5.05.27
'SupportedOrientations possible values: unspecified, landscape or portrait.
#SupportedOrientations: landscape
#CanInstallToExternalStorage: False
@@ -299,7 +299,8 @@ Private Sub i_conf_Click
Label1.TextSize = 20
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:1782")
ListView1.AddSingleLine("http://192.99.93.204:1783")
ListView1.AddSingleLine("http://keymon.lat:9000")
p_configuracion.Width = Activity.Width
p_configuracion.Height = Activity.Height
@@ -318,7 +319,7 @@ Private Sub i_conf_Click
p_botones.BringToFront
p_botones.Top = p_server.Top + p_server.Height - 10dip
End If
If user.text.Trim = "KMTS7" Then b_borraEfectivo.Visible = true else b_borraEfectivo.Visible = False
If user.text.Trim = "KMTS7" Then b_borraEfectivo.Visible = True Else b_borraEfectivo.Visible = False
End Sub
Private Sub b_cargaProductos_Click

2
Lanterna2.b4a.meta
View File

@@ -28,6 +28,6 @@ ModuleClosedNodes6=6
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes9=
NavigationStack=Subs,traeCuantasMesas,1547,6,Principal,Activity_Resume,422,0,Principal,cuentaProds,686,0,Principal,b_impAB_Click,2998,6,Principal,l_prods_Click,399,6,Principal,b_prodMenos_Click,621,0,Principal,b_prodMas_Click,668,0,Diseñador Visual,proditem.bal,-100,1,Diseñador Visual,principal.bal,-100,1,Principal,p_mesasItem_Click,1228,0
NavigationStack=Principal,agregaFormaDePago,3521,0,Principal,cb_pago2_SelectedIndexChanged,3547,0,Principal,b_impAB_Click,2994,0,Diseñador Visual,mainpage.bal,-100,1,Diseñador Visual,principal.bal,-100,2,Principal,b_resumen_Click,4517,0,Main,b_cargaProductos_Click,244,0,Starter,Process_Globals,13,0,Starter,Service_Create,50,0,Main,i_conf_Click,213,0
SelectedBuild=0
VisibleModules=7,6,8,1

54
Principal.bas
View File

@@ -314,7 +314,7 @@ Sub Activity_Create(FirstTime As Boolean)
Subs.panelVisible(p_mesas, 0, 0)
cb_comensales.SetItems(Array As String(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20))
' cb_pago.SetItems(Array As String("American Express", "Visa/Mastercard", "Efectivo"))
cb_pagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
cb_pagoPropina.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
cb_mesero.SetItems(Subs.traeMeserosLista)
' Private lasCats As List = Subs.traeCategorias
Starter.nivelActual = "Cats"
@@ -325,8 +325,8 @@ Sub Activity_Create(FirstTime As Boolean)
Private Label1 As Label = lv_categorias.SingleLineLayout.Label
Label1.TextSize = 9dip
Label1.TextColor = Colors.Black
cb_nuevoPago.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
cb_nuevoPago.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
muestraCats
Log("################# PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
' Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
@@ -335,10 +335,10 @@ Sub Activity_Create(FirstTime As Boolean)
Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
' If Result Then Log("Tenemos permisos de bluetooth.")
' Log($"Resultado del CheckAndRequest: ${Result}"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Mifel' where PT_TARJETA like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Mifel' where PT_TARJETA like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_TARJETA like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_PAGO2 like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Banorte' where PT_TARJETA like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Banorte' where PT_TARJETA like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Banorte' where PT_TARJETA like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Banorte' where PT_PAGO2 like '%Visa%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Amex' where PT_TARJETA like '%American%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Amex' where PT_TARJETA like '%American%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_TARJETA like '%American%'"$)
@@ -1054,8 +1054,8 @@ Sub llenaHistorial
fecha = fecha.SubString2(1,10)
Private pt As String = ""
If rs_hist.GetString("pt") = "Mifel" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
pt = "Mifel"
If rs_hist.GetString("pt") = "Banorte" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
pt = "Banorte"
Else if rs_hist.GetString("pt") = "Amex" Then
pt = "Amex"
else if rs_hist.GetString("pt") = "Efectivo" Then
@@ -2872,7 +2872,7 @@ Sub b_impAB_Click
Private prop As ResultSet = Starter.skmt.ExecQuery($"Select PT_PAGO_PROPINA, sum(PT_PROPINA) As PROPINA from PEDIDO_TICKET where pt_pago <> 'MULTI-TICKET' group by PT_PAGO_PROPINA
order by CASE PT_PAGO_PROPINA
WHEN 'Amex' THEN 0
WHEN 'Mifel' THEN 1
WHEN 'Banorte' THEN 1
WHEN 'Efectivo' THEN 2
END"$)
If imprimirAqui Then Printer1.WriteString(CRLF)
@@ -2909,7 +2909,7 @@ Sub b_impAB_Click
group by PT_PAGO2
order by CASE PT_PAGO_PROPINA
WHEN 'Amex' THEN 0
WHEN 'Mifel' THEN 1
WHEN 'Banorte' THEN 1
WHEN 'Efectivo' THEN 2
END"$) ' and (CASE WHEN PT_PAGO = 'EFECTIVO' and PT_ALMACEN = 'MULTI-TICKET' THEN false ELSE true END) - El primer "case" es para que en el efectivo NO cuente los tickets multi-tickets, porque esos son "Consumo de alimentos".
Private totalComensales As Int = 0
@@ -2943,7 +2943,7 @@ Sub b_impAB_Click
Do While rtpa.NextRow
propAmex = rtpa.GetString("ptPropina")
Loop
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Mifel' group by pt_pago_propina"$)
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Banorte' group by pt_pago_propina"$)
Do While rtpmc.NextRow
propMifel = rtpmc.GetString("ptPropina")
Loop
@@ -2960,8 +2960,8 @@ Sub b_impAB_Click
' Log("ES AMEX")
montoAmex = monto
monto = monto + propAmex
else If elPago = "Mifel" Then
' Log("ES MIFEL")
else If elPago = "Banorte" Then
' Log("ES Banorte")
montoMifel = monto
monto = monto + propMifel
else If elPago = "Efectivo" Then
@@ -3524,8 +3524,8 @@ Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int, brinco As Int)
cb_pago2.Tag = tag0
' cb_pago2.mBase.SetTextSizeAnimated(0, 14dip)
et_montoPago2.Tag = tag0
cb_pago2.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Mifel"))
cb_pago2.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Banorte"))
p_num.Tag = tag0
listaFormasDePagoCB.Add(cb_pago2)
listaFormaDePago.Add(cb_pago2.SelectedItem)
@@ -3551,7 +3551,7 @@ Private Sub cb_pago2_SelectedIndexChanged (Index As Int)
listaFormaDePago.Set(Sender.As(B4XComboBox).tag - 1, Sender.As(B4XComboBox).SelectedItem)
If Sender.As(B4XComboBox).SelectedItem = "Amex" Then
cb_pagoPropina.SelectedIndex = 0
Else If Sender.As(B4XComboBox).SelectedItem = "Mifel" Then
Else If Sender.As(B4XComboBox).SelectedItem = "Banorte" Then
cb_pagoPropina.SelectedIndex = 1
else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then
cb_pagoPropina.SelectedIndex = 2
@@ -4476,10 +4476,10 @@ Private Sub b_resumen_Click
If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA"
l_formaPago.Text = o.GetString("PT_PAGO2")
Select o.GetString("PT_PAGO_PROPINA")
Case "Mifel"
l_propinaPago.Text = "Mifel"
Case "Banorte"
l_propinaPago.Text = "Banorte"
Case "Visa/Mastercard Debito"
l_propinaPago.Text = "Mifel Debito"
l_propinaPago.Text = "Banorte Debito"
Case "Amex"
l_propinaPago.Text = "Amex"
Case "Efectivo"
@@ -4496,7 +4496,7 @@ Private Sub b_resumen_Click
Do While rtpa.NextRow
propAmex = rtpa.GetString("ptPropina")
Loop
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Mifel' group by pt_pago_propina"$)
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Banorte' group by pt_pago_propina"$)
Do While rtpmc.NextRow
propMifel = rtpmc.GetString("ptPropina")
Loop
@@ -4525,7 +4525,7 @@ Private Sub b_resumen_Click
l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
' l_propinaAmex.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
l_totalAmex.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propAmex), 1, 2, 2, True)}"$
else if rt.GetString("PT_PAGO2") = "Mifel" Then
else if rt.GetString("PT_PAGO2") = "Banorte" Then
l_consumoTDC.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
' l_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifel), 1, 2, 2, True)}"$
@@ -4609,6 +4609,8 @@ Private Sub p_resItem_LongClick
p_transparenteCambioPagos.Visible = True
End Sub
'update PEDIDO_TICKET set PT_PAGO_PROPINA = 'Amex', PT_PAGO2 = 'Amex', PT_TARJETA = 'Amex' where PT_MESA = '1' and PT_TICKET = '00001'
Private Sub b_cambioPagos_Click
p_transparenteCambioPagos.Visible = False
Log(Sender.As(Button).tag)
@@ -4617,11 +4619,11 @@ Private Sub b_cambioPagos_Click
If alm = "null" Then alm = ""
Log("|" & alm & "|")
If alm = "MULTI-TICKET" Then
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
Log($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}''"$)
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
Log($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
Else
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
Log($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
Log($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
End If
b_resumen_Click
End Sub

6
Starter.bas
View File

@@ -16,7 +16,8 @@ Sub Process_Globals
Dim reqManager As DBRequestManager
Dim skmt As SQL
Dim Logger As Boolean = False
Dim DBReqServer As String = "http://keymon.lat:1782"
' Dim DBReqServer As String = "http://keymon.lat:1782"
Dim DBReqServer As String = "http://192.99.93.204:1783"
' Dim DBReqServer As String = "http://keymon.lat:9000"
Dim server, ruta As String
'Para los Logs
@@ -52,7 +53,8 @@ Sub Service_Create
logcat.LogCatStart(Array As String("-v","raw","*:F","B4A:v"), "logcat")
#end if
logs.Initialize
DBReqServer = "http://keymon.lat:1782"
' DBReqServer = "http://keymon.lat:1782"
DBReqServer = "http://192.99.93.204:1783"
' DBReqServer = "http://keymon.lat:9000"
If Logger Then Log($"Starter reqManager server: ${DBReqServer}"$)
Logger = False