From 6aa240c02c42aa1bb16e0559f5ba781d46064145 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 30 Mar 2024 00:41:42 -0600 Subject: [PATCH] =?UTF-8?q?-=20Correcciones=20al=20c=C3=B3digo=20de=20pago?= =?UTF-8?q?=20multiple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Principal.bas | 28 +++++++++++++--------------- B4A/Lanterna.b4a.meta | 2 +- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 22ddd65..8b66ad4 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1216,8 +1216,6 @@ Private Sub b_pagoCerrar_Click Private ticketAnt As String = "" Private pagoAnt As String = "" Private descXEfectivo As String = "" - Log($"${listaFormaDePago}|${listaMontoDePago}"$) - For fdp = 0 To listaFormasDePagoCB.Size - 1 formaPago = listaFormaDePago.Get(fdp) If formaPago = "Efectivo" Then @@ -1226,21 +1224,19 @@ Private Sub b_pagoCerrar_Click tipoPago = "TARJETA" 'Pago con tarjeta End If Private sigTicket As String = Subs.traeConsecutivoTicket("CERRADA", tipoPago) - - LogColor($"${primeraVez} - ${tipoPago} - |${formaPago}|"$, Colors.Red) +' LogColor($"${primeraVez} - ${tipoPago} - |${formaPago}|"$, Colors.Red) If primeraVez And tipoPago = "TARJETA" Then - Log("INSERTAMOS TARJETA") +' Log("INSERTAMOS TARJETA") Private pa As ResultSet = Starter.skmt.ExecQuery($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${sigTicketMT}' and PE_TIPO = 'MULTI-TICKET'"$) - Log($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${sigTicketMT}' and PE_TIPO = 'MULTI-TICKET'"$) - Log(pa.RowCount) +' Log($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${sigTicketMT}' and PE_TIPO = 'MULTI-TICKET'"$) +' Log(pa.RowCount) Do While pa.NextRow - Log($"${pa.GetString("PE_PROID")}, ${pa.GetString("PE_COSTO_TOT")}, ${pa.GetString("PE_TIPO")}"$) +' Log($"${pa.GetString("PE_PROID")}, ${pa.GetString("PE_COSTO_TOT")}, ${pa.GetString("PE_TIPO")}"$) 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 (pa.GetString("PE_COSTO_TOT"), pa.GetString("PE_COSTOU"), pa.GetString("PE_CANT"), pa.GetString("PE_PRONOMBRE"), pa.GetString("PE_PROID"), sigTicket, pa.GetString("PE_FECHA"), pa.GetString("PE_MESERO"), pa.GetString("PE_MESA"), pa.GetString("PE_COSTO_SIN"), "TARJETA", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$)) Loop 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 EN PT") - +' Log("INSERTAMOS EN PT") ticketAnt = sigTicket pagoAnt = formaPago primeraVez = False @@ -1257,27 +1253,29 @@ Private Sub b_pagoCerrar_Click ' 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 ((descXEfectivo * -1), (descXEfectivo * -1), 1, "DESCUENTO", "DESC01", ticketAnt, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, descXEfectivo, "TARJETA", pagoAnt, $"${Starter.mesaActual}|${sigTicketMT}"$)) 'Agregamos el descuento al pedido de tarjeta. ' descuentoAplicado = True ' End If - Private laPropina As String = "0" If et_propina.Text <> "" Then laPropina = et_propina.Text End If - Starter.ticketActual = sigTicket Private tm As Map = CreateMap("ticket":sigTicket, "pago":tipoPago) listaTickets.Add(tm) 'Agregamos el ticket y pago a la lista para imprimir el ticket con estos datos al llamar b_imprimirTicket_Click Next - Private d As ResultSet = Starter.skmt.ExecQuery($"select sum(PE_COSTO_TOT) as totalEfectivo from PEDIDO where PE_TIPO = 'EFECTIVO' and PE_ORIGEN = '${Starter.mesaActual}|${sigTicketMT}'"$) + Private d As ResultSet = Starter.skmt.ExecQuery($"select ifnull(sum(PE_COSTO_TOT), 0) as totalEfectivo from PEDIDO where PE_TIPO = 'EFECTIVO' and PE_ORIGEN = '${Starter.mesaActual}|${sigTicketMT}'"$) Private elEfectivo As String = "0" Do While d.NextRow elEfectivo = d.GetString("totalEfectivo") Loop If elEfectivo > "0" Then - Log("INSERTAMOS DESCUENTO") +' Log("INSERTAMOS DESCUENTO") 'Agregamos el efectivo como DESCUENTO en el pedido de la tarjeta. 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 ((elEfectivo * -1), (elEfectivo * -1), 1, "DESCUENTO", "DESC01", ticketAnt, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, elEfectivo, "TARJETA", pagoAnt, $"${Starter.mesaActual}|${sigTicketMT}"$)) End If + Starter.ticketActual = sigTicketMT +' Log(Subs.traeTotalTicketActual_P("MULTI-TICKET")) + Private elTotalTarjeta As String = Subs.traeTotalTicketActual_P("MULTI-TICKET") - elEfectivo + Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${elTotalTarjeta}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${ticketAnt}' and PT_PAGO = 'TARJETA'"$) Else Log(">>>>>>>> UN SOLO PAGO") formaPago = listaFormaDePago.Get(0) @@ -2496,7 +2494,7 @@ Private Sub b_leyendaDescuento_Click ProgressDialogShow("Imprimiendo, un momento ...") Private cont As Int = 0 For k = 0 To listaTickets.Size - 1 'Por cada ticket y pago de la lista imprimimos un ticket. - LogColor($">>>> Forma de pago : ${listaTickets.Get(k).As(Map).Get("pago")}"$, Colors.Blue) +' LogColor($">>>> Forma de pago : ${listaTickets.Get(k).As(Map).Get("pago")}"$, Colors.Blue) If listaTickets.Get(k).As(Map).Get("pago") = "EFECTIVO" Or cont > 0 Then 'Solo imprimimos si es el PRIMER ticket de TARJETA. Continue End If diff --git a/B4A/Lanterna.b4a.meta b/B4A/Lanterna.b4a.meta index 9ddddea..d1e03f1 100644 --- a/B4A/Lanterna.b4a.meta +++ b/B4A/Lanterna.b4a.meta @@ -25,6 +25,6 @@ ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=47,48 -NavigationStack=C_Principal,p_cambioMesa_Click,2681,0,C_Principal,p_resumen_Click,2685,0,C_Principal,p_transparentePago_Click,2226,3,C_Principal,p_pago_Click,1194,0,Subs,guardaProductoSinGestion,1334,0,C_Principal,b_prodMenos_Click,418,0,C_Principal,b_prodMas_Click,463,0,C_Principal,b_renombraVarios_Click,2225,0,Subs,actualizaProducto,1276,0,C_Principal,b_pagoCerrar_Click,1258,6 +NavigationStack=Subs,traeTotalTicketActual_P,1158,0,C_Principal,p_transparentePago_Click,2226,3,C_Principal,p_pago_Click,1194,0,Subs,guardaProductoSinGestion,1334,0,C_Principal,b_prodMenos_Click,418,0,C_Principal,b_prodMas_Click,463,0,C_Principal,b_renombraVarios_Click,2225,0,C_Principal,b_leyendaDescuento_Click,2496,0,C_Principal,b_pagoCerrar_Click,1211,6,B4XMainPage,JobDone,215,0 SelectedBuild=0 VisibleModules=1,7,8,2,3,6,4,5