From 0f01115269f1fb5276fcbd052f4a138376c2c63c Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <ja.guerra@keymonsoft.com>
Date: Wed, 5 Jun 2024 10:38:11 -0600
Subject: [PATCH] =?UTF-8?q?-=20Se=20agreg=C3=B3=20el=20boton=20de=20imprim?=
 =?UTF-8?q?ir=20resumen=20de=20propinas=20al=20cierre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Files/principal.bal | Bin 61652 -> 62245 bytes
 Lanterna2.b4a.meta  |   4 +-
 Principal.bas       | 555 ++++++++++++++++++++++++++------------------
 3 files changed, 333 insertions(+), 226 deletions(-)

diff --git a/Files/principal.bal b/Files/principal.bal
index 8d747e0d8216afbf3ab052524aca6c126fd9178e..daa87d0ef8c3839f1be30a59e8a78048424b96a4 100644
GIT binary patch
delta 3464
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
LuPKTzhimfxkF@t<

delta 3307
zcmZ{mdr*{B6u`f;NbrIC;1P;o_`nqv1bm?KNJK<jMR|m#A*_{_T85}uYAvRvf+=!L
zE!!#nXs2v+pdCWfOw=4LC79GSWs*q7x2scs^cp(%F1wshZD-Ei-@WJDbI-Z=+`Icp
zhtJtIAHA=lD1||a5<uVfZTb^+tqv6`oa+N3z!pJcktBUdJp2T46iGjl{)`6@du#@>
z@o2__n2nk7V8$`sY*U7Gca))whY`n;#E}eV9M3p`aU$apj7JiWA{kARL^6hCEXg>@
zHg_kPDN-1xGEQUsB;)an(-}`-oWXb^<4juL8_^`jS&Sz$&SpG?v4!ze#?u(*FrMDU
zHn9~mm?D>P9^-t*1&p6!T*!DP<5`TKW;|O_Y~JkWFvT;Bix|&kT+FzHv6b;W#?LZ-
z&dap_&wD$HGN17R#xF2_k?}&ti-;GKyhQRc<0Xt=VO&bQRGfbq$uiOD;^mB2Fn*Qs
zO2)4-ex30u#;X~xVQhPYb>3tw0`mk^&Uh{3w-~Quyq@vfjNf6r!Ob?A{YIwP#JGZS
zCF9ME-(|do@m9uFjJGkaruy?{iA=Gb@q3JSFy6^{7vuMdKOosn@*znCNhFE*SV^KP
z{RJvLl!E+~*e|F6W;vG!oijPh2Ea!6!?}FVG=N-e{QO|ZaWd;g0>0Gr7Ep*a`(n^F
zApoaV6kuH89z47^l&qmB6^;9BA;PtG#vEtOzKO!2FzH`w3lVkwfQfW!ofwKo&Ie$i
zb1^75?_#V@0kkFN;C-hZ0Jj~EH32A!c*uJisZmLtV2MHNSp(|o9iYRyb0Juol4jIt
z%m8b?@2B$tTpF8=N3N;3`b#^0S|3_n<cB3&gVD4q8vm>}&=O>a>Bpndy4H*zEmQGk
z!+h|?y!~O+R{b;!dpE?PDLEP!HjuS5>Oeh!A1#_|^3yH|m{>bVtk_(cjqznF?mbus
z{xT(hky0kM9CCmvQ&KfkN$p9g=(374a#Z~1>+M*4C>l-ERa1b*SnW3U`Njc(-uwf#
zW-|Yt?)*hGYmV4KFBjKq4ZHnqZd}4M2Lmo`j}^Ha4Vo!>j5@FkQ;*FBqg;LOv0}_>
zH0bnzckC;$>bL_J9*sa(SrUGA)Ih6>qX?3rd~qTJ0)xq$_;FQ304Hq9!VTZbxnlc5
z#rB2k9tUh36^Fqm9S}xKP!Ox4jbRT2;Xb$k%sABny<}#+v=-f&?f%Yz`%k(<QcoGk
zoF+p!-fJI-Rmo-yJUuC}4^7sIs3HK{;uFzYJP0DO?Y9JdU()z0`Yv5dQn)cvvyk+L
z<-b~R?U`DvJMCV_|BNT~DEBG+-Q>W;rV?=qO^a}Gb1l~V5P??;WHA~CXk4lY%|r38
z_C7Maf7hvar^SvDEhSVyBJbTT7V@BC@sD;e%iPV{`7(E>^=vM{U|Fq$HF~qVT4UVR
zT7G_mZ3yXA@o!@&0sKzQFfkHKO&rN%ot^%QxWwvk>ctCH0yT+lRcGf20thDkNYBV9
z0(CSs;-^SWA{Zk^N~kxMfE;#qjw1jAjmUqAJ>34qt%GDw?e$J3o9^o$K(=m&avw@B
zxFAK`F>1G5ya}mdFL3MygD$1}^l$y_fHd-#YfRJlN|jacBvnB^#;2;d<nqWzRRLCC
ziVMo3b!8m@uY>Uq`=dH2a9(O12aqoJJzZ-e_Z^!mE%<S*ino8Uqpp?S7kZ6mw;CvX
zQI{DqqPcCUkBp|`3X6tUC0@GH<$+>wL8i<&Q@gzMKZ*Qrd8F^s_W$v1%zD_5$P^D;
z&4S6*9g84a?);dm2CPgBMwiWuCDT=BM~5H46wg^2r)a!nJ9Dmu16brELQgpE>@biY
z+5+8F_mxSw;lKsg>Cq0CThws9OAk5n>biEt<7YSRc>YF-dmhfbX+hI%2WH*s8i62b
vDK2^W9S7ujUz0p-C~{-+y|%8q4m98Ocy-*hp!J>ucep$wVfQT9e82ENE8eAc

diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta
index 1680fe2..febe768 100644
--- a/Lanterna2.b4a.meta
+++ b/Lanterna2.b4a.meta
@@ -19,9 +19,9 @@ ModuleClosedNodes1=
 ModuleClosedNodes2=
 ModuleClosedNodes3=
 ModuleClosedNodes4=
-ModuleClosedNodes5=2,93,94,96,99,100,101
+ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
-NavigationStack=Principal,Globals,181,0,Principal,b_cierreTotal_LongClick,1607,0,Principal,b_imp_Click,1783,3,Principal,b_leyendaDescuento_Click,2963,6,Principal,b_cierraAdmin_Click,1472,0,Principal,b_imp2_Click,2016,6,Visual Designer,resumenItem.bal,-100,6,Principal,b_resumen_Click,3328,6,Visual Designer,principal.bal,-100,6,Principal,acomodaResItems,3343,6,Main,JobDone,282,0
+NavigationStack=Principal,b_resumen_Click,3328,6,Principal,acomodaResItems,3343,6,Main,JobDone,282,0,Principal,b_reabrirMesa_Click,2710,0,Principal,p_transparenteVerOrden_Click,2695,0,Principal,b_imp_Click,1802,0,Principal,b_imp2_Click,2052,6,Principal,cb_factura_CheckedChange,3519,0,Visual Designer,principal.bal,-100,6,Principal,b_imp3_Click,2109,6
 SelectedBuild=0
 VisibleModules=6,5,7
diff --git a/Principal.bas b/Principal.bas
index 97bcf81..caf0160 100644
--- a/Principal.bas
+++ b/Principal.bas
@@ -190,6 +190,7 @@ Sub Globals
 	Private l_titResPagoTot As Label
 	Private l_titResComprobante As Label
 	Private l_titResFormaPago As Label
+	Private b_imp3 As Button
 End Sub
 
 Sub Activity_Create(FirstTime As Boolean)
@@ -942,7 +943,7 @@ Private Sub WobbleMenu1_Tab3Click
 	p_transparenteResumen.Visible = False
 	actualizaProductos("Alimentos")
 '	For w = 0 To 150
-'
+	'
 '	Next
 End Sub
 
@@ -1730,58 +1731,58 @@ Sub b_imp_Click
 		Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$)
 		Log(c.RowCount)
 '		If c.RowCount = 0 Then 'Si no hay mesas abiertas entonces ...
-			Private c As Cursor = Starter.skmt.ExecQuery("select PE_MESA, PE_TIPO, PE_TICKET, sum(PE_COSTO_TOT) as SUBTOT from PEDIDO where PE_TIPO <> 'VENTA' group by PE_MESA, pe_tipo, PE_TICKET order by PE_MESA, PE_TIPO desc")
-			If c.RowCount > 0 Then
-				c.Position = 0
-				Private mesaAnt As String = ""
-				Private tipoAnt As String = ""
-				Private tipo As String
-				Private ticket As String
-				If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$)
-				For i = 0 To c.RowCount - 1
-					c.Position = i
-					ticket = c.GetString("PE_TICKET")
-					If c.GetString("PE_TIPO") = "TARJETA" Then
-						tipo = "Pago Tarjeta   "
-					Else If c.GetString("PE_TIPO") = "EFECTIVO" Then
-						tipo = "Pago Efectivo "
-					End If
-					If mesaAnt <> c.GetString("PE_MESA") Then
-						Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$)
-						tm.Position = 0
-						cs.Color(Colors.RGB(1,127,1)).Append($"Mesa ${c.GetString("PE_MESA")} - $${NumberFormat2(tm.GetString("totalMesa"), 1, 2, 2, True)} ${CRLF}"$).pop
-						If imprimirAqui Then Printer1.WriteString($"Mesa ${c.GetString("PE_MESA")} - $${NumberFormat2(tm.GetString("totalMesa"), 1, 2, 2, True)} ${CRLF}"$)
-						Private tipoAnt As String = ""
-					End If
-					If tipoAnt <> c.GetString("PE_TIPO") And c.GetString("PE_TIPO") <> "MULTI-TICKET" Then
-						Private tpt As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalTipo from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO = '${c.GetString("PE_TIPO")}'"$)
-						tpt.Position = 0
-						cs.Color(Colors.red).Append($" * ${tipo} - $${NumberFormat2(tpt.GetString("totalTipo"), 1, 2, 2, True)} ${CRLF}"$).pop
-						If imprimirAqui Then Printer1.WriteString($" * ${tipo} - $${NumberFormat2(tpt.GetString("totalTipo"), 1, 2, 2, True)} ${CRLF}"$)
-					End If
-					If c.GetString("PE_TIPO") <> "MULTI-TICKET" Then
-						cs.Append($"   Ticket ${ticket}: $${NumberFormat2(c.GetString("SUBTOT"), 0, 2, 2, True)}${CRLF}"$).Popall
-						If imprimirAqui Then Printer1.WriteString($"   Ticket ${ticket}: $${NumberFormat2(c.GetString("SUBTOT"), 0, 2, 2, True)}${CRLF}"$)
-					End If
-					mesaAnt = c.GetString("PE_MESA")
-					tipoAnt = c.GetString("PE_TIPO")
-				Next
-				If imprimirAqui Then Printer1.WriteString(CRLF)
-				Private tt As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as total from PEDIDO_TICKET where PT_PAGO = 'TARJETA'"$)
-				Private te As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as total from PEDIDO_TICKET where PT_PAGO = 'EFECTIVO'"$)
-				tt.Position = 0 : te.Position = 0
-				Private totalEfectivo As String = 0
-				If te.GetString("total") <> Null Then totalEfectivo = te.GetString("total")
-				cs.color(Colors.RGB(1,127,1)).Append($"${CRLF}Total Tarjeta: ${NumberFormat2(tt.GetString("total"), 1,2,2,True)}${CRLF}"$).popall
-				If imprimirAqui Then Printer1.WriteString($"${CRLF}Total Tarjeta: ${NumberFormat2(tt.GetString("total"), 1,2,2,True)}${CRLF}"$)
-				cs.color(Colors.RGB(1,127,1)).Append($"Total Efectivo: ${NumberFormat2(totalEfectivo, 1,2,2,True)}${CRLF}"$).popall
-				If imprimirAqui Then Printer1.WriteString($"Total Efectivo: ${NumberFormat2(totalEfectivo, 1,2,2,True)}${CRLF}"$)
-				
-				l_resumen.Text = cs
-				l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
-				sv_resumen.Panel.Height = l_resumen.Height
-			End If
-			Subs.panelVisible(p_transparenteResumen, 0, 0)
+		Private c As Cursor = Starter.skmt.ExecQuery("select PE_MESA, PE_TIPO, PE_TICKET, sum(PE_COSTO_TOT) as SUBTOT from PEDIDO where PE_TIPO <> 'VENTA' group by PE_MESA, pe_tipo, PE_TICKET order by PE_MESA, PE_TIPO desc")
+		If c.RowCount > 0 Then
+			c.Position = 0
+			Private mesaAnt As String = ""
+			Private tipoAnt As String = ""
+			Private tipo As String
+			Private ticket As String
+			If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$)
+			For i = 0 To c.RowCount - 1
+				c.Position = i
+				ticket = c.GetString("PE_TICKET")
+				If c.GetString("PE_TIPO") = "TARJETA" Then
+					tipo = "Pago Tarjeta   "
+				Else If c.GetString("PE_TIPO") = "EFECTIVO" Then
+					tipo = "Pago Efectivo "
+				End If
+				If mesaAnt <> c.GetString("PE_MESA") Then
+					Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$)
+					tm.Position = 0
+					cs.Color(Colors.RGB(1,127,1)).Append($"Mesa ${c.GetString("PE_MESA")} - $${NumberFormat2(tm.GetString("totalMesa"), 1, 2, 2, True)} ${CRLF}"$).pop
+					If imprimirAqui Then Printer1.WriteString($"Mesa ${c.GetString("PE_MESA")} - $${NumberFormat2(tm.GetString("totalMesa"), 1, 2, 2, True)} ${CRLF}"$)
+					Private tipoAnt As String = ""
+				End If
+				If tipoAnt <> c.GetString("PE_TIPO") And c.GetString("PE_TIPO") <> "MULTI-TICKET" Then
+					Private tpt As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalTipo from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO = '${c.GetString("PE_TIPO")}'"$)
+					tpt.Position = 0
+					cs.Color(Colors.red).Append($" * ${tipo} - $${NumberFormat2(tpt.GetString("totalTipo"), 1, 2, 2, True)} ${CRLF}"$).pop
+					If imprimirAqui Then Printer1.WriteString($" * ${tipo} - $${NumberFormat2(tpt.GetString("totalTipo"), 1, 2, 2, True)} ${CRLF}"$)
+				End If
+				If c.GetString("PE_TIPO") <> "MULTI-TICKET" Then
+					cs.Append($"   Ticket ${ticket}: $${NumberFormat2(c.GetString("SUBTOT"), 0, 2, 2, True)}${CRLF}"$).Popall
+					If imprimirAqui Then Printer1.WriteString($"   Ticket ${ticket}: $${NumberFormat2(c.GetString("SUBTOT"), 0, 2, 2, True)}${CRLF}"$)
+				End If
+				mesaAnt = c.GetString("PE_MESA")
+				tipoAnt = c.GetString("PE_TIPO")
+			Next
+			If imprimirAqui Then Printer1.WriteString(CRLF)
+			Private tt As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as total from PEDIDO_TICKET where PT_PAGO = 'TARJETA'"$)
+			Private te As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as total from PEDIDO_TICKET where PT_PAGO = 'EFECTIVO'"$)
+			tt.Position = 0 : te.Position = 0
+			Private totalEfectivo As String = 0
+			If te.GetString("total") <> Null Then totalEfectivo = te.GetString("total")
+			cs.color(Colors.RGB(1,127,1)).Append($"${CRLF}Total Tarjeta: ${NumberFormat2(tt.GetString("total"), 1,2,2,True)}${CRLF}"$).popall
+			If imprimirAqui Then Printer1.WriteString($"${CRLF}Total Tarjeta: ${NumberFormat2(tt.GetString("total"), 1,2,2,True)}${CRLF}"$)
+			cs.color(Colors.RGB(1,127,1)).Append($"Total Efectivo: ${NumberFormat2(totalEfectivo, 1,2,2,True)}${CRLF}"$).popall
+			If imprimirAqui Then Printer1.WriteString($"Total Efectivo: ${NumberFormat2(totalEfectivo, 1,2,2,True)}${CRLF}"$)
+			
+			l_resumen.Text = cs
+			l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
+			sv_resumen.Panel.Height = l_resumen.Height
+		End If
+		Subs.panelVisible(p_transparenteResumen, 0, 0)
 '		Else
 '			ToastMessageShow("¡Es necesario que NO haya mesas abiertas para realizar el cierre!", True)
 '		End If
@@ -1870,164 +1871,164 @@ Sub b_imp2_Click
 		Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$)
 '		Log(c.RowCount)
 '		If c.RowCount = 0 Then 'Si no hay mesas abiertas entonces ...
-			Private c As Cursor = Starter.skmt.ExecQuery("select distinct CAT_GP_CLASIF, PE_PRONOMBRE, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by PE_PRONOMBRE order by CAT_GP_CLASIF, PE_PRONOMBRE") '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.
+		Private c As Cursor = Starter.skmt.ExecQuery("select distinct CAT_GP_CLASIF, PE_PRONOMBRE, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by PE_PRONOMBRE order by CAT_GP_CLASIF, PE_PRONOMBRE") '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(c.RowCount)
-			If c.RowCount > 0 Then
-				c.Position = 0
-				Private catAnt As String = ""
-				Private catTotal As String = 0
-				If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$)
-				Log("*** GRUPOS ***")
-				cs.Color(Colors.red).Append($"*** GRUPOS ***${CRLF}"$).pop
-				Printer1.WriteString(Printer1.BOLD)
-				If imprimirAqui Then Printer1.WriteString($"*** GRUPOS ***${CRLF}"$)
-				Printer1.WriteString(Printer1.NOBOLD)
-				For i = 0 To c.RowCount - 1
-					c.Position = i
+		If c.RowCount > 0 Then
+			c.Position = 0
+			Private catAnt As String = ""
+			Private catTotal As String = 0
+			If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$)
+			Log("*** GRUPOS ***")
+			cs.Color(Colors.red).Append($"*** GRUPOS ***${CRLF}"$).pop
+			Printer1.WriteString(Printer1.BOLD)
+			If imprimirAqui Then Printer1.WriteString($"*** GRUPOS ***${CRLF}"$)
+			Printer1.WriteString(Printer1.NOBOLD)
+			For i = 0 To c.RowCount - 1
+				c.Position = i
 '					Log($"${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$)
-					If catAnt <> c.GetString("CAT_GP_CLASIF") Then
+				If catAnt <> c.GetString("CAT_GP_CLASIF") Then
 '						Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$)
 '						tm.Position = 0
-						If catAnt <> "" Then
-							cs.Color(Colors.Green).Append($"Total ${catAnt}: ${catTotal}${CRLF}"$).pop
-							If imprimirAqui Then
-								Printer1.WriteString(Printer1.BOLD)
-								Printer1.WriteString($"Total ${catAnt}: ${catTotal}${CRLF}${CRLF}"$)
-								Printer1.WriteString(Printer1.NOBOLD)
-							End If
-'							Log($">>>>>>>   CAT TOTAL ${catAnt}: ${catTotal}"$ )
-						End If
-						cs.Color(Colors.red).Append($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$).pop
-						Log($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$)
-						Printer1.WriteString(Printer1.BOLD)
-						If imprimirAqui Then Printer1.WriteString($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$)
-						Printer1.WriteString(Printer1.NOBOLD)
-						Private tipoAnt As String = ""
-						catTotal = 0
-					End If
-
-					Private elNombre As String = c.GetString("PE_PRONOMBRE")
-					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
-					Private monto As String = NumberFormat2(c.GetString("monto"), 1, 0, 0, True)
-					Private cuantos As String = c.GetString("cuantos")
-					
-					Private primerEspacioLargo As Int = 30 - elNombre.Length - (cuantos.Length + 1) - 6
-					Private primerEspacio As String = ""
-					For n = 1 To primerEspacioLargo
-						primerEspacio = primerEspacio & "."
-					Next
-'					If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$)
-					If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
-					catTotal = catTotal + c.GetString("cuantos")
-'					Log($">>>>  ${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$)
-					If i = c.RowCount - 1 Then
-						Log($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$)
-						cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$).pop
+					If catAnt <> "" Then
+						cs.Color(Colors.Green).Append($"Total ${catAnt}: ${catTotal}${CRLF}"$).pop
 						If imprimirAqui Then
 							Printer1.WriteString(Printer1.BOLD)
-							Printer1.WriteString($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$)
+							Printer1.WriteString($"Total ${catAnt}: ${catTotal}${CRLF}${CRLF}"$)
 							Printer1.WriteString(Printer1.NOBOLD)
 						End If
+'							Log($">>>>>>>   CAT TOTAL ${catAnt}: ${catTotal}"$ )
 					End If
+					cs.Color(Colors.red).Append($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$).pop
+					Log($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$)
+					Printer1.WriteString(Printer1.BOLD)
+					If imprimirAqui Then Printer1.WriteString($"++ ${c.GetString("CAT_GP_CLASIF")} ++${CRLF}"$)
+					Printer1.WriteString(Printer1.NOBOLD)
 					Private tipoAnt As String = ""
-					catAnt = c.GetString("CAT_GP_CLASIF")
-'					Log(i)
+					catTotal = 0
+				End If
+
+				Private elNombre As String = c.GetString("PE_PRONOMBRE")
+				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
+				Private monto As String = NumberFormat2(c.GetString("monto"), 1, 0, 0, True)
+				Private cuantos As String = c.GetString("cuantos")
+					
+				Private primerEspacioLargo As Int = 30 - elNombre.Length - (cuantos.Length + 1) - 6
+				Private primerEspacio As String = ""
+				For n = 1 To primerEspacioLargo
+					primerEspacio = primerEspacio & "."
 				Next
-				If imprimirAqui Then Printer1.WriteString(CRLF)
+'					If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$)
+				If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
+				catTotal = catTotal + c.GetString("cuantos")
+'					Log($">>>>  ${catAnt} - ${c.GetString("CAT_GP_CLASIF")}"$)
+				If i = c.RowCount - 1 Then
+					Log($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$)
+					cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$).pop
+					If imprimirAqui Then
+						Printer1.WriteString(Printer1.BOLD)
+						Printer1.WriteString($"Total ${c.GetString("CAT_GP_CLASIF")}: ${catTotal}${CRLF}"$)
+						Printer1.WriteString(Printer1.NOBOLD)
+					End If
+				End If
+				Private tipoAnt As String = ""
+				catAnt = c.GetString("CAT_GP_CLASIF")
+'					Log(i)
+			Next
+			If imprimirAqui Then Printer1.WriteString(CRLF)
 
 '				l_resumen.Text = cs
-				l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
-				sv_resumen.Panel.Height = l_resumen.Height
-			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.
+			l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
+			sv_resumen.Panel.Height = l_resumen.Height
+		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)
-			If rsm.RowCount > 0 Then
-				Printer1.WriteString(Printer1.BOLD)
-				If imprimirAqui Then Printer1.WriteString($"*** RESUMEN *** ${CRLF}"$)
-				cs.Color(Colors.red).Append($"** RESUMEN **${CRLF}"$).pop
-				Printer1.WriteString(Printer1.NOBOLD)
-				For i = 0 To rsm.RowCount - 1
-					rsm.Position = i
-					Private laCat As String = rsm.GetString("CAT_GP_CLASIF")
-					If laCat.Length > 20 Then laCat = laCat.SubString2(0, 20)
+		If rsm.RowCount > 0 Then
+			Printer1.WriteString(Printer1.BOLD)
+			If imprimirAqui Then Printer1.WriteString($"*** RESUMEN *** ${CRLF}"$)
+			cs.Color(Colors.red).Append($"** RESUMEN **${CRLF}"$).pop
+			Printer1.WriteString(Printer1.NOBOLD)
+			For i = 0 To rsm.RowCount - 1
+				rsm.Position = i
+				Private laCat As String = rsm.GetString("CAT_GP_CLASIF")
+				If laCat.Length > 20 Then laCat = laCat.SubString2(0, 20)
 '					Log($"${rsm.Position} - ${laCat.Length} - ${laCat}"$)
-					Private monto As String = NumberFormat2(rsm.GetString("monto"), 1, 0, 0, True)
-					Private cuantos As String = rsm.GetString("cuantos")
-					Private primerEspacioLargo As Int = 30 - laCat.Length - (cuantos.Length + 1) - 6
-					Private primerEspacio As String = ""
-					For n = 1 To primerEspacioLargo
-						primerEspacio = primerEspacio & "."
-					Next
-					If imprimirAqui Then Printer1.WriteString($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
-					cs.Color(Colors.DarkGray).Append($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$).pop
-					Log($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
+				Private monto As String = NumberFormat2(rsm.GetString("monto"), 1, 0, 0, True)
+				Private cuantos As String = rsm.GetString("cuantos")
+				Private primerEspacioLargo As Int = 30 - laCat.Length - (cuantos.Length + 1) - 6
+				Private primerEspacio As String = ""
+				For n = 1 To primerEspacioLargo
+					primerEspacio = primerEspacio & "."
 				Next
-				'COMENSALES
-				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
-					coms.Position = 0
-					totalComensales = coms.GetInt("totComensales")
-				End If
-				If imprimirAqui Then Printer1.WriteString($"Comensales ...........${totalComensales} ${CRLF}"$)
-				cs.Color(Colors.DarkGray).Append($"Comensales ..........${totalComensales} ${CRLF}"$).pop
-				Log($"Comensales ...........${totalComensales} ${CRLF}"$)
+				If imprimirAqui Then Printer1.WriteString($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
+				cs.Color(Colors.DarkGray).Append($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$).pop
+				Log($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
+			Next
+			'COMENSALES
+			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
+				coms.Position = 0
+				totalComensales = coms.GetInt("totComensales")
+			End If
+			If imprimirAqui Then Printer1.WriteString($"Comensales ...........${totalComensales} ${CRLF}"$)
+			cs.Color(Colors.DarkGray).Append($"Comensales ..........${totalComensales} ${CRLF}"$).pop
+			Log($"Comensales ...........${totalComensales} ${CRLF}"$)
 
-				'PAGOS
-				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}"$)
-				Printer1.WriteString(Printer1.BOLD)
-				If imprimirAqui Then Printer1.WriteString($"*** PAGOS *** ${CRLF}"$)
-				Printer1.WriteString(Printer1.NOBOLD)
-				cs.Color(Colors.red).Append($"** PAGOS **${CRLF}"$).pop
-				Log("***  PAGOS ***")
-				Private totalPagos As String = 0
-				For i = 0 To pgs.RowCount - 1
-					pgs.Position = i
-					Private elPago As String = pgs.GetString("PT_PAGO2")
-					If elPago.Length > 20 Then elPago = elPago.SubString2(0, 20)
+			'PAGOS
+			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}"$)
+			Printer1.WriteString(Printer1.BOLD)
+			If imprimirAqui Then Printer1.WriteString($"*** PAGOS *** ${CRLF}"$)
+			Printer1.WriteString(Printer1.NOBOLD)
+			cs.Color(Colors.red).Append($"** PAGOS **${CRLF}"$).pop
+			Log("***  PAGOS ***")
+			Private totalPagos As String = 0
+			For i = 0 To pgs.RowCount - 1
+				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}"$)
-					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
-					Private primerEspacio As String = ""
-					For n = 1 To primerEspacioLargo
-						primerEspacio = primerEspacio & "."
-					Next
+				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
+				Private primerEspacio As String = ""
+				For n = 1 To primerEspacioLargo
+					primerEspacio = primerEspacio & "."
+				Next
 '					monto = NumberFormat2(monto.As(Double), 1, 0, 0, True)
 '					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}"$)
-					totalPagos = totalPagos + monto
-				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}"$)
+				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}"$)
+				totalPagos = totalPagos + monto
+			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
-				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
-					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, 2, 2, True), (30 - prop.GetString("PT_PAGO_PROPINA").Length), ".")} ${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
+				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, 2, 2, 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, 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), ".")} "$)
-					End If
-				Loop
+					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), ".")} "$)
+				End If
+			Loop
 '				LogColor($">>>>>>>  ${Ceil(25.2)}"$, Colors.red)
 '				LogColor($">>>>>>>  ${Ceil(25.5)}"$, Colors.red)
 '				Efectivo...............$300.00
@@ -2035,10 +2036,10 @@ Sub b_imp2_Click
 			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)
-			Subs.panelVisible(p_transparenteResumen, 0, 0)
+		End If
+		l_resumen.Text = cs
+		Log(123)
+		Subs.panelVisible(p_transparenteResumen, 0, 0)
 '		Else
 '			ToastMessageShow("¡Es necesario que NO haya mesas abiertas para realizar el cierre!", True)
 '		End If
@@ -2055,6 +2056,112 @@ Sub b_imp2_Click
 	ProgressDialogHide
 End Sub
 
+
+Sub b_imp3_Click
+	Private imprimirAqui As Boolean = Starter.imprimirTicket
+	Private sDate, sTime As String
+	Private c As Cursor
+	sv_resumen.Panel.Height = p_resumen.Height
+	cs.Initialize
+	Private l_total, la_cuenta As Label
+	l_total.Initialize("l")
+	la_cuenta.Initialize("2")
+	b_imp2.Enabled = False
+	ProgressDialogShow("Imprimiendo, un momento ...")
+	If imprimirAqui Then
+		Printer1.DisConnect
+		If Not(Printer1.IsConnected) Then
+			If Starter.logger Then Log("conectando 1")
+			Printer1.Connect
+			Private cont As Int = 0
+			Do While Not(impresoraConectada)
+				Sleep(1000)
+				cont = cont + 1
+				If cont = 7 Then Printer1.Connect 'Tratamos de reconectar
+				If cont > 15 Then impresoraConectada = True
+			Loop
+			Sleep(500)
+			impresoraConectada = False
+		Else
+			If Starter.logger Then Log("conectando 2")
+			Printer1.Connect
+			Private cont As Int = 0
+			Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
+				Sleep(1000)
+				cont = cont + 1
+				If cont = 2 Then Printer1.Connect
+				If cont > 4 Then impresoraConectada = True
+			Loop
+			Sleep(500)
+			impresoraConectada = False
+		End If
+		Printer1.Reset
+	End If
+'	If imprimirAqui Then Printer1.WriteString(Printer1.UNREVERSE)
+	Try
+		DateTime.DateFormat = "yyyymmdd"
+		sDate = DateTime.Date(DateTime.Now)
+		Printer1.WriteString(Printer1.BOLD)
+		If imprimirAqui Then Printer1.WriteString("LA LANTERNA RISTORANTE" & CRLF)
+		Printer1.WriteString(Printer1.NOBOLD)
+		DateTime.DateFormat = "MM/dd/yyyy"
+		sDate = DateTime.Date(DateTime.Now)
+		sTime = DateTime.Time(DateTime.Now)
+
+		Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$)
+		'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)
+		If rsm.RowCount > 0 Then
+			'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 ***")
+			Private tot 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, 2, 2, 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, 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), ".")} "$)
+					tot = tot + laPropina
+				End If
+			Loop
+			If imprimirAqui Then Printer1.WriteString(CRLF)
+			If imprimirAqui Then Printer1.WriteString($"Total:${Subs.alineaDerecha("$"&NumberFormat2(tot, 1, 2, 2, True), (30 - 6), ".")} ${CRLF}"$)
+			cs.Color(Colors.DarkGray).Append($"Total:${Subs.alineaDerecha("$"&NumberFormat2(tot, 1, 2, 2, True), (30 - 6), ".")} ${CRLF}"$).pop
+			Log($"Total: ${tot}"$)
+'				LogColor($">>>>>>>  ${Ceil(25.2)}"$, Colors.red)
+'				LogColor($">>>>>>>  ${Ceil(25.5)}"$, Colors.red)
+'				Efectivo...............$300.00
+'				Tarjeta................$910.00
+			If imprimirAqui Then Printer1.WriteString(CRLF)
+			If imprimirAqui Then Printer1.WriteString(CRLF)
+			If imprimirAqui Then Printer1.WriteString(CRLF)
+		End If
+		l_resumen.Text = cs
+		Subs.panelVisible(p_transparenteResumen, 0, 0)
+'		Else
+'			ToastMessageShow("¡Es necesario que NO haya mesas abiertas para realizar el cierre!", True)
+'		End If
+		Sleep(1000)
+		Printer1.DisConnect
+	Catch
+		ToastMessageShow("Error en la impresion 3.", True)
+		Printer1.Disconnect
+'		B4XPages.ShowPage("Principal")
+		Activity_Resume
+	End Try
+	Sleep(1000)
+	b_imp2.Enabled = True
+	ProgressDialogHide
+End Sub
+
 Sub b_imp_VIEJO_Click
 '	Log("inicia B_IMP2_Click")
 	Private TAMANO As Int
@@ -2674,8 +2781,8 @@ Private Sub lv_historial_ItemLongClick (Position As Int, Value As Object)
 '	Private d() As String = Regex.Split("\|", Value)
 '	lv_verOrden.Clear
 '	Private c As Cursor = Starter.skmt.ExecQuery($"select * from PEDIDO where PE_MESA = '${d(0)}' and PE_TICKET = '${d(1)}' and PE_TIPO = '${d(2)}'"$)
-''	Log($"select * from PEDIDO where PE_MESA = '${d(0)}' and PE_TICKET = '${d(1)}' and PE_TIPO = '${d(2)}'"$)
-''	Log(c.RowCount)
+	''	Log($"select * from PEDIDO where PE_MESA = '${d(0)}' and PE_TICKET = '${d(1)}' and PE_TIPO = '${d(2)}'"$)
+	''	Log(c.RowCount)
 '	Private Label1 As Label = lv_verOrden.TwoLinesLayout.Label
 '	Private Label2 As Label = lv_verOrden.TwoLinesLayout.SecondLabel
 '	Label1.TextColor = Colors.RGB(1,127,1)
@@ -2686,7 +2793,7 @@ Private Sub lv_historial_ItemLongClick (Position As Int, Value As Object)
 '		For i = 0 To c.RowCount - 1
 '			c.Position = i
 '			Private n1 As String = c.GetString("PE_PRONOMBRE")
-''			Log(n.Length & " - " & n)
+	''			Log(n.Length & " - " & n)
 '			If n1.Length > 25 Then n1 = n1.SubString2(0, 25)
 '			lv_verOrden.AddTwoLines($"${c.GetString("PE_CANT")} - ${n1}"$, $"Precio: $${c.GetString("PE_COSTOU")}"$)
 '		Next
@@ -2899,8 +3006,8 @@ Private Sub b_leyendaDescuento_Click
 						Private desc As ResultSet = Starter.skmt.ExecQuery($"select * from PEDIDO where PE_PRONOMBRE = 'DESCUENTO' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
 						Do While desc.NextRow
 							
-						If imprimirEste Then Printer1.WriteString($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2( (Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (30 - 12), ".")}${CRLF}"$)
-						Log($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2((Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (30 - 12), ".")}${CRLF}"$)
+							If imprimirEste Then Printer1.WriteString($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2( (Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (30 - 12), ".")}${CRLF}"$)
+							Log($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2((Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (30 - 12), ".")}${CRLF}"$)
 							
 							cantXpu = $"1 x ${desc.GetString("PE_COSTOU")}"$
 							If imprimirEste Then Printer1.WriteString($"1 DESCUENTO${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(desc.GetString("PE_COSTO_TOT"), 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
@@ -3064,34 +3171,34 @@ Private Sub clv_orden_VisibleRangeChanged (FirstIndex As Int, LastIndex As Int)
 '				If listaProdsOrden.IndexOf(clv_orden.GetValue(i).As(Map).Get("id")) > -1 Then
 '					Log("Ya existe")
 '				Else
-					Pnl.LoadLayout("proditem")
-					listaProdsOrden.InsertAt(i, clv_orden.GetValue(i).As(Map).Get("id"))
+				Pnl.LoadLayout("proditem")
+				listaProdsOrden.InsertAt(i, clv_orden.GetValue(i).As(Map).Get("id"))
 '					Log($"insertamos ${clv_orden.GetValue(i).As(Map).Get("id")} en ${i}"$)
 '					Log(listaProdsOrden)
-					p_prods.Width = clv_orden.GetBase.Width ' Activity.Width * 0.99
-					p_prods.Height = 42dip
-					p_botMasMen.Left = (clv_orden.GetBase.Width - p_botMasMen.Width - 8)
-					b_prodMas.Height = 47dip : b_prodMas.top = 3dip
-					b_prodMenos.Height = 47dip : b_prodMenos.top = 3dip
-					et_pCant.Height = 49dip : et_pCant.top = 3dip
-					l_pCant.Height = 37dip : l_pCant.top = 9dip
-					p_botMasMen.Top = -6
-					Private cs As CSBuilder
-					cs.Initialize
-					l_prodX.SetTextSizeAnimated(0, 13)
-					If clv_orden.GetValue(i).As(Map).Get("cant") <> Null And clv_orden.GetValue(i).As(Map).Get("cant") > 0 Then
-						p_prods.Color=0xFFE2EEFF
-						et_pCant.TextColor=Colors.Red
-						b_prodMenos.Tag = "vendido"
-						b_prodMas.Tag = "vendido"
-					End If
-					Private precio As String=NumberFormat2(clv_orden.GetValue(i).As(Map).Get("precio").As(Double),1,2,2,False)
-					If clv_orden.GetValue(i).As(Map).Get("cant") <> Null Then et_pCant.Text = clv_orden.GetValue(i).As(Map).Get("cant")
-					l_prodX.Text = cs.Color(Colors.red).append(clv_orden.GetValue(i).As(Map).Get("prod")).pop.append(CRLF).Color(0xFF017F01).Append($"Precio $${NumberFormat2(precio, 1, 2, 2, True)}"$).Popall
-					l_prodX.Tag = clv_orden.GetValue(i).As(Map)
-					l_pCant.Tag = clv_orden.GetValue(i).As(Map).Get("id")
+				p_prods.Width = clv_orden.GetBase.Width ' Activity.Width * 0.99
+				p_prods.Height = 42dip
+				p_botMasMen.Left = (clv_orden.GetBase.Width - p_botMasMen.Width - 8)
+				b_prodMas.Height = 47dip : b_prodMas.top = 3dip
+				b_prodMenos.Height = 47dip : b_prodMenos.top = 3dip
+				et_pCant.Height = 49dip : et_pCant.top = 3dip
+				l_pCant.Height = 37dip : l_pCant.top = 9dip
+				p_botMasMen.Top = -6
+				Private cs As CSBuilder
+				cs.Initialize
+				l_prodX.SetTextSizeAnimated(0, 13)
+				If clv_orden.GetValue(i).As(Map).Get("cant") <> Null And clv_orden.GetValue(i).As(Map).Get("cant") > 0 Then
+					p_prods.Color=0xFFE2EEFF
+					et_pCant.TextColor=Colors.Red
+					b_prodMenos.Tag = "vendido"
+					b_prodMas.Tag = "vendido"
+				End If
+				Private precio As String=NumberFormat2(clv_orden.GetValue(i).As(Map).Get("precio").As(Double),1,2,2,False)
+				If clv_orden.GetValue(i).As(Map).Get("cant") <> Null Then et_pCant.Text = clv_orden.GetValue(i).As(Map).Get("cant")
+				l_prodX.Text = cs.Color(Colors.red).append(clv_orden.GetValue(i).As(Map).Get("prod")).pop.append(CRLF).Color(0xFF017F01).Append($"Precio $${NumberFormat2(precio, 1, 2, 2, True)}"$).Popall
+				l_prodX.Tag = clv_orden.GetValue(i).As(Map)
+				l_pCant.Tag = clv_orden.GetValue(i).As(Map).Get("id")
 '				Log(clv_orden.GetValue(i).As(Map).Get("id"))
-					i_prod.Bitmap = clv_orden.GetValue(i).As(Map).Get("img")
+				i_prod.Bitmap = clv_orden.GetValue(i).As(Map).Get("img")
 '				End If	
 				
 				
@@ -3355,7 +3462,7 @@ End Sub
 
 Private Sub cb_factura_CheckedChange(Checked As Boolean)
 	Starter.ticketFactura = Checked
-	If Checked Then 
+	If Checked Then
 		Log(222)
 		cb_leyendaDescuento.Checked = False
 		cb_mostrarDescuento.Checked = False