From 83d22bae4f2fb985cd7cba035d50cb2806e87d65 Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <cheveguerra@gmail.com>
Date: Fri, 9 Feb 2024 22:08:48 -0600
Subject: [PATCH] Lista parte del Cierre Total, muestra el resumen por mesa, y
 falta la parte de la impresion y que borre el efectivo!!

---
 B4A/C_Principal.bas       |  45 +++++++++++++++++++++++++++++++++-----
 B4A/Files/principal.bal   | Bin 28780 -> 26091 bytes
 B4A/Files/resumencont.bal | Bin 0 -> 1595 bytes
 B4A/MarketPlace.b4a       |   8 ++++---
 B4A/MarketPlace.b4a.meta  |   4 ++--
 5 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 B4A/Files/resumencont.bal

diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 417ae97..18af6ba 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -75,6 +75,12 @@ Sub Class_Globals
 	Dim p_transparenteCierreAdmin As Panel
 	Private cd1 As ColorDrawable
 	Private p_botonesCierre As Panel
+	Private p_transparenteResumen As Panel
+	Private p_resumen As Panel
+	Private l_resumen As Label
+	Private sv_resumen As ScrollView
+	Dim su As StringUtils
+	Dim cs As CSBuilder
 End Sub
 
 'You can add more parameters here.
@@ -113,8 +119,10 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	p_mesas.Height = Root.Height - WobbleMenu1.Height
 	p_historial.Width = Root.Width
 	p_historial.Height = Root.Height - WobbleMenu1.Height
-	p_transparenteCierreAdmin.Height = Root.Height : p_transparenteCierreAdmin.Width = Root.Width
+	Subs.panelWH(p_transparenteCierreAdmin, Root.Width, Root.Height)
 	p_transparenteCierreAdmin.Top = 0 : p_transparenteCierreAdmin.left = 0
+	Subs.panelWH(p_transparenteResumen, Root.Width, Root.Height)
+	sv_resumen.Panel.LoadLayout("resumenCont")
 	Dim cs As CSBuilder
 	cs.Initialize
 	l_inicioDia.Text = cs.append("Para iniciar día, ingrese el texto ").bold.Append("INICIO DIA").Pop.Append(" y la tecla ").Bold.Append("Retorno").Pop.Append(" del teclado.").Color(Colors.red).Append(" Los datos del día anterior se borraran.").Popall
@@ -186,8 +194,8 @@ Sub B4XPage_CloseRequest As ResumableSub
 		p_mesa.Visible = False
 		p_mesas.Visible = True
 		LlenaMesas(Null, Null)
-	Else
-		B4XPages.ShowPage("Login")
+	Else if p_transparenteResumen.Visible Then
+		p_transparenteResumen.Visible = False
 	End If
 	Return False
 End Sub
@@ -656,7 +664,7 @@ Sub llenaHistorial
 		lv_historial.Clear
 		lv_historial.Visible = True
 		Do While rs_hist.NextRow
-'			cs.Initialize
+			cs.Initialize
 			Dim Label1 As Label
 			Label1 = lv_historial.TwoLinesLayout.Label
 			Label1.TextSize = 16
@@ -959,8 +967,29 @@ Private Sub b_cierraAdmin_LongClick
 	ToastMessageShow("¡Cierre administrativo cancelado!", False)
 End Sub
 
-Private Sub b_cierreTotal_Click
-	
+Private Sub b_cierreTotal_Click	
+	Log("click")
+	sv_resumen.Panel.Height = p_resumen.Height
+	cs.Initialize
+	Log(l_resumen.text)
+	Private c As Cursor = Starter.skmt.ExecQuery("select PE_MESA, PE_TIPO, sum(PE_COSTO_TOT) as SUBTOT from PEDIDO group by PE_MESA, pe_tipo order by PE_MESA, PE_TIPO desc")
+	If c.RowCount > 0 Then
+		c.Position = 0
+		Private mesaAnt As String = ""
+		Private tipo As String
+'		Private texoResumen As String
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			If c.GetString("PE_TIPO") = "TARJETA" Then tipo = "Tarjeta   " Else tipo = "Efectivo "
+			If mesaAnt <> c.GetString("PE_MESA") Then cs.Color(Colors.red).Append("Mesa " & c.GetString("PE_MESA") & CRLF).pop
+			cs.Append($"* ${tipo} $${NumberFormat2(c.GetString("SUBTOT"), 0, 2, 2, True)}${CRLF}"$).Popall
+			mesaAnt = c.GetString("PE_MESA")
+		Next
+		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)
 End Sub
 
 Private Sub et_inicioDia_EnterPressed
@@ -974,4 +1003,8 @@ End Sub
 
 Private Sub p_transparenteCierreAdmin_Click
 	'Para evitar que el clic en pantalla no se siga hacia atras
+End Sub
+
+Private Sub p_transparenteResumen_Click
+	
 End Sub
\ No newline at end of file
diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal
index 7838cafb2d1c3af4a1bb2f86417a7e5bd20f1a52..73c542b3681970dbeb754f1a5e50cf3426cf0117 100644
GIT binary patch
delta 2763
zcmai0ZB)}`6yHr={G)6j1LqK#A&4)iprAG;Lm(k!k%XirwCRG$*l<p)Q-&|3l}hM6
znQ4Tkjx<wjrKOpYFR6G=e(dzYtkdy}osJ*+;1^r>K6C7uFSK*+-S4^2z4!lnp65O<
zf8ByR0}vmrQmHn^s#J0GzhFoFu@g7%L7|2k&IYf;yT<8WWM93e#qLrEO>VE%Sz`5g
z99}m^I$v`*tsLrXYgisMWBM=yRt>uouaLR5!4nL}IZ<gZCku<$V|A@=wR-F>ul+%C
z&ak>I<U5L5(`uG`+)n3Whkb3G$J*Lz_pndcID%SrZkx?%ud=(=<j%p4sK)k@WQ-?a
zt|81r3E>0@CrX$<81hMyu$C}$P9Yghq9YkYqL*-L7`Lm&h8wCh36GO-x`Yi99xvgi
zC7dDQ2@=kfaF)RBL3R_Rj%*1}lJH~+Pm%Cc3Fi==MlzjbhJ<q^oJV*j$t;q5Tpu&B
zJ=B^j^*keCql613Y?AOi2^UG&Ea74a&ky4iRS7jpNy<o`B@qjY&e&$S?*ApWGS)w!
zNsg|1Vkt&c?PK-<n--PT)K-;Q45eiY4W$*u<1jIPv?*MhPp;o^jdT4vTrRt(-0o;>
z^7?OSH>BdeS}U~Sj+sf=JJv)f!R*KMg>jfrXN9%GUOmx-!}HXbW*!f(<MHAStjuo4
zn0zDNpD_yibXj<Rq2kw<%mqACuo>RO9({#BqijCFTNGbSI(_aeSjT3}UvL`U#^MQ6
zNjEf=p{?A9exnxY8yYGl71z;79<D-OOAN4{zE^=U*+%>=B@S=QuECYh9l;8d7Jn`<
z;U1Hk^4y)71sg^7KP!E(iLz&4AXmXF^SHN1H=FpmbRCp*87F>+6#t@XNhuxJZ>xjN
zL^K~0EUCK9WDJwoM6F;Dv6+l5mfNs}T=noSR_EjwZh6F+D=k{ZHKx2riZ{H%CjeKM
z@;)guNlc)!vJ(4qOqf>vKg6~U65C3FPb9Yeh1;-ABDU=j=OKx0CwDVRn3$=i4?06L
zsp*VJ$8%~%$BS<$ACSGABpQFu)Zxi_qcm&@v+N|#Nq9F$jg~wGSJZYxmqfBF(wAC8
zlH5TKW|EiyDKUEki+!+DO1P6cq>oc;$b?7^W|DA1<4ZpLwJH_=ZZ5zn7BzJGi<cw-
z);upvnh(iY%I`n1^eDhCB9MfuUNLEQMRtq2{77tuoMp5bc9UbZX7^*9J{HAW)L?`?
zSnSHdv6;QFm&b)SGYd3(ABs5s>M{5PSLGTp)iE8q2N$XPA-^7726i=Rv87SLQk#9q
z4S=vXl|QEYG$IM743@ut!*UvHj~GHvq>mWqJ~4#*b|35)^TGRh|3iMfpFb1(xhq4#
zw#GAXK%4{z=p?uU2N`P)M#LPze`nAjQnYy1;e$gW^V*dr&7lY{ilofzDDxsLXzoUL
zeQ*WO*Q+@z_4Q&^Rt5GM6!bX@$9zuFPmw5xN%4&q4SWDAM<{<Xe1VBAhVe()z#I2V
zl9<5Vdx2wYIZlc%d*v`DTJ%Xr2!;!Sx%Xjviw#cTA1(F4#ccnI-T6xNlfXZqQhm*q
zZ%Caai3tRTtHeokidx@t*LS2&2fG4+GX#JS_wPfNvjmhMNQsp>N8mhLETsBLC}AM*
zBLPs85>Kq)Nq0(|bQfrlqORZq?sKQWIhvp;cvxQ~w&>*6JW*SvIHD;FE{f&3$Om<j
zJ}USe0UJ#nze%7TZ;W0cYVguv4PK&-@Pu3xhp)Ow(ej-rf(mH-{F;I5fc;I`*jsLe
z%YzkjIU=0W(%SvR>k4!qW#{r85O;-q#Oht8@sx~|*6$k8NS;2x*?F49I$fm}zodX)
say%i*HBw=UmzZMOQnK+|3kG@e{0g2;#4}|awl2`(jg06A5=8|51C8534FCWD

delta 3219
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
UMP)4EFU#qX3G<`J%A2<7Uq^VIT>t<8

diff --git a/B4A/Files/resumencont.bal b/B4A/Files/resumencont.bal
new file mode 100644
index 0000000000000000000000000000000000000000..088bae69faeb46f312479310d99ec529fbdc6fa5
GIT binary patch
literal 1595
zcmZuwOH&g;5Z;&sjRf%licj!`0Yc>Aqsoh<2vngVXozxCCcBelbhDe<og~7EDlZml
z6;)JOUcGzu;K7Stl;VabPx=q^<_-IsWEatFRrh>7)7{(s^-NgPv@MeTBw><$BuQP0
znvhEe2`4;b!C{pOcOtZBK6JQSEpw{_4r!L>X7dyol)Z-lzCdHqU<XM;O?#2n-skuk
z_U5zo%`bOjx8ob>&7pz&u}oqk9{b_Mhre`YGMh8uTh8d%%EZ$T!L?u7vv*%V^=)*o
zwrAJJx5n1re0$sV;$?I&9goV@<Z`*=z1H*kRsRFZd!3|>M0ayb6@H3PD$iV@CsN!M
zMT<L$SuUB^A1agN*Q)75bjB=EW>VNzs_Li}#TyQ*v%JasTO?04&k~ciX*-^Ej64%w
z*zO~cr^6Q<^BT8ghL!o>1Hq6ARnwf;9nP&NS;ErIs=;$Yn#%JLt1)zoZY+vM{}tv?
zE&^%-k`?hIi3sFVK$W<cteS8I^@E?*m?M}aN07?o1&Q%VyMo}lFk}g-OI#F75`iUV
z=_T7yIT{d-Hy#Va#T^(qPO26C>bCrMk49T~dki*6TM)7|X*)DU*E?vZpuFuE+)?f9
zm<uQuZ0RZ>%M4L<70IS4Dy~>obY<o;Qz)NXn5ePqq9a$qwq&x-UAr+8m<R=jrKCw0
ziXManS?Q_i96F-w!ihq2Mz<{&nJdgNgjGa@ORLG#!s4LGl}n}?Rc0<bn@p>#$e&1*
zAZb<YU?jMo1*UT(OHEBD@1=7{R`Y+48Rh2gG+y1x%?SeEn@=!;70)o@y~Ds7ZQ=LW
z&?1<pI!AW=t!?|~?`>MO5DJOlPv9Y}fy!_IEvj4x0C3s~fcJy<qQGGQ933H1`ML;%
z1Kp&9M@a<?Qg{;z^mqWbMeUpbAkj{G07eLpId~chX5<VhReCRhosRmvZFF>&qz&zy
zBT*^+9?yF_v}&OXq#_qd;ZcVJs`pC-W7tP`10<AjF*%5xAyR&os%|(ca!`%mWE{>2
zS9BraFiBK#28I$OVeK;M$OtK)LOcZ(H%35F=+iZhqbsDY0$d~Iv(%v3=W~Z|a%%7m
Ypw2%NP<4MKR{T!<Oz^{n{8wq(AJ0!P3;+NC

literal 0
HcmV?d00001

diff --git a/B4A/MarketPlace.b4a b/B4A/MarketPlace.b4a
index 4964fa9..778fcd9 100644
--- a/B4A/MarketPlace.b4a
+++ b/B4A/MarketPlace.b4a
@@ -4,8 +4,9 @@ File10=mesasItem.bal
 File11=principal.bal
 File12=proditem.bal
 File13=proditemCarrito.bal
-File14=usuario.png
-File15=vecteezy_white-diagonal-stripes-with-red-line-isolated-on-white.png
+File14=resumenCont.bal
+File15=usuario.png
+File16=vecteezy_white-diagonal-stripes-with-red-line-isolated-on-white.png
 File2=durakelo.png
 File3=engrane.png
 File4=engranes.png
@@ -21,6 +22,7 @@ FileGroup12=Default Group
 FileGroup13=Default Group
 FileGroup14=Default Group
 FileGroup15=Default Group
+FileGroup16=Default Group
 FileGroup2=Default Group
 FileGroup3=Default Group
 FileGroup4=Default Group
@@ -54,7 +56,7 @@ Module3=DBRequestManager
 Module4=errorManager
 Module5=Starter
 Module6=Subs
-NumberOfFiles=15
+NumberOfFiles=16
 NumberOfLibraries=17
 NumberOfModules=6
 Version=12.8
diff --git a/B4A/MarketPlace.b4a.meta b/B4A/MarketPlace.b4a.meta
index df86e32..d5b8ead 100644
--- a/B4A/MarketPlace.b4a.meta
+++ b/B4A/MarketPlace.b4a.meta
@@ -14,11 +14,11 @@ ModuleBreakpoints5=
 ModuleBreakpoints6=
 ModuleClosedNodes0=
 ModuleClosedNodes1=
-ModuleClosedNodes2=11,12,13,14,23,24,25,27,28,29,30,31
+ModuleClosedNodes2=11,12,13,14,24,25,27,28,29,30,31,32,33,34,35
 ModuleClosedNodes3=
 ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=68
-NavigationStack=C_Principal,B4XPage_CloseRequest,181,0,C_Principal,b_prodMenos_Click,220,0,C_Principal,b_prodMas_Click,263,0,C_Principal,cuentaProds,292,0,C_Principal,LlenaProdsLL,385,0,C_Principal,lv_promos_ItemClick,623,0,C_Principal,p_carrito_Click,631,0,C_Principal,b_terminar_Click,641,0,C_Principal,llenaHistorial,674,0,C_Principal,LlenaMesas,802,0
+NavigationStack=C_Principal,Class_Globals,76,4,B4XMainPage,B4XPage_Created,63,0,Visual Designer,login.bal,-100,2,C_Principal,llenaHistorial,654,2,C_Principal,p_transparenteResumen_Click,975,0,C_Principal,et_inicioDia_EnterPressed,977,0,C_Principal,b_pagoCerrar_Click,922,0,Visual Designer,resumenCont.bal,-100,6,Visual Designer,principal.bal,-100,6,C_Principal,b_cierreTotal_Click,983,6
 SelectedBuild=0
 VisibleModules=1,5,6,2,4,3