- Se hace redondeo hacia arriba del total de la orden cuando por descuento hay centavos.

- Se agrega el total de propinas al resumen y se envian a web.

B4A/B4XMainPage.bas

@@ -17,7 +17,7 @@ Version=9.85
 	'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2
 	'###########################################################################################################
 #End Region
-
+ 
 'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip
 
 Sub Class_Globals

B4A/C_Principal.bas

@@ -329,21 +329,21 @@ Sub B4XPage_CloseRequest As ResumableSub
 		muestraCats
 		n = 1
 		Log(Starter.nivelActual & ", " & n)
-'		Log(0)
+		Log(0)
 	Else If p_reabrirMesaMulti.Visible Then
-'		Log(1)
+		Log(1)
 		p_reabrirMesaMulti.Visible = False
 	Else If p_transparenteVerOrden.Visible Then
-'		Log(2)
+		Log(2)
 		p_transparenteVerOrden.Visible = False
 	else If p_renombraVarios.Visible Then
-'		Log(3)
+		Log(3)
 		p_renombraVarios.Visible = False
 	Else If p_transparenteCambioMesa.Visible Then
-'		Log(4)
+		Log(4)
 		p_transparenteCambioMesa.Visible = False
 	Else If p_transparentePago.visible Then 'Si se esta mostrando el popup de pago, lo cerramos.
-'		Log(5)
+		Log(5)
 '		p_pago.Visible = False
 		p_transparentePago.Visible = False
 	Else If clv_prods_ll.AsView.Visible Then 'SI se muestran los
@@ -556,7 +556,7 @@ Sub LlenaProdsLL(p As ResultSet, extra As String)
 	Private cont As Int = 0
 	For pr0=0 To listaProdsConCant2.Size - 1 'Agregamos los productos con cantidad previa.
 		Private Pnl As B4XView = xui.CreatePanel("")
-		Pnl.SetLayoutAnimated(0, 0, 0, clv_prods_ll.AsView.Width, 70dip)
+		Pnl.SetLayoutAnimated(0, 0, 0, clv_prods_ll.AsView.Width, 50dip)
 		clv_prods_ll.Add(Pnl, listaProdsConCant2.Get(pr0))
 '		listaHints.Add(listaProdsConCant2.get(pr0).As(Map).Get("prod"))
 		cont = cont + 1
@@ -567,7 +567,7 @@ Sub LlenaProdsLL(p As ResultSet, extra As String)
 		If listaProds.Get(pr).As(Map).Get("almacen") < 1 Then
 '				Log("EN CERO" & listaProds.Get(pr).As(Map).Get("prod") & "|" & listaProds.Get(pr).As(Map).Get("almacen"))
 		Else
-			Pnl.SetLayoutAnimated(0, 0, 0, clv_prods_ll.AsView.Width, 70dip)
+			Pnl.SetLayoutAnimated(0, 0, 0, clv_prods_ll.AsView.Width, 50dip)
 '			Log($"Existe ${listaProds.get(pr).As(Map).Get("id")} -> ${listaProdsConCantIndex2.IndexOf(listaProds.get(pr).As(Map).Get("id"))}"$)
 			If listaProdsConCantIndex2.IndexOf(listaProds.get(pr).As(Map).Get("id")) = - 1 Then
 				clv_prods_ll.Add(Pnl, listaProds.Get(pr))
@@ -599,6 +599,10 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In
 			If Pnl.NumberOfViews = 0 Then 'Add each item/layout to the list/main layout
 				Pnl.LoadLayout("proditem")
 				p_prods.Width = clv_prods_ll.GetBase.Width ' Root.Width * 0.99
+'				
+				p_prods.Height = 50dip
+'				Pnl.SetLayoutAnimated(0, 0, 0, p_prods.Width, 200dip)
+				
 				p_botMasMen.Left = (clv_prods_ll.GetBase.Width - p_botMasMen.Width - 32)
 '				Log(p_botMasMen.left)
 				Private cs As CSBuilder
@@ -740,6 +744,7 @@ End Sub
 
 Private Sub WobbleMenu1_Tab1Click
 '	Log("TAB 1")
+	If p_transparentePago.Visible Then B4XPage_CloseRequest
 	If Subs.revisaCierreAdmin Then
 		p_transparenteCierreAdmin.BringToFront
 		p_transparenteCierreAdmin.Visible = True
@@ -923,9 +928,9 @@ Private Sub clv_mesas_VisibleRangeChanged (FirstIndex As Int, LastIndex As Int)
 				If m.Get("estatus") = "ABIERTA" Then l_estatus.Text = "ABIERTA"
 '				Log(m)
 				If l_estatus.text = "ABIERTA" Then
-					l_mesaX.Text = cs.Color(Colors.red).Size(16).Append($"Mesa ${m.Get("id")}"$).pop.append(CRLF).Color(0xFF017F01).Append($"Comensales ${m.Get("comensales")}"$).Append(" - Mesero ").pop.Color(Colors.red).append(m.Get("mesero")).pop.append(CRLF).Color(Colors.black).Append($"Subtotal. $${NumberFormat2(m.Get("subtotal"), 1,2,2,True)} - Articulos: ${m.Get("articulos")}"$).Popall
+					l_mesaX.Text = cs.Color(Colors.red).Size(16).Append($"Mesa ${m.Get("nombre")}"$).pop.append(CRLF).Color(0xFF017F01).Append($"Comensales ${m.Get("comensales")}"$).Append(" - Mesero ").pop.Color(Colors.red).append(m.Get("mesero")).pop.append(CRLF).Color(Colors.black).Append($"Subtotal. $${NumberFormat2(m.Get("subtotal"), 1,2,2,True)} - Articulos: ${m.Get("articulos")}"$).Popall
 				Else
-					l_mesaX.Text = cs.Color(Colors.red).Size(16).Append($"Mesa ${m.Get("id")}"$).Popall
+					l_mesaX.Text = cs.Color(Colors.red).Size(16).Append($"Mesa ${m.Get("nombre")}"$).Popall
 				End If
 				l_mesaX.Tag = m
 				p_mesasItem.Tag = m
@@ -942,7 +947,7 @@ Sub LlenaMesas(p As ResultSet, extra As String) 'ignore
 	Private o As Cursor = Starter.skmt.ExecQuery("select count(PT_TICKET) as ordenes from PEDIDO_TICKET where PT_PAGO <> 'VENTA'")
 	o.Position = 0
 	If o.GetInt("ordenes") > 0 Then WobbleMenu1.SetBadge(3, o.GetInt("ordenes"), Colors.white, Colors.red) Else WobbleMenu1.RemoveBadge(3)
-	Dim p As ResultSet = Starter.skmt.ExecQuery($"select *, IFNULL(M_ESTATUS, 'CERRADA') as ESTATUS2, IFNULL(M_MESERO, 'NINGUNO') as MESERO, IFNULL(M_COMENSALES, 0) as COMENSALES from cat_mesas order by cast(M_ID as INTEGER)"$)
+	Dim p As ResultSet = Starter.skmt.ExecQuery($"select *, IFNULL(M_ESTATUS, 'CERRADA') as ESTATUS2, IFNULL(M_MESERO, 'NINGUNO') as MESERO, IFNULL(M_COMENSALES, 0) as COMENSALES from cat_mesas order by ESTATUS2, cast(M_ID as INTEGER)"$)
 '	Log(p.RowCount)
 	PCLVM.Commit
 	clv_mesas.Clear
@@ -980,6 +985,7 @@ End Sub
 
 'Entramos a la mesa seleccionada.
 Private Sub p_mesasItem_Click
+	Log("Entramos a la mesa")
 	listaFormasDePagoCB.Initialize
 	listaFormaDePago.Initialize
 	listaMontoDePago.Initialize
@@ -999,7 +1005,8 @@ Private Sub p_mesasItem_Click
 	Starter.ticketActual = m.Get("ticket")
 	Starter.comensalesActuales = m.Get("comensales")
 	Starter.totalActual = m.Get("subtotal")
-	l_mesa.Text = $"MESA NO. ${m.Get("id")}"$
+	l_mesa.Text = $"MESA ${m.Get("nombre")}"$
+	cb_opcionEfectivo_CheckedChange(False)
 '	Log(m)
 	b_mesaCerrar.Tag = m
 	Starter.skmt.ExecNonQuery("delete from cuentaa")
@@ -1193,7 +1200,6 @@ Private Sub p_pago_Click
 End Sub
 
 Private Sub b_pagoCerrar_Click
-'	p_pago.Visible = False
 	listaTickets.Initialize
 	p_transparentePago.Visible = False
 	Log("######################   " & listaFormasDePagoCB.Size)
@@ -1208,8 +1214,7 @@ Private Sub b_pagoCerrar_Click
 			If formaPago = "Efectivo" Then
 				tipoPago = "EFECTIVO"
 			Else
-				'Pago con tarjeta
+				tipoPago = "TARJETA" 'Pago con tarjeta
-				tipoPago = "TARJETA"
 			End If
 			Private sigTicket As String = Subs.traeConsecutivoTicket("CERRADA", tipoPago)
 			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}"$))
@@ -1229,8 +1234,7 @@ Private Sub b_pagoCerrar_Click
 		If formaPago = "Efectivo" Then
 			tipoPago = "EFECTIVO"
 		Else
-			'Pago con tarjeta
+			tipoPago = "TARJETA" 'Pago con tarjeta
-			tipoPago = "TARJETA"
 		End If
 		Private sigTicket As String = Subs.traeConsecutivoTicket("CERRADA", tipoPago)
 		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}'"$)
@@ -1676,7 +1680,7 @@ Sub b_imp2_Click
 			End If
 			'RESUMEN
 			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)
+'			Log(rsm.RowCount)
 			If rsm.RowCount > 0 Then
 				Printer1.WriteString(Printer1.BOLD)
 				If imprimirAqui Then Printer1.WriteString($"*** RESUMEN *** ${CRLF}"$)
@@ -1723,7 +1727,7 @@ Sub b_imp2_Click
 					pgs.Position = i
 					Private elPago As String = pgs.GetString("PT_PAGO2")
 					If elPago.Length > 20 Then elPago = elPago.SubString2(0, 20)
-					Log($"${pgs.Position} - ${elPago.Length} - ${elPago}"$)
+'					Log($"${pgs.Position} - ${elPago.Length} - ${elPago}"$)
 					Private monto As String = pgs.GetString("monto")
 					Private cuantos As String = pgs.GetString("arts")
 					Private primerEspacioLargo As Int = 30 - elPago.Length - (cuantos.Length + 1) - 6
@@ -1732,7 +1736,7 @@ Sub b_imp2_Click
 						primerEspacio = primerEspacio & "."
 					Next
 '					monto = NumberFormat2(monto.As(Double), 1, 0, 0, True)
-					Log(monto)
+'					Log(monto)
 					If imprimirAqui Then Printer1.WriteString($"${elPago}${primerEspacio}${cuantos}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$)
 					cs.Color(Colors.DarkGray).Append($"${elPago}${primerEspacio}${cuantos}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$).pop
 					Log($"${elPago}${primerEspacio}${cuantos}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$)
@@ -1743,6 +1747,28 @@ Sub b_imp2_Click
 				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
+				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)
+				If imprimirAqui Then Printer1.WriteString($"*** PROPINAS *** ${CRLF}"$)
+				Printer1.WriteString(Printer1.NOBOLD)
+				cs.Color(Colors.red).Append($"** PROPINAS **${CRLF}"$).pop
+				Log("***  PROPINAS ***")
+				Do While prop.NextRow
+					Private laPropina As String = prop.GetString("PROPINA")
+					If imprimirAqui Then Printer1.WriteString($"${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 2, 2, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${CRLF}"$)
+					cs.Color(Colors.DarkGray).Append($"${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 2, 2, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${CRLF}"$).pop
+					Log($" ${prop.GetString("PT_PAGO_PROPINA")}${Subs.alineaDerecha("$"&NumberFormat2(laPropina, 1, 2, 2, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} "$)
+				Loop
+				
+				LogColor($">>>>>>>  ${Ceil(25.2)}"$, Colors.red)
+				LogColor($">>>>>>>  ${Ceil(25.5)}"$, Colors.red)
+				
+'				Efectivo...............$300.00
+'				Tarjeta................$910.00
 			End If
 			l_resumen.Text = cs
 			Subs.panelVisible(p_transparenteResumen, 0, 0)
@@ -2046,9 +2072,9 @@ Private Sub b_envioInfo_Click
 		For j = 0 To pt.RowCount - 1
 			pt.Position = j
 			cmd.Initialize
-			cmd.Name = "insertPedidos_Lanter" 'Inserta en tabla PEDIDO_CLIENTE
+			cmd.Name = "insertPedidos2_Lanter" 'Inserta en tabla PEDIDO_CLIENTE
-			cmd.Parameters = Array As Object(pt.GetString("PT_TICKET"), pt.GetString("PT_FECHA"), 0, pt.GetString("PT_NOART"), pt.GetString("PT_MONTO"), 0, 0, pt.GetString("PT_MESA"), pt.GetString("PT_MESERO"), pt.GetString("PT_COSTO_SIN"), 0, pt.GetString("PT_FACTURA"))
+			cmd.Parameters = Array As Object(pt.GetString("PT_TICKET"), pt.GetString("PT_FECHA"), 0, pt.GetString("PT_NOART"), pt.GetString("PT_MONTO"), 0, 0, pt.GetString("PT_MESA"), pt.GetString("PT_MESERO"), pt.GetString("PT_COSTO_SIN"), 0, pt.GetString("PT_FACTURA"), pt.GetString("PT_PAGO"), pt.GetString("PT_TARJETA"), pt.GetString("PT_PROPINA"), pt.GetString("PT_PAGO_PROPINA"))
-'			Log($"${pt.GetString("PT_TICKET")}, ${pt.GetString("PT_FECHA")}, 0, ${pt.GetString("PT_NOART")}, ${pt.GetString("PT_MONTO")}, 0, 0, ${pt.GetString("PT_MESA")}, ${pt.GetString("PT_MESERO")}, ${pt.GetString("PT_COSTO_SIN")}, 0, ${pt.GetString("PT_FACTURA")}"$)
+'			Log($"${pt.GetString("PT_TICKET")}, ${pt.GetString("PT_FECHA")}, 0, ${pt.GetString("PT_NOART")}, ${pt.GetString("PT_MONTO")}, 0, 0, ${pt.GetString("PT_MESA")}, ${pt.GetString("PT_MESERO")}, ${pt.GetString("PT_COSTO_SIN")}, 0, ${pt.GetString("PT_PROPINA")}, ${pt.GetString("PT_PAGO_PROPINA")}"$)
 			reqManager.ExecuteCommand(cmd , $"insertPedidos_${pt.GetString("PT_TICKET")}"$)
 '			LogColor($"insertPedidos_${pt.GetString("PT_TICKET")}"$, Colors.Red)
 			cantTotal = pt.GetString("PT_NOART")
@@ -2059,8 +2085,8 @@ Private Sub b_envioInfo_Click
 				For i = 0 To c.RowCount - 1
 					c.position = i
 					cmd.Initialize
-					cmd.Name = "insertPedido_Lanter" 'Inserta en tabla PEDIDO
+					cmd.Name = "insertPedido2_Lanter" 'Inserta en tabla PEDIDO
-					cmd.Parameters = Array As Object("", c.getstring("PE_MESA"), c.getstring("PE_COSTO_TOT"), c.getstring("PE_COSTOU"), c.getstring("PE_CANT"), c.getstring("PE_PRONOMBRE"), c.getstring("PE_PROID"), c.getstring("PE_TICKET"), c.getstring("PE_FECHA"), "", c.getstring("PE_MESERO"), c.getstring("PE_COSTO_SIN"), 0, cantTotal,  ventaTotal, c.getstring("PE_FOLIO"), c.getstring("PE_TIPO"), "") '
+					cmd.Parameters = Array As Object("", c.getstring("PE_MESA"), c.getstring("PE_COSTO_TOT"), c.getstring("PE_COSTOU"), c.getstring("PE_CANT"), c.getstring("PE_PRONOMBRE"), c.getstring("PE_PROID"), c.getstring("PE_TICKET"), c.getstring("PE_FECHA"), "", c.getstring("PE_MESERO"), c.getstring("PE_COSTO_SIN"), 0, cantTotal,  ventaTotal, c.getstring("PE_FOLIO"), c.getstring("PE_TIPO"), "", c.getstring("PE_TIPO2")) '
 					reqManager.ExecuteCommand(cmd , $"insertPedido_${c.GetString("PE_MESA")}_${c.GetString("PE_TIPO")}_${c.GetString("PE_TICKET")}_${c.GetString("PE_PROID")}"$)
 '					LogColor($"insertPedido_${c.GetString("PE_MESA")}_${c.GetString("PE_TIPO")}_${c.GetString("PE_TICKET")}_${c.GetString("PE_PROID")}"$, Colors.Blue)
 				Next
@@ -2195,7 +2221,7 @@ Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int)
 	l_tipoPago2.Text = $"${Starter.formasDePago}:"$
 	cb_pago2.Tag = tag0
 	et_montoPago2.Tag = tag0
-	cb_pago2.SetItems(Array As String("American Express", "Visa/Mastercard", "Efectivo"))
+	cb_pago2.SetItems(Array As String("American Express", "Visa/Mastercard Credito","Visa/Mastercard Debito", "Efectivo"))
 	p_num.Tag = tag0
 	listaFormasDePagoCB.Add(cb_pago2)
 	listaFormaDePago.Add(cb_pago2.SelectedItem)
@@ -2291,7 +2317,7 @@ End Sub
 Private Sub cb_opcionEfectivo_CheckedChange(Checked As Boolean)
 	Log(">> OPCION EFECTIVO CAMBIO - ACTUALIZAMOS PEDIDO")
 	Private desc As String = 1 / Subs.traeDescXefectivo
-	Private tot As String = Subs.traeTotalTicketActual_P("VENTA")
+'	Private tot As String = Subs.traeTotalTicketActual_P("VENTA")
 	If Checked Then
 		Starter.skmt.ExecNonQuery($"update PEDIDO set PE_DESC = '${Subs.traeDescXefectivo}' where PE_TIPO = 'VENTA' and PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${Starter.ticketActual}'"$)
 '		et_montoPago2.Text = NumberFormat2(tot - (tot * desc), 1, 0, 0, False)
@@ -2300,6 +2326,15 @@ Private Sub cb_opcionEfectivo_CheckedChange(Checked As Boolean)
 		Starter.skmt.ExecNonQuery($"update PEDIDO set PE_DESC = '0' where PE_TIPO = 'VENTA' and PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${Starter.ticketActual}'"$)
 '		et_montoPago2.Text = tot
 	End If
+	'Recualculamos el total para ponerlo en PEDIDO_TICKET
+	Private c As ResultSet = 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 = 'VENTA' and PE_TICKET = '${Starter.ticketActual}'"$)
+	Log($"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 = 'VENTA' and PE_TICKET = '${Starter.ticketActual}'"$)
+	Private elSubTotal As String = "0"
+	Do While c.NextRow
+		elSubTotal = elSubTotal + c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100))
+	Loop
+	LogColor($">>>>>   ${elSubTotal} "$, Colors.Blue)
+	Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${NumberFormat2(Ceil(elSubTotal), 1, 0, 0, False)}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
 	If et_montoPago2.IsInitialized Then et_montoPago2.Text = Subs.traeTotalTicketActual_P("VENTA")
 End Sub
 
@@ -2431,11 +2466,11 @@ Private Sub b_leyendaDescuento_Click
 		Private sDate,sTime As String
 		sDate = DateTime.Date(DateTime.Now)
 		sTime = DateTime.Time(DateTime.Now)
-'	c.Close
+'		c.Close
-'	c=Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION =?", Array As String ("SUCURSAL"))
+'		c=Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION =?", Array As String ("SUCURSAL"))
-'	c.Position = 0
+'		c.Position = 0
 		Private sucursal As String = "SUCURSAL"
-'	c.Close
+'		c.Close
 		TAMANO = 0
 		ESPACIO = 14
 		BLANCO = " "	'esto para las impresoras nuevas
@@ -2446,7 +2481,7 @@ Private Sub b_leyendaDescuento_Click
 		Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp)
 		myimage = Printer1.DitherImage2D(myimage, 128)
 		myimage= Printer1.PackImage(myimage)
-'	LogColor(listaTickets, Colors.red)
+'		LogColor(listaTickets, Colors.red)
 		If logger Then LogColor($">>>>>>  INICIA IMPRESION DE TICKET ${listaTickets.Get(k).As(Map).Get("ticket")}  <<<<<<<<<<<<"$, Colors.Red)
 		Starter.ticketActual = listaTickets.Get(k).As(Map).Get("ticket")
 		tipoPago = listaTickets.Get(k).As(Map).Get("pago")
@@ -2480,14 +2515,9 @@ Private Sub b_leyendaDescuento_Click
 			If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD)
 			If imprimirEste Then Printer1.WriteString($"Comensales: ${Starter.comensalesActuales}${Subs.rellenaHasta(14 - Starter.mesaActual.Length)}${Printer1.BOLD} ${Starter.mesaActual}${CRLF}"$)
 			If logger Then Log($"Comensales: ${Starter.comensalesActuales}${Subs.rellenaHasta(14 - Starter.mesaActual.Length)}${Starter.mesaActual}${CRLF}"$)
-'			If imprimirEste Then Printer1.WriteString($"${Printer1.BOLD}${Subs.alineaDerecha(Starter.mesaActual, 28,  " ")}"$)
-'			If logger Then Log($"${Subs.alineaDerecha(Starter.mesaActual, 28, " ")}"$)
-'			If imprimirEste Then Printer1.WriteString("ID.Cliente: " &  la_cuenta.Text & CRLF)
-'			If logger Then Log("ID.Cliente: " &  la_cuenta.Text & CRLF)
 			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}'"$)
-'			Log(c.RowCount)
 			If c.RowCount > 0 Then
 				Private elSubTotal As String = 0
 				If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD)
@@ -2498,6 +2528,7 @@ Private Sub b_leyendaDescuento_Click
 					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)
 					Else
 						elSubTotal = c.GetString("PE_COSTO_TOT")
 					End If
@@ -2506,20 +2537,11 @@ Private Sub b_leyendaDescuento_Click
 					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}"$)
 				Next
-			End If
+			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}'"$)
 '			Log($"Rowcount: ${c.RowCount}"$)
 			If c.RowCount > 0 Then
 				c.Position = 0
-'				Log(c.GetString("propina"))
-
-'				Private z As Cursor = Starter.skmt.ExecQuery($"select *, ifnull(PE_DESC, 0) as DESC from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
-'				Log(z.RowCount)
-'				Private y As Cursor = Starter.skmt.ExecQuery($"select PE_COSTO_TOT, ifnull(PE_DESC, 0) as DESC from PEDIDO where PE_TICKET = '${Starter.ticketActual}' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA'"$)
-'				Log(y.RowCount)
-'				Private x As Cursor = Starter.skmt.ExecQuery($"select PE_COSTO_TOT, ifnull(PE_DESC, 0) as DESC, CAT_GP_TIPO from PEDIDO join CAT_GUNAPROD on CAT_GP_ID = PE_PROID where PE_TICKET = '${Starter.ticketActual}' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA'"$)
-'				Log(x.RowCount)
-
 				Private elTotal As String = Subs.traeTotalTicketActual_P(tipoPago)
 				If c.GetString("ALM") = "MULTI-TICKET" Then elTotal = c.GetString("PT_MONTO")
 '				Log(">>>>>>>>  " & Subs.traeTotalTicketActual_P(tipoPago))
@@ -2532,7 +2554,6 @@ Private Sub b_leyendaDescuento_Click
 					If imprimirEste Then Printer1.WriteString($"${CRLF}IVA: $${NumberFormat2(((elTotal * 0.16)), 1, 2, 2, True)}"$)
 					If logger Then Log($"${CRLF}IVA: $${NumberFormat2(((elTotal * 0.16)), 1, 2, 2, True)}"$)
 				End If
-				
 				If imprimirEste Then Printer1.WriteString($"${CRLF}Total: $${NumberFormat2(elTotal, 1, 2, 2, True)}"$)
 				If logger Then Log($"${CRLF}Total: $${NumberFormat2(elTotal, 1, 2, 2, True)}"$)
 				If imprimirEste Then Printer1.WriteString($"${CRLF}${n2t.NumberToWords(NumberFormat2(elTotal, 1, 2, 2, False))}"$)

B4A/Lanterna.b4a

@@ -82,7 +82,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Lanterna
 	#VersionCode: 1
-	#VersionName: 4.03.25
+	#VersionName: 4.03.27
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Lanterna.b4a.meta

@@ -25,6 +25,6 @@ ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=47,48
-NavigationStack=C_Principal,PCLV_HintRequested,723,0,C_Principal,b_prodMenos_Click,412,5,C_Principal,b_prodMas_Click,431,0,C_Principal,b_renombraVarios_Click,2143,0,C_Principal,l_prodX_LongClick,2136,6,Visual Designer,proditem.bal,-100,6,Visual Designer,principal.bal,-100,4,C_Principal,p_transparenteDescuento_Click,2128,0,C_Principal,LlenaMesas,936,2,C_Principal,clv_mesas_VisibleRangeChanged,933,0,B4XMainPage,JobDone,257,0
+NavigationStack=C_Principal,B4XPage_Appear,311,0,C_Principal,b_mesaCerrar_Click,1130,0,C_Principal,B4XPage_CloseRequest,320,0,C_Principal,PCLV_HintRequested,731,0,C_Principal,WobbleMenu1_Tab1Click,747,6,C_Principal,b_cierreTotal_Click,1315,0,C_Principal,b_leyendaDescuento_Click,2432,0,C_Principal,p_mesasItem_Click,1031,0,C_Principal,b_pagoCerrar_Click,1206,0,C_Principal,b_reabrirMesa_Click,2363,0
 SelectedBuild=0
 VisibleModules=1,7,8,2,3,6,4,5

B4A/Subs.bas

@@ -552,7 +552,7 @@ Sub copiaDB(result As Boolean) 'ignore
 	End If
 End Sub
 
-'HAcel elpanel dado del ancho y alto especificados.
+'Hace el panel dado del ancho y alto especificados.
 Sub panelWH(panel As Panel, w As Int, h As Int)
 	panel.Width = w
 	panel.Height = h
@@ -1172,6 +1172,7 @@ Sub traeTotalTicketActual_P(tipoPago As String) As String
 			p.Position = j
 			If p.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then
 				desc = p.GetString("DESC") / 100
+'				desc = Ceil(desc)
 			Else
 				desc = 0
 			End If
@@ -1179,6 +1180,7 @@ Sub traeTotalTicketActual_P(tipoPago As String) As String
 			st = st + (p.GetString("PE_COSTO_TOT") - (p.GetString("PE_COSTO_TOT") * desc))
 		Next
 	End If
+	st = Ceil(st)
 	Return st
 End Sub