cheveguerra/Lanterna
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Lanterna.git synced 2026-04-20 06:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Se corrigio un error que afectaba a las productos con descuento y redondeo.

Browse Source
This commit is contained in:
Jose Alberto Guerra Ugalde
2024-03-31 14:43:46 -06:00
parent 6aa240c02c
commit 2457e673ef
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
B4A/C_Principal.bas
View File

@@ -1129,9 +1129,9 @@ Private Sub b_mesaCerrar_Click
l_faltaMonto.Text = ""
cb_opcionEfectivo.Checked = False
p_formasDePago.Height = 40dip
p_propina.Top = 133dip
p_botonesCerrar.Top = 257dip
p_pago.Height = 320dip
p_propina.Top = 143dip
p_botonesCerrar.Top = 265dip
p_pago.Height = 330dip
p_formasDePago.RemoveAllViews
Private c As Cursor = Starter.skmt.ExecQuery($"select PE_MESA from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA'"$)
If c.RowCount > 0 Then
@@ -2259,7 +2259,7 @@ Private Sub b_agregarPago_Click
End Sub
Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int)
Log("agregaFormaDePago |" & top0 & "|" & tag0)
' Log("agregaFormaDePago |" & top0 & "|" & tag0)
p_opcionEfectivo.Visible = False
Private p_num As Panel
p_num.Initialize("")
@@ -2583,24 +2583,29 @@ Private Sub b_leyendaDescuento_Click
If imprimirEste Then Printer1.WriteString(" " & CRLF)
c = Starter.skmt.ExecQuery($"select *, ifnull(PE_DESC, 0) as DESC from PEDIDO join cat_gunaprod on PE_PROID = CAT_GP_ID where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
' Log($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
' Private elTotalSumado As String = "0"
If c.RowCount > 0 Then
Private elSubTotal As String = 0
Private elPU As String = 0
If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD)
For i = 0 To c.RowCount - 1
c.Position = i
Private elNombre As String = c.GetString("PE_PRONOMBRE")
elPU = c.GetString("PE_COSTOU")
If elNombre.Length > 30 Then elNombre.SubString2(0, 30)
If c.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then
' Log($">> APLICAMOS DESC POR ALIMENTOS"$)
elSubTotal = c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100))
elSubTotal = Ceil(elSubTotal)
elPU = Ceil(c.GetString("PE_COSTOU") - (c.GetString("PE_COSTOU") * (c.GetString("DESC") / 100)))
Else
elSubTotal = c.GetString("PE_COSTO_TOT")
End If
' Log($"${c.GetString("PE_PRONOMBRE")}, ${c.GetString("DESC")}${elSubTotal}"$)
Private cantXpu As String = $"${c.GetString("PE_CANT")} x ${elSubTotal}"$
Private cantXpu As String = $"${c.GetString("PE_CANT")} x ${elPU}"$
If imprimirEste Then Printer1.WriteString($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
Log($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
' elTotalSumado = elTotalSumado + elSubTotal
Next
End If
c = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, "0") as propina, ifnull(PT_ALMACEN, "") as ALM from PEDIDO_TICKET where PT_MESA = '${Starter.mesaActual}' and PT_PAGO = '${tipoPago}' and PT_TICKET = '${Starter.ticketActual}'"$)
@@ -2608,6 +2613,7 @@ Private Sub b_leyendaDescuento_Click
If c.RowCount > 0 Then
c.Position = 0
Private elTotal As String = Subs.traeTotalTicketActual_P(tipoPago)
' elTotal = elTotalSumado
If c.GetString("ALM") = "MULTI-TICKET" Then elTotal = c.GetString("PT_MONTO")
' Log(">>>>>>>> " & Subs.traeTotalTicketActual_P(tipoPago))
' If c.GetString("propina") <> 0 And c.GetString("PT_PAGO_PROPINA") = "Tarjeta" Then 'Se comento porque lo propina no se debe de sumar al ticket.