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:4.09.11
Branches Tags
cheveguerra:main
cheveguerra:5.06.03 cheveguerra:4.09.11 cheveguerra:v5.02.13 cheveguerra:5.05.27
...
compare: cheveguerra:main
Branches Tags
cheveguerra:main
cheveguerra:5.06.03 cheveguerra:4.09.11 cheveguerra:v5.02.13 cheveguerra:5.05.27

7 Commits
4.09.11 ... main

Author SHA1 Message Date
Jose Alberto Guerra Ugalde
5580b42d70 - VERSION PRUEBA 2025-06-03 12:22:53 -06:00
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
Jose Alberto Guerra Ugalde
a401776920 - VERSION 5.02.13 
- Se agrego el "total" a la pantalla de la mesa.
- Se agregó el "total de mesas" al reporte A+B
 2025-02-13 00:41:30 -06:00
Jose Alberto Guerra Ugalde
c7d51fe082 .. 2025-01-25 16:33:48 -06:00
Jose Alberto Guerra Ugalde
5dd93c3835 .. 2025-01-25 16:31:41 -06:00
8 changed files with 97 additions and 33 deletions
Expand all files Collapse all files

16
.gitattributes vendored Normal file
View File

@@ -0,0 +1,16 @@
# Auto detect text files and perform LF normalization
* text=auto
# linguist-language
*.b4a linguist-language=B4X
*.b4i linguist-language=B4X
*.b4j linguist-language=B4X
*.b4r linguist-language=B4X
*.bas linguist-language=B4X
# linguist-detectable
*.b4a linguist-detectable=true
*.b4i linguist-detectable=true
*.b4j linguist-detectable=true
*.b4r linguist-detectable=true
*.bas linguist-detectable=true

BIN
Files/principal.bal
View File

Binary file not shown.

11
Lanterna2.b4a
View File

@@ -90,7 +90,7 @@ Version=12.8
#Region Project Attributes #Region Project Attributes
#ApplicationLabel: Lanterna #ApplicationLabel: Lanterna
#VersionCode: 1 #VersionCode: 1
#VersionName: 4.09.11 #VersionName: 5.05.27
'SupportedOrientations possible values: unspecified, landscape or portrait. 'SupportedOrientations possible values: unspecified, landscape or portrait.
#SupportedOrientations: landscape #SupportedOrientations: landscape
#CanInstallToExternalStorage: False #CanInstallToExternalStorage: False
@@ -104,6 +104,10 @@ Version=12.8
'###################### PUSH TORTOISE GIT ######################################################### '###################### PUSH TORTOISE GIT #########################################################
'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../"&Args=/closeonend:2 'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../"&Args=/closeonend:2
'########################################################################################################### '###########################################################################################################
'###################### PUSH TORTOISE GIT TAG #########################################################
'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=./../push_with_tag.ps1
'###########################################################################################################
#End Region #End Region
#Region Activity Attributes #Region Activity Attributes
@@ -299,7 +303,8 @@ Private Sub i_conf_Click
Label1.TextSize = 20 Label1.TextSize = 20
Label1.TextColor = Colors.Black Label1.TextColor = Colors.Black
' If user.Text = "KMTS1" Then ListView1.AddSingleLine("http://10.0.0.205:1781") ' 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") ListView1.AddSingleLine("http://keymon.lat:9000")
p_configuracion.Width = Activity.Width p_configuracion.Width = Activity.Width
p_configuracion.Height = Activity.Height p_configuracion.Height = Activity.Height
@@ -318,7 +323,7 @@ Private Sub i_conf_Click
p_botones.BringToFront p_botones.BringToFront
p_botones.Top = p_server.Top + p_server.Height - 10dip p_botones.Top = p_server.Top + p_server.Height - 10dip
End If 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 End Sub
Private Sub b_cargaProductos_Click Private Sub b_cargaProductos_Click

2
Lanterna2.b4a.meta
View File

@@ -28,6 +28,6 @@ ModuleClosedNodes6=6
ModuleClosedNodes7= ModuleClosedNodes7=
ModuleClosedNodes8= ModuleClosedNodes8=
ModuleClosedNodes9= ModuleClosedNodes9=
NavigationStack=Principal,b_impAB_Click,2968,0,Subs,traeTotalTicketActual_P,1166,0,Visual Designer,principal.bal,-100,5,Principal,b_cierraParcial_Click,1695,0,Principal,b_cierreTotal_Click,1677,3,Principal,b_imp3_Click,2526,0,Principal,p_mesasItem_Click,1260,0,Principal,b_pagoCerrar_Click,1563,6,Principal,b_leyendaDescuento_Click,4001,6,Main,i_conf_Click,231,6 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,Main,Globals,33,0
SelectedBuild=0 SelectedBuild=0
VisibleModules=7,6,8,1 VisibleModules=7,6,8,1

81
Principal.bas
View File

@@ -211,6 +211,7 @@ Sub Globals
Private et_nuevoPago As EditText Private et_nuevoPago As EditText
Private et_nuevoPagoPropina As EditText Private et_nuevoPagoPropina As EditText
Private p_botonesCierreTotal As Panel Private p_botonesCierreTotal As Panel
Private l_montoTotalMesa As Label
End Sub End Sub
Sub Activity_Create(FirstTime As Boolean) Sub Activity_Create(FirstTime As Boolean)
@@ -313,7 +314,7 @@ Sub Activity_Create(FirstTime As Boolean)
Subs.panelVisible(p_mesas, 0, 0) 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_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_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) cb_mesero.SetItems(Subs.traeMeserosLista)
' Private lasCats As List = Subs.traeCategorias ' Private lasCats As List = Subs.traeCategorias
Starter.nivelActual = "Cats" Starter.nivelActual = "Cats"
@@ -324,8 +325,8 @@ Sub Activity_Create(FirstTime As Boolean)
Private Label1 As Label = lv_categorias.SingleLineLayout.Label Private Label1 As Label = lv_categorias.SingleLineLayout.Label
Label1.TextSize = 9dip Label1.TextSize = 9dip
Label1.TextColor = Colors.Black Label1.TextColor = Colors.Black
cb_nuevoPago.SetItems(Array As String("Amex", "Mifel", "Efectivo")) cb_nuevoPago.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo")) cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
muestraCats muestraCats
Log("################# PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT")) Log("################# PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
' Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT")) ' Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
@@ -334,10 +335,10 @@ Sub Activity_Create(FirstTime As Boolean)
Wait For Activity_PermissionResult (Permission As String, Result As Boolean) Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
' If Result Then Log("Tenemos permisos de bluetooth.") ' If Result Then Log("Tenemos permisos de bluetooth.")
' Log($"Resultado del CheckAndRequest: ${Result}"$) ' 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_TARJETA = 'Banorte' 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_PAGO_PROPINA = 'Banorte' 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 = 'Banorte' 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_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_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_PAGO_PROPINA = 'Amex' where PT_TARJETA like '%American%'"$)
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_TARJETA like '%American%'"$) Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_TARJETA like '%American%'"$)
@@ -402,6 +403,7 @@ Sub l_prods_Click
End Try End Try
et_selBuscar.Text = "" et_selBuscar.Text = ""
Log(listaProdsOrden) Log(listaProdsOrden)
l_montoTotalMesa.Text = "$" & NumberFormat2(Subs.traeTotalTicketActual_PT, 1, 0, 0, True)
End Sub End Sub
Sub resalta(p As Panel) As ResumableSub Sub resalta(p As Panel) As ResumableSub
@@ -623,6 +625,7 @@ Sub b_prodMenos_Click
Private elTotal As String = elPrecioU * laCant.text Private elTotal As String = elPrecioU * laCant.text
elNombre.Text = cs.Color(Colors.red).append(elTexto).pop.append(CRLF).Color(0xFF017F01).Append($"Precio $${NumberFormat2(elTotal, 1, 2, 2, True)}"$).Popall elNombre.Text = cs.Color(Colors.red).append(elTexto).pop.append(CRLF).Color(0xFF017F01).Append($"Precio $${NumberFormat2(elTotal, 1, 2, 2, True)}"$).Popall
End If End If
l_montoTotalMesa.Text = "$" & NumberFormat2(Subs.traeTotalTicketActual_PT, 1, 0, 0, True)
' Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$) ' Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$)
End Sub End Sub
@@ -669,6 +672,7 @@ Sub b_prodMas_Click
Private elTotal As String = elPrecioU * laCant.text Private elTotal As String = elPrecioU * laCant.text
elNombre.Text = cs.Color(Colors.red).append(elTexto).pop.append(CRLF).Color(0xFF017F01).Append($"Precio $${NumberFormat2(elTotal, 1, 2, 2, True)}"$).Popall elNombre.Text = cs.Color(Colors.red).append(elTexto).pop.append(CRLF).Color(0xFF017F01).Append($"Precio $${NumberFormat2(elTotal, 1, 2, 2, True)}"$).Popall
End If End If
l_montoTotalMesa.Text = "$" & NumberFormat2(Subs.traeTotalTicketActual_PT, 1, 0, 0, True)
' Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$) ' Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$)
End Sub End Sub
@@ -686,7 +690,7 @@ Sub cuentaProds
If c.GetString("total") <> Null And c.GetString("total") <> "null" Then total0 = c.GetString("total") If c.GetString("total") <> Null And c.GetString("total") <> "null" Then total0 = c.GetString("total")
Private p As Cursor = Starter.skmt.ExecQuery($"select count(PT_TICKET) as ordenes from pedido_TICKET where PT_PAGO <> 'MULTI-TICKET' and PT_PAGO <> 'VENTA' "$) Private p As Cursor = Starter.skmt.ExecQuery($"select count(PT_TICKET) as ordenes from pedido_TICKET where PT_PAGO <> 'MULTI-TICKET' and PT_PAGO <> 'VENTA' "$)
p.Position = 0 p.Position = 0
' Log($"Total Prods: ${cant0}, Total Compra: $$1.2{total0}"$) Log($"Total Prods: ${cant0}, Total Compra: $$1.2{total0}"$)
' l_totalCarrito.text = $"Total: $${NumberFormat2(total0,1,2,2,True)}"$ ' l_totalCarrito.text = $"Total: $${NumberFormat2(total0,1,2,2,True)}"$
c.Close c.Close
If WobbleMenu1.GetCurrentTab = 2 Then LlenaProdsLL(Null, Null) If WobbleMenu1.GetCurrentTab = 2 Then LlenaProdsLL(Null, Null)
@@ -1050,8 +1054,8 @@ Sub llenaHistorial
fecha = fecha.SubString2(1,10) fecha = fecha.SubString2(1,10)
Private pt As String = "" Private pt As String = ""
If rs_hist.GetString("pt") = "Mifel" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then If rs_hist.GetString("pt") = "Banorte" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
pt = "Mifel" pt = "Banorte"
Else if rs_hist.GetString("pt") = "Amex" Then Else if rs_hist.GetString("pt") = "Amex" Then
pt = "Amex" pt = "Amex"
else if rs_hist.GetString("pt") = "Efectivo" Then else if rs_hist.GetString("pt") = "Efectivo" Then
@@ -1225,6 +1229,10 @@ Private Sub p_mesasItem_Click
Starter.ticketActual = m.Get("ticket") Starter.ticketActual = m.Get("ticket")
Starter.comensalesActuales = m.Get("comensales") Starter.comensalesActuales = m.Get("comensales")
Starter.totalActual = m.Get("subtotal") Starter.totalActual = m.Get("subtotal")
Log(Subs.traeTotalesTicketActual)
Log(Subs.traeTotalTicketActual_P("VENTA"))
Log(Subs.traeTotalTicketActual_PT)
l_montoTotalMesa.Text = "$" & NumberFormat2(m.Get("subtotal"), 1, 0, 0, True)
l_mesa0.Text = $"MESA ${Starter.mesaActual}"$ l_mesa0.Text = $"MESA ${Starter.mesaActual}"$
cb_opcionEfectivo.Checked = False cb_opcionEfectivo.Checked = False
cb_mostrarDescuento.Checked = False cb_mostrarDescuento.Checked = False
@@ -2864,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 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 order by CASE PT_PAGO_PROPINA
WHEN 'Amex' THEN 0 WHEN 'Amex' THEN 0
WHEN 'Mifel' THEN 1 WHEN 'Banorte' THEN 1
WHEN 'Efectivo' THEN 2 WHEN 'Efectivo' THEN 2
END"$) END"$)
If imprimirAqui Then Printer1.WriteString(CRLF) If imprimirAqui Then Printer1.WriteString(CRLF)
@@ -2901,7 +2909,7 @@ Sub b_impAB_Click
group by PT_PAGO2 group by PT_PAGO2
order by CASE PT_PAGO_PROPINA order by CASE PT_PAGO_PROPINA
WHEN 'Amex' THEN 0 WHEN 'Amex' THEN 0
WHEN 'Mifel' THEN 1 WHEN 'Banorte' THEN 1
WHEN 'Efectivo' THEN 2 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". 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 Private totalComensales As Int = 0
@@ -2935,7 +2943,7 @@ Sub b_impAB_Click
Do While rtpa.NextRow Do While rtpa.NextRow
propAmex = rtpa.GetString("ptPropina") propAmex = rtpa.GetString("ptPropina")
Loop 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 Do While rtpmc.NextRow
propMifel = rtpmc.GetString("ptPropina") propMifel = rtpmc.GetString("ptPropina")
Loop Loop
@@ -2952,8 +2960,8 @@ Sub b_impAB_Click
' Log("ES AMEX") ' Log("ES AMEX")
montoAmex = monto montoAmex = monto
monto = monto + propAmex monto = monto + propAmex
else If elPago = "Mifel" Then else If elPago = "Banorte" Then
' Log("ES MIFEL") ' Log("ES Banorte")
montoMifel = monto montoMifel = monto
monto = monto + propMifel monto = monto + propMifel
else If elPago = "Efectivo" Then else If elPago = "Efectivo" Then
@@ -2993,6 +3001,23 @@ Sub b_impAB_Click
Log($"Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Tarjetas: ".Length), ".")} "$) Log($"Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Tarjetas: ".Length), ".")} "$)
Log($"Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Efectivo: ".Length), ".")} "$) Log($"Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Efectivo: ".Length), ".")} "$)
Log($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} "$) Log($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} "$)
'TOTAL DE MESAS
If imprimirAqui Then Printer1.WriteString(CRLF)
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
If imprimirAqui Then Printer1.WriteString($"*** TOTAL DE MESAS *** ${CRLF}"$)
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
If imprimirAqui Then
Printer1.WriteString($"Total Mesas: ${Subs.alineaDerecha(Subs.traeCuantasMesas, (30 - "Total Mesas: ".Length), ".")} ${CRLF}"$)
End If
cs.Append(CRLF)
cs.Color(Colors.red).Append($"** TOTAL DE MESAS **${CRLF}"$).pop
cs.Color(Colors.DarkGray).Append($"Total Mesas: ${Subs.alineaDerecha(Subs.traeCuantasMesas, (30 - "Total Mesas: ".Length), ".")} ${CRLF}"$).pop
cs.Append(CRLF)
cs.Append(CRLF)
Log("*** TOTAL DE MESAS ***")
Log($"Total Mesas: ${Subs.traeCuantasMesas}"$)
End If End If
If imprimirAqui Then Printer1.WriteString(CRLF) If imprimirAqui Then Printer1.WriteString(CRLF)
@@ -3499,8 +3524,8 @@ Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int, brinco As Int)
cb_pago2.Tag = tag0 cb_pago2.Tag = tag0
' cb_pago2.mBase.SetTextSizeAnimated(0, 14dip) ' cb_pago2.mBase.SetTextSizeAnimated(0, 14dip)
et_montoPago2.Tag = tag0 et_montoPago2.Tag = tag0
cb_pago2.SetItems(Array As String("Amex", "Mifel", "Efectivo")) cb_pago2.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Mifel")) If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Banorte"))
p_num.Tag = tag0 p_num.Tag = tag0
listaFormasDePagoCB.Add(cb_pago2) listaFormasDePagoCB.Add(cb_pago2)
listaFormaDePago.Add(cb_pago2.SelectedItem) listaFormaDePago.Add(cb_pago2.SelectedItem)
@@ -3526,7 +3551,7 @@ Private Sub cb_pago2_SelectedIndexChanged (Index As Int)
listaFormaDePago.Set(Sender.As(B4XComboBox).tag - 1, Sender.As(B4XComboBox).SelectedItem) listaFormaDePago.Set(Sender.As(B4XComboBox).tag - 1, Sender.As(B4XComboBox).SelectedItem)
If Sender.As(B4XComboBox).SelectedItem = "Amex" Then If Sender.As(B4XComboBox).SelectedItem = "Amex" Then
cb_pagoPropina.SelectedIndex = 0 cb_pagoPropina.SelectedIndex = 0
Else If Sender.As(B4XComboBox).SelectedItem = "Mifel" Then Else If Sender.As(B4XComboBox).SelectedItem = "Banorte" Then
cb_pagoPropina.SelectedIndex = 1 cb_pagoPropina.SelectedIndex = 1
else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then
cb_pagoPropina.SelectedIndex = 2 cb_pagoPropina.SelectedIndex = 2
@@ -4451,10 +4476,10 @@ Private Sub b_resumen_Click
If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA" If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA"
l_formaPago.Text = o.GetString("PT_PAGO2") l_formaPago.Text = o.GetString("PT_PAGO2")
Select o.GetString("PT_PAGO_PROPINA") Select o.GetString("PT_PAGO_PROPINA")
Case "Mifel" Case "Banorte"
l_propinaPago.Text = "Mifel" l_propinaPago.Text = "Banorte"
Case "Visa/Mastercard Debito" Case "Visa/Mastercard Debito"
l_propinaPago.Text = "Mifel Debito" l_propinaPago.Text = "Banorte Debito"
Case "Amex" Case "Amex"
l_propinaPago.Text = "Amex" l_propinaPago.Text = "Amex"
Case "Efectivo" Case "Efectivo"
@@ -4471,7 +4496,7 @@ Private Sub b_resumen_Click
Do While rtpa.NextRow Do While rtpa.NextRow
propAmex = rtpa.GetString("ptPropina") propAmex = rtpa.GetString("ptPropina")
Loop 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 Do While rtpmc.NextRow
propMifel = rtpmc.GetString("ptPropina") propMifel = rtpmc.GetString("ptPropina")
Loop Loop
@@ -4500,7 +4525,7 @@ Private Sub b_resumen_Click
l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$ l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
' l_propinaAmex.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 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)}"$ 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_consumoTDC.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
' l_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 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)}"$ l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifel), 1, 2, 2, True)}"$
@@ -4584,6 +4609,8 @@ Private Sub p_resItem_LongClick
p_transparenteCambioPagos.Visible = True p_transparenteCambioPagos.Visible = True
End Sub 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 Private Sub b_cambioPagos_Click
p_transparenteCambioPagos.Visible = False p_transparenteCambioPagos.Visible = False
Log(Sender.As(Button).tag) Log(Sender.As(Button).tag)
@@ -4592,11 +4619,11 @@ Private Sub b_cambioPagos_Click
If alm = "null" Then alm = "" If alm = "null" Then alm = ""
Log("|" & alm & "|") Log("|" & alm & "|")
If alm = "MULTI-TICKET" Then 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")}'"$) 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")}''"$) 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 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")}'"$) 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_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 End If
b_resumen_Click b_resumen_Click
End Sub End Sub

6
Starter.bas
View File

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

6
Subs.bas
View File

@@ -1548,6 +1548,12 @@ Sub revisaEfectivoBorrado As Boolean
Return efeBorr Return efeBorr
End Sub End Sub
'Regresa cuantas mesas tuvieron venta
Sub traeCuantasMesas As Int
Private cm As Cursor = Starter.skmt.ExecQuery($"Select distinct pe_mesa, pe_ticket, PE_TIPO, pe_origen from pedido where pe_origen Is Null order by cast( pe_mesa As integer)"$)
Return cm.RowCount
End Sub
'Change CheckBox colors 'Change CheckBox colors
Sub SetButtonTintList(View As View, Disabled As Int, Enabled As Int) Sub SetButtonTintList(View As View, Disabled As Int, Enabled As Int)
Dim States(2,1) As Int Dim States(2,1) As Int

8
push_with_tag.ps1 Normal file
View File

@@ -0,0 +1,8 @@
# Paso 1: Hacer commit
TortoiseGitProc /command:commit /path:"./../" /closeonend:2
# Paso 2: Crear tag (solo si el commit fue exitoso)
if ($LASTEXITCODE -eq 0) {
$version = "v$(Get-Date -Format 'yy.MM.dd')"
TortoiseGitProc /command:tag /path:"./../" /tag:$version /message:"Auto-release $version" /push
}