mirror of
https://github.com/KeymonSoft/Lanterna_H.git
synced 2026-04-17 21:06:16 +00:00
- Correcciones para el resumen
This commit is contained in:
Jose Alberto Guerra Ugalde
@@ -889,6 +889,7 @@ End Sub
|
||||
|
||||
Private Sub WobbleMenu1_Tab1Click
|
||||
' Log("TAB 1")
|
||||
Starter.tipov = "VENTA"
|
||||
If p_resumenDia.Visible Then p_resumenDia.Visible = False
|
||||
If p_transparentePago.Visible Then Activity_KeyPress(KeyCodes.KEYCODE_BACK)
|
||||
If Subs.revisaCierreAdmin Then
|
||||
@@ -1143,6 +1144,7 @@ End Sub
|
||||
'Entramos a la mesa seleccionada.
|
||||
Private Sub p_mesasItem_Click
|
||||
Log("Entramos a la mesa")
|
||||
Starter.tipov = "VENTA"
|
||||
Log(Sender.As(Panel).tag)
|
||||
listaProdsOrden.Initialize
|
||||
listaFormasDePagoCB.Initialize
|
||||
@@ -1420,14 +1422,18 @@ Private Sub b_pagoCerrar_Click
|
||||
Loop
|
||||
Log("INSERTAMOS TARJETA EN PT")
|
||||
Log($"${laPropina}, ${cb_pagoPropina.SelectedItem} ${pa.RowCount}"$)
|
||||
Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN, PT_PROPINA, PT_PAGO_PROPINA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, pa.RowCount, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$, laPropina, cb_pagoPropina.SelectedItem))
|
||||
Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN, PT_PROPINA, PT_PAGO_PROPINA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object _
|
||||
(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, pa.RowCount, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$, laPropina, cb_pagoPropina.SelectedItem))
|
||||
ticketAnt = sigTicket
|
||||
pagoAnt = formaPago
|
||||
primeraVez = False
|
||||
End If
|
||||
If tipoPago = "EFECTIVO" Then
|
||||
Log("INSERTAMOS EFECTIVO")
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (listaMontoDePago.Get(fdp).As(EditText).text, listaMontoDePago.Get(fdp).As(EditText).text, 1, "Consumo de alimentos", "CDA01", sigTicket, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, tipoPago, formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object _
|
||||
(listaMontoDePago.Get(fdp).As(EditText).text, listaMontoDePago.Get(fdp).As(EditText).text, 1, "Consumo de alimentos", "CDA01", sigTicket, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, tipoPago, formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
|
||||
|
||||
|
||||
Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, 1, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
|
||||
Log("INSERTAMOS EFECTIVO EN PT")
|
||||
descXEfectivo = listaMontoDePago.Get(fdp).As(EditText).text
|
||||
@@ -1926,6 +1932,7 @@ Sub b_imp2_Click
|
||||
If elNombre.Length > 20 Then elNombre = elNombre.SubString2(0, 20)
|
||||
Log($"${elNombre} - ${c.GetString("cuantos")}"$) '${c.Position} - ${elNombre.Length} -
|
||||
cs.Color(Colors.DarkGray).Append($"${elNombre} - ${c.GetString("cuantos")} ${CRLF}"$).pop
|
||||
' Log(cs.Length)
|
||||
Private monto As String = NumberFormat2(c.GetString("monto"), 1, 0, 0, True)
|
||||
Private cuantos As String = c.GetString("cuantos")
|
||||
|
||||
@@ -1957,12 +1964,16 @@ Sub b_imp2_Click
|
||||
l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
|
||||
sv_resumen.Panel.Height = l_resumen.Height
|
||||
End If
|
||||
|
||||
'RESUMEN
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
Sleep(4000)
|
||||
Private rsm As Cursor = Starter.skmt.ExecQuery($"select distinct CAT_GP_CLASIF, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID group by CAT_GP_CLASIF order by CAT_GP_CLASIF"$) 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01.
|
||||
' Log(rsm.RowCount)
|
||||
If rsm.RowCount > 0 Then
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** RESUMEN *** ${CRLF}"$)
|
||||
Log($"*** RESUMEN ***${CRLF}"$)
|
||||
cs.Color(Colors.red).Append($"** RESUMEN **${CRLF}"$).pop
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
For i = 0 To rsm.RowCount - 1
|
||||
@@ -1981,7 +1992,10 @@ Sub b_imp2_Click
|
||||
cs.Color(Colors.DarkGray).Append($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$).pop
|
||||
Log($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
|
||||
Next
|
||||
|
||||
'COMENSALES
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
Sleep(3000)
|
||||
Private coms As Cursor = Starter.skmt.ExecQuery($"select sum(PT_COMENSALES) as totComensales from PEDIDO_TICKET where ifnull(PT_ALMACEN,0) <> 'MULTI-TICKET'"$)
|
||||
Private totalComensales As Int = 0
|
||||
If coms.RowCount > 0 Then
|
||||
@@ -1993,6 +2007,8 @@ Sub b_imp2_Click
|
||||
Log($"Comensales ...........${totalComensales} ${CRLF}"$)
|
||||
|
||||
'PAGOS
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
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"$)
|
||||
Private totalComensales As Int = 0
|
||||
If imprimirAqui Then Printer1.WriteString($"${CRLF}"$)
|
||||
@@ -2023,11 +2039,12 @@ 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}${CRLF}"$)
|
||||
cs.Color(Colors.DarkGray).Append($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$).pop
|
||||
Log($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$)
|
||||
|
||||
'PROPINAS
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
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"$)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
@@ -2048,12 +2065,14 @@ Sub b_imp2_Click
|
||||
' LogColor($">>>>>>> ${Ceil(25.5)}"$, Colors.red)
|
||||
' Efectivo...............$300.00
|
||||
' Tarjeta................$910.00
|
||||
' If imprimirAqui Then Printer1.WriteString($"${CRLF}${CRLF}${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
End If
|
||||
l_resumen.Text = cs
|
||||
Log(123)
|
||||
l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
|
||||
sv_resumen.Panel.Height = l_resumen.Height
|
||||
Subs.panelVisible(p_transparenteResumen, 0, 0)
|
||||
' Else
|
||||
' ToastMessageShow("¡Es necesario que NO haya mesas abiertas para realizar el cierre!", True)
|
||||
@@ -2160,6 +2179,8 @@ Sub b_imp3_Click
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
End If
|
||||
l_resumen.Text = cs
|
||||
l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
|
||||
sv_resumen.Panel.Height = l_resumen.Height
|
||||
Subs.panelVisible(p_transparenteResumen, 0, 0)
|
||||
' Else
|
||||
' ToastMessageShow("¡Es necesario que NO haya mesas abiertas para realizar el cierre!", True)
|
||||
@@ -3469,7 +3490,7 @@ 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_FACTURAR, 'false') as PT_FACTURAR, ifnull(PT_PAGO2, 'PENDIENTE') as PT_PAGO2 from PEDIDO_TICKET order by PT_FECHA desc"$)
|
||||
Private o As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, 0) as PT_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"$)
|
||||
Do While o.NextRow
|
||||
Private Pnl As B4XView = xui.CreatePanel("")
|
||||
Pnl.SetLayoutAnimated(0, 0, 0, clv_resumenDia.AsView.Width, 52dip)
|
||||
@@ -3490,7 +3511,7 @@ Private Sub b_resumen_Click
|
||||
n = n + 1
|
||||
Loop
|
||||
|
||||
Private rt As ResultSet = Starter.skmt.ExecQuery($"Select sum(pt_monto) as ptMonto, sum(pt_propina) as ptPropina, * from pedido_ticket where pt_pago <> 'VENTA' group by pt_pago2"$)
|
||||
Private rt As ResultSet = Starter.skmt.ExecQuery($"Select sum(pt_monto) as ptMonto, sum(pt_propina) as ptPropina, * from pedido_ticket where pt_pago <> 'VENTA' and PT_PAGO <> 'MULTI-TICKET' group by pt_pago2"$)
|
||||
Private consumoTotales As String = 0
|
||||
Private propinaTotales As String = 0
|
||||
Private totalTotales As String = 0
|
||||
|
||||
Reference in New Issue
Block a user