mirror of
https://github.com/KeymonSoft/Lanterna_H.git
synced 2026-04-17 21:06:16 +00:00
- VERSION 4.08.09
- En resumen dia, las mesas se muestran ahora en el orden en que se cierran y no en el que se abren. - En el resumen dia, ya no se muestran las mesa abiertas. - En el corte Z se quitó el "Total sin propinas".
This commit is contained in:
Jose Alberto Guerra Ugalde
BIN
Files/login.bal
BIN
Files/login.bal
Binary file not shown.
@@ -28,6 +28,6 @@ ModuleClosedNodes6=6
|
||||
ModuleClosedNodes7=
|
||||
ModuleClosedNodes8=
|
||||
ModuleClosedNodes9=
|
||||
NavigationStack=Principal,b_cierreTotal_Click,1682,6,Principal,b_cierraParcial_Click,1687,0,Principal,b_envioInfo_Click,3216,0,Main,Activity_Create,96,0,Principal,b_imp_VIEJO_Click,3204,0,Visual Designer,principal.bal,-100,1,Principal,borrarEfectivo,3294,0,Visual Designer,login.bal,-100,2,Principal,JobDone,3293,0,Main,b_borraEfectivo_Click,496,0
|
||||
NavigationStack=Principal,Process_Globals,29,0,Principal,actualizaProductos,4130,0,Principal,clv_orden_VisibleRangeChanged,4095,0,Principal,LlenaOrden,4117,0,Principal,imprimeResumenGrupos,1969,0,Principal,p_mesas_Click,4329,0,Principal,b_resumen_Click,4349,6,Visual Designer,principal.bal,-100,2,Visual Designer,login.bal,-100,1,Principal,b_impAB_Click,2822,6
|
||||
SelectedBuild=0
|
||||
VisibleModules=7,6,8,1
|
||||
|
||||
123
Principal.bas
123
Principal.bas
@@ -1463,7 +1463,7 @@ Private Sub b_pagoCerrar_Click
|
||||
Private sigTicketMT As String = Subs.traeConsecutivoTicket("CERRADA", "MULTI-TICKET")
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO set PE_TIPO = 'MULTI-TICKET', PE_TICKET = '${sigTicketMT}' where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
Log(1)
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = 'MULTI-TICKET', PT_TICKET = '${sigTicketMT}', PT_PROPINA = '0', PT_PAGO_PROPINA = '0' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = 'MULTI-TICKET', PT_TICKET = '${sigTicketMT}', PT_PROPINA = '0', PT_PAGO_PROPINA = '0', PT_FECHA = '${Subs.traeFecha}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
|
||||
Starter.skmt.ExecNonQuery($"update CAT_MESAS set M_PAGO = null, M_TICKET = null, M_ESTATUS = null, M_MESERO = null, M_COMENSALES = null where M_ID = '${Starter.mesaActual}'"$) 'Reseteamos la mesa a cerrada.
|
||||
Private primeraVez As Boolean = True
|
||||
'' Private descuentoAplicado As Boolean = False
|
||||
@@ -1592,7 +1592,7 @@ Private Sub b_pagoCerrar_Click
|
||||
laPropina = et_propina.Text
|
||||
End If
|
||||
Log(2)
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = '${tipoPago}', PT_TICKET = '${sigTicket}', PT_TARJETA = '${formaPago}', PT_PROPINA = '${laPropina}', PT_PAGO_PROPINA = '${cb_pagoPropina.SelectedItem}', PT_PAGO2 = '${formaPago}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO = '${tipoPago}', PT_TICKET = '${sigTicket}', PT_TARJETA = '${formaPago}', PT_PROPINA = '${laPropina}', PT_PAGO_PROPINA = '${cb_pagoPropina.SelectedItem}', PT_PAGO2 = '${formaPago}', PT_FECHA = '${Subs.traeFecha}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
|
||||
Log(tipoPago)
|
||||
Starter.ticketActual = sigTicket
|
||||
Private tm As Map = CreateMap("ticket":sigTicket, "pago":tipoPago)
|
||||
@@ -2239,7 +2239,7 @@ Sub imprimeResumenGrupos
|
||||
Private elNom As String = tm.Get("prod")
|
||||
Private n3() As String = Regex.Split("\$", tm.Get("prod"))
|
||||
If n3.Length > 1 Then elNom = n3(0)
|
||||
' Log($"${tm.Get("grupo")}, ${elNom}, ${tm.Get("cant")}, ${tm.Get("monto")}"$)
|
||||
' Log($"${tm.Get("grupo")}, ${elNom}, ${tm.Get("cant")}, ${tm.Get("monto")}"$)
|
||||
|
||||
|
||||
If tm.Get("grupo") <> laCatAnt Then
|
||||
@@ -2787,9 +2787,46 @@ Sub b_impAB_Click
|
||||
cs.Color(Colors.DarkGray).Append($"TOTAL ALIMENTOS $${Subs.alineaDerecha("$"&NumberFormat2(totMontoAlimentos, 1, 0, 0, True), 45 - "TOTAL ALIMENTOS".Length, ".")} ${CRLF}"$).pop
|
||||
cs.Color(Colors.DarkGray).Append($"TOTAL BEBIDAS $${Subs.alineaDerecha("$"&NumberFormat2(totMontoBebidas, 1, 0, 0, True), 45 - "TOTAL BEBIDAS".Length, ".")} ${CRLF}"$).pop
|
||||
cs.Color(Colors.DarkGray).Append($"TOTAL: $${Subs.alineaDerecha("$"&NumberFormat2(totMontoAlimentos+totMontoBebidas,1,0,0,True), 45 - "TOTAL BEBIDAS".Length, ".")} ${CRLF}"$).pop
|
||||
cs.Append($"${CRLF}"$)
|
||||
' cs.Append($"${CRLF}"$)
|
||||
Log($"TOTAL ALIMENTOS ........... $${NumberFormat2(totMontoAlimentos, 1, 0, 0, True)} ${CRLF}"$)
|
||||
Log($"TOTAL BEBIDAS ........... $${NumberFormat2(totMontoBebidas, 1, 0, 0, True)} ${CRLF}"$)
|
||||
|
||||
'PROPINAS
|
||||
' If imprimirAqui Then Sleep(1000)
|
||||
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 'Efectivo' THEN 2
|
||||
END"$)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** PROPINAS *** ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
cs.Append(CRLF)
|
||||
cs.Color(Colors.red).Append($"** PROPINAS **${CRLF}"$).pop
|
||||
Log("*** PROPINAS ***")
|
||||
Private totPropinas As String = "0"
|
||||
Do While prop.NextRow
|
||||
If prop.GetString("PT_PAGO_PROPINA") <> Null Then
|
||||
Private laPropina As String = prop.GetString("PROPINA")
|
||||
If imprimirAqui Then Printer1.WriteString($"${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 0, 0, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${CRLF}"$)
|
||||
' Log(prop.GetString("PT_PAGO_PROPINA"))
|
||||
cs.Color(Colors.DarkGray).Append($"${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 0, 0, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${CRLF}"$).pop
|
||||
Log($" ${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 0, 0, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} "$)
|
||||
totPropinas = totPropinas + laPropina
|
||||
End If
|
||||
Loop
|
||||
|
||||
'TOTAL PROPINAS
|
||||
If imprimirAqui Then
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
Printer1.WriteString($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(totPropinas, 1, 2, 2, True), (30 - "Total: ".Length), ".")} ${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
End If
|
||||
cs.Color(Colors.DarkGray).Append($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(totPropinas, 1, 0, 0, True), (30 - "Total: ".Length), ".")} ${CRLF}"$).pop
|
||||
Log($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(totPropinas, 1, 0, 0, True), (30 - totPropinas.Length), ".")}${CRLF}"$)
|
||||
|
||||
'PAGOS
|
||||
' If imprimirAqui Then Sleep(1000)
|
||||
Private pgs As Cursor = Starter.skmt.ExecQuery($"Select PT_PAGO2, sum(PT_NOART) As arts, sum(PT_MONTO) As monto from PEDIDO_TICKET where pt_pago <> 'MULTI-TICKET' and pt_pago <> 'VENTA' group by PT_PAGO2
|
||||
@@ -2803,6 +2840,7 @@ Sub b_impAB_Click
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** PAGOS CON PROPINAS *** ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
cs.Append(CRLF)
|
||||
cs.Color(Colors.red).Append($"** PAGOS CON PROPINAS **${CRLF}"$).pop
|
||||
Log("*** PAGOS CON PROPINAS ***")
|
||||
Private totalPagos As String = 0
|
||||
@@ -2864,61 +2902,28 @@ Sub b_impAB_Click
|
||||
If imprimirAqui Then Printer1.WriteString($"TOTAL PAGOS ........... $${totalPagos} ${CRLF}"$)
|
||||
cs.Color(Colors.DarkGray).Append($"TOTAL PAGOS: ........... $${totalPagos} ${CRLF}"$).pop
|
||||
Log($"TOTAL PAGOS: .........${i}.. $${totalPagos} ${CRLF}"$)
|
||||
|
||||
'PROPINAS
|
||||
' If imprimirAqui Then Sleep(1000)
|
||||
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 'Efectivo' THEN 2
|
||||
END"$)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** PROPINAS *** ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
cs.Append(CRLF)
|
||||
cs.Color(Colors.red).Append($"** PROPINAS **${CRLF}"$).pop
|
||||
Log("*** PROPINAS ***")
|
||||
Private totPropinas As String = "0"
|
||||
Do While prop.NextRow
|
||||
If prop.GetString("PT_PAGO_PROPINA") <> Null Then
|
||||
Private laPropina As String = prop.GetString("PROPINA")
|
||||
If imprimirAqui Then Printer1.WriteString($"${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 0, 0, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${CRLF}"$)
|
||||
' Log(prop.GetString("PT_PAGO_PROPINA"))
|
||||
cs.Color(Colors.DarkGray).Append($"${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 0, 0, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${CRLF}"$).pop
|
||||
Log($" ${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 0, 0, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} "$)
|
||||
totPropinas = totPropinas + laPropina
|
||||
End If
|
||||
Loop
|
||||
'TOTAL PROPINAS
|
||||
If imprimirAqui Then
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
Printer1.WriteString($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(totPropinas, 1, 2, 2, True), (30 - "Total: ".Length), ".")} ${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
End If
|
||||
cs.Color(Colors.DarkGray).Append($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(totPropinas, 1, 0, 0, True), (30 - "Total: ".Length), ".")} ${CRLF}"$).pop
|
||||
Log($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(totPropinas, 1, 0, 0, True), (30 - totPropinas.Length), ".")} "$)
|
||||
|
||||
'TOTAL SIN PROPINAS
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** TOTAL SIN PROPINAS *** ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
cs.Append(CRLF)
|
||||
cs.Color(Colors.red).Append($"** TOTAL SIN PROPINAS **${CRLF}"$).pop
|
||||
Log("*** TOTAL SIN PROPINAS ***")
|
||||
If imprimirAqui Then
|
||||
Printer1.WriteString($"Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Tarjetas: ".Length), ".")} ${CRLF}"$)
|
||||
Printer1.WriteString($"Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Efectivo: ".Length), ".")} ${CRLF}"$)
|
||||
Printer1.WriteString($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} ${CRLF}"$)
|
||||
If Not(Subs.revisaEfectivoBorrado) Then ' Si es corte Z entonces no ponemos el Total sin propinas.
|
||||
'TOTAL SIN PROPINAS
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** TOTAL SIN PROPINAS *** ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
cs.Append(CRLF)
|
||||
cs.Color(Colors.red).Append($"** TOTAL SIN PROPINAS **${CRLF}"$).pop
|
||||
Log("*** TOTAL SIN PROPINAS ***")
|
||||
If imprimirAqui Then
|
||||
Printer1.WriteString($"Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Tarjetas: ".Length), ".")} ${CRLF}"$)
|
||||
Printer1.WriteString($"Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Efectivo: ".Length), ".")} ${CRLF}"$)
|
||||
Printer1.WriteString($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} ${CRLF}"$)
|
||||
End If
|
||||
cs.Color(Colors.DarkGray).Append($"Total Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Total Tarjetas: ".Length), ".")} ${CRLF}"$).pop
|
||||
cs.Color(Colors.DarkGray).Append($"Total Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Total Efectivo: ".Length), ".")} ${CRLF}"$).pop
|
||||
cs.Color(Colors.DarkGray).Append($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} ${CRLF}"$).pop
|
||||
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($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} "$)
|
||||
End If
|
||||
cs.Color(Colors.DarkGray).Append($"Total Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Total Tarjetas: ".Length), ".")} ${CRLF}"$).pop
|
||||
cs.Color(Colors.DarkGray).Append($"Total Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Total Efectivo: ".Length), ".")} ${CRLF}"$).pop
|
||||
cs.Color(Colors.DarkGray).Append($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} ${CRLF}"$).pop
|
||||
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($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} "$)
|
||||
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
@@ -4335,6 +4340,7 @@ Private Sub p_mesas_Click
|
||||
End Sub
|
||||
|
||||
Private Sub b_resumen_Click
|
||||
Log("CLIC RESUMEN")
|
||||
' clv_resumenDia.AsView.left = 10dip : clv_resumenDia.AsView.top = 70dip
|
||||
clv_resumenDia.AsView.top = 1dip
|
||||
clv_resumenDia.AsView.width = p_resumenDia.Width - 20dip : clv_resumenDia.AsView.height = (p_resumenDia.height / 2.3) ' - 90dip
|
||||
@@ -4352,8 +4358,9 @@ Private Sub b_resumen_Click
|
||||
Private n As Int = 0
|
||||
p_resumenDia.Visible = True
|
||||
clv_resumenDia.Clear
|
||||
Private o As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, 0) as PT_PROPINA, ifnull(PT_PAGO_PROPINA, "") as PT_PAGO_PROPINA, ifnull(PT_FACTURAR, 'false') as PT_FACTURAR, ifnull(PT_PAGO2, 'PENDIENTE') as PT_PAGO2 from PEDIDO_TICKET where PT_PAGO <> 'MULTI-TICKET' order by PT_FECHA desc"$)
|
||||
Private o As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, 0) as PT_PROPINA, ifnull(PT_PAGO_PROPINA, "") as PT_PAGO_PROPINA, ifnull(PT_FACTURAR, 'false') as PT_FACTURAR, ifnull(PT_PAGO2, 'PENDIENTE') as PT_PAGO2 from PEDIDO_TICKET where PT_PAGO <> 'MULTI-TICKET' and PT_PAGO <> 'VENTA' order by PT_FECHA"$)
|
||||
Do While o.NextRow
|
||||
Log($"xx - |${o.GetString("PT_PAGO")}|"$)
|
||||
Private Pnl As B4XView = xui.CreatePanel("")
|
||||
Pnl.SetLayoutAnimated(0, 0, 0, clv_resumenDia.AsView.Width, 52dip)
|
||||
clv_resumenDia.Add(Pnl, 1)
|
||||
|
||||
Reference in New Issue
Block a user