From a401776920a0458db1d350f78dee64b2ae6f6297 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Thu, 13 Feb 2025 00:41:09 -0600 Subject: [PATCH] =?UTF-8?q?-=20VERSION=205.02.13=20-=20Se=20agrego=20el=20?= =?UTF-8?q?"total"=20a=20la=20pantalla=20de=20la=20mesa.=20-=20Se=20agreg?= =?UTF-8?q?=C3=B3=20el=20"total=20de=20mesas"=20al=20reporte=20A+B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 16 ++++++++++++++++ Files/principal.bal | Bin 77814 -> 78662 bytes Lanterna2.b4a | 2 +- Lanterna2.b4a.meta | 2 +- Principal.bas | 27 ++++++++++++++++++++++++++- Subs.bas | 6 ++++++ 6 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a3f49d9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,16 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# linguist-language +*.b4a linguist-language=B4X +*.b4i linguist-language=B4X +*.b4j linguist-language=B4X +*.b4r linguist-language=B4X +*.bas linguist-language=B4X + +# linguist-detectable +*.b4a linguist-detectable=true +*.b4i linguist-detectable=true +*.b4j linguist-detectable=true +*.b4r linguist-detectable=true +*.bas linguist-detectable=true \ No newline at end of file diff --git a/Files/principal.bal b/Files/principal.bal index 182ec26bda46834b19edec1cc601ba49af0a570d..6ff7d5eb24f232563837ddb22cd85f5b6aeee6c6 100644 GIT binary patch delta 5857 zcmb7I3s_ZE7G|AzcrJ2};N>MEAcZE%%LMU)A}I=4Sz%@`yd+pYKpv5mh#~j_4PD{s zF;}3eYiTBQEHDGHDIIMhogS8xiQmjv6KQCsrlZW-`*6AEa_`WL-?tC{J?pX8Ui)8b z@8hLYt_RP!dbzo{xLosfanaG=kDI(icf$}uOR|>c=N0E?<`Z| zAbE0Wu~nd47&OKe-cf?Res(LHOtL97s%cp9M#7tDJWr!WgEwpN77a$iFVLu^u~ma* z4SrFBU$WscmzQlnTwc-OKWMO7gSTmLod(xyaDxWFs=4a!A%E@ON4 zzDBT5gFn#VRt;{`;QbohuE7Tge@Np`G(Ms+f<_1p_HRCokg7opV!rP@kd?!}HJ(@< z9x$3w``+{!Gc#QYq~1MinmhaZWYJ@$LXl8TaaK0}f%C%VDEq^TU?kA%1Oq*mWIdL@ zG$*gfv?Ql!YW5R3g~g^gCY*?Ohll$n_LfLaQBGmLRjlj_zXDSQQi_f1S0oS_%K#7I=j&gG9SAQCgPj--ePtE}bo!A999NcsDbq!~_^cU& zSMk)SM8mvQdeUJVWL~AiA3KPUsUj{YO~S}IIvnxLeR#ce2i{t4O=mnlQ(lHol^Ie0 zvJPWbn6PfO0i)(8WB2M{>{;Q1Ar(5@o120wW{B9mDh`jH)#2Oq_i?t=Jogexl?L43 zkc{&yeXzPb91dY)dAeW}@LG8yru?kK_E+O@_L_{|0FSN-hPUwCnumlCz{M4bO2yg< zAgl!ZTVX?Z4&LO58k;eSlRrV8`M4lixse}xQQGzls=4|>E1Zx z;{;4^$W|(L1h~OP<`;goMT2vj^mt>nvF5Z6J6mb_B6=N)z#WPo4oUQft9W$wbY8z38_jUd%17y% z9ZRla!TE4r>EhG?L+ z2^Z<%#Z~CxM+4Y(L(ks0kjTc)Ykl)Z?6C*}a}g;C&Q+8t?-GfdKga?BYd(*_dzmv*%GN-_Fi2JZe*R95aw1U!2{ z6;J-qYOLeNxVCj3mcFUO8|zp#i*naUh!8wkkRvg_O{6_C9h#19Z5Cm$8u?(m$UU*) zZ~`y+&i!WaQlq4-N?vwqgVDP?RM69uxij(6JP~IfFoVRjeHk4k$w7M>HSTDt{+xgz zBy-Y_hivJXi}EL|NR#o0PxLw#m|gSDP!@hfsq?W;<3_D9Uh?TT6{Q*U7<2GNBKUJl zr*UF=e0noq{7_namtf!v$2U5BaL!k^;r>5c1Yh;lZ=dPuU}-pfQt(rg<7elbi4yn` zb@hlD{B6nc@2AF+6QCxCwX8*dF$;mJ!@z!;%;7Vi<_(k-7-n6tKeo4s{FoYM=Y~18 z%hYxVQiFTtGcW2v2dc*Q_SqnNJ2@;GN^s>-3tGMi>TOn+ztBS<-`-%p0_EH>qGR-N zku|R{ISp4GX9|>NA(T-rPzVD&aM!pkUs$m2>mb?_A6E8w>1)-`7>xPyj1aCaKiqzP zp3n7PSuo^;b^2u|^bpRb$GQ{LgpXHxMvx7!-BEzvCHJFvG6*|=^7Fct-n*$KOOmN4 zM{&DFnEy>9KK-55-;wWnmjjVlf1-l=;bN@pv`W9~?3JP?wW7dpyCKS&Y{o9W5-G|q zXafrlqOtLKI(~lA0x^yTF-{C(nSpZqDI##3)*@bFmo{5>G4RZeXPKReb556*-9}gh=)06t_s+4^P*0WpOhoHA1h zq_Q_zq;op~a@f-|jR5HB4gcm+FHDK7Ku`TE2$yyFSc!-+KkD6BpUlI?u3Pv8X>WN7 zR{q^0q_G|6JqImaddxdC5x4!rBFs>UFoPzrEjo=8q4}Q{{P?GFoIS(O>R|@YbUGz2 zoHvh{@00qI0Wz$)^!HAqFzh*TY5hI1L~Ptp%UZ1k zW?8)(rCI&d7zys|3vKjI4x!;)7o72wV#2x$>f(xU+gUTV{la=)AYZn0v3J=x`66Tg zFk1NH{)@(_U;mruvR_sEy>yJ9Zk>kR3nGMjdB)*h>U|+Ne-d%JF&LZ9n{nHvEPBfp z63p2g@QVd9*@}m<%aD|5w_>g+%u$=#x{DUL-Gd$pE^neqi zdCW-O9RVU1TsFglj#dvkv3iJ4_4O4CJnU%juoHtvxWUY;7QCmYuW?C_I?>GHnl0Ci z)IZYrHIQ!T@>u|D22EUH^mQZMukOOo&A~#pO7!f0-dMw@FB2u>h6l*W?l8_;O7bRm z&_gyh^|a8*rEZ=`*EX@X9Sp(()!PE+-sIT;W_gzf^sPcB_j*{scUR43vj7&zbxcgI zolDh%XHp*J3Klt7)Hux(`-pBhB!OKj>(oTx9gsedn0yeIV(@3O9VIZ6WkNS3bwzsK@ry(h3!AqnfQQ}$?A zTfHIc_YDi=m4l&z-QE{Np*2KXDHJ*hwZIl?f*y?g25;<})@&d$@$?HC#qAQMpxDuW z@xcE5y(tx5e*fD-Ci_4IzxMY910{|#mJB@O<)O49cJ=RbBA5C*ThT&aFv{ftaKv%3 z$NfljA<&sD4E-9Aas_f!2vi7bY(CdoeHx{;_P$vC3hQjV`974QS#Pu4 zV70U{Z-WyL8bZw-33t;zoo-zuRI#3-eic;luL9~z^2Ts53)O13skU=f#SZCa^UaV7 z^1EYrSBRJ0BPnUs{LZq8-&t7K9`HIV-!fLy^h(BpUdQIKyT4}0S)&K`0yWl^+b+d5 zcHug4DvhD4m^BXgC$ro(j)%_9zb(9b)BhUC>mtDnX!UKB(B3ESr!VwrUl|LTP|LIn Yq*{ATcC{{(XGM|1R#joEqr#W}0jS`9W&i*H delta 5540 zcmb7I4O~=J7N7HCz&FS|z~Ms?1u_{cKx*3Rse#%%1z+e7whywf=tZ`Ja0}?m6fF z@45GJ^t?~kIiCQ%PN!=M(di8I|9iUvcwcF_?^#X?;fMP`gOm}_uCG{6qUY$Tp~r=v zSK$pRypeD%JxI?BD!fUB|E$8I3cskrFL`iT%le%KAf|L-O;mr9acpJ-J8h{=Dj=;80Bf{C*#nIDO zV47^T6$jY4H4498ZooSiorij60y}VH-rZ)lz*>V*G@{pyX7)Sj6~q9`Hi>}-T>r$r zUl-UeO<;@{+Ie~emi^>;tX&x442w}mtA5+CBz${G4d$mAup>EfQ#%A>#fOow2RjpE zFk?SYXhFFJPgqSD{wF)`UTnh1(P;wXo@Wx$-WmmaG3v2gOh3ir#-#8cJ1~eS`9Tq&j9m^}MShy+#9_2dNK#6=G}?^sWjo1nQ54^(ug^`qoG+z>zPzsv01T}`Ex7*Ls!qn?x#(d@LC#9 zSyf>;L@W-YFu@PUyUS}CR~o?UeV#Z)hW2) zvH{Io6LG<#30S$Bx#*8yrw@grn6f)wCS%9i3_~}~CC}%N>Gc-)0HZr+W7ird5pY6v zB<#eJ>W3f%>(-5xZdBh5Fdc)Q8;f(EHDI7Uv38R`25uP&AG=l?cz48)_wmnuqIoG0+E0Qki|(9cXS=)?;cO?dN03c%ZIW z`f+=>9?ee~$WiCq@mSar3qMkJchNgzTDIID+9VrXac6w2!AP=io{EwC$HhH%=ptVB zV-yg&G&z$E5$Y$I4uyNO4OdCZdJ%uk-BsH6`eTt4ns9@L;YXrFfGnq1C>vpCvXPBk zrz?qhySG&yH6PE4weJ(Fnd+^g|Rb zZ8YGp$1cU5MPEf>xMr<}BxaF^2OLo_q?6U!1|F}D804xuiu&JHewYBd=XxG*^lDg9Iy_=l4` zo|c#I54cgx5!i1JVf(R#fdNF=0bB&2Wy(mL`neq!eHKBh7|dF!FtCR~(GSD1^7MHw zQZ6+_V#|lw_{A4?to$c0Ub8@e=XenYX>21|a4@*`OpSjO3FMX#O`$g2k6oWfpt&P7 zAcn^EN;4oy=IH)7;k1$FDEeVG9y!~96<@lV_K7czR5!+Z$Cn1Y*0xk>>k!+sK(U$_ zWD|(Pndh!y`x$qZm~++$MmfG=wP$iM<{LZCZ}W(o+MHr+Z!;i&CPTu1WdWZ1im4=_ z`5Y57j$6+eaP9F7-1hDAig=otPovr=5Rki^nT=TJ#qM#w4o4rIeA^mDzeY3B-SkRQ zL=HzX0SG4ZF|Lsm0{mEd$s|f8FpiB_Nhgf}IdnME34oDC~}L593V{l2$DmTRt5Axoo@ zDcAVk+A}e7C#wAKxSm{q@h;o2pd56tGk zT>LriS6)>7AK)ef2JM-}^DJT_mq z!E{<p6*WV|p*X?q|M!bJGqpy!B`FqW=KXfAN+b9`x3KuowN`GyOh}RQY~18y@nu zdZ-txKaka?C6MYlnG?7|h2e!g)LHMRkEeZ`0sH{dyCbmaQn34!e7@TVg(BQRcXo4g zHqI>J(RCH$tcpWx?+(RReZYo099FQ(YbRIN&ll`a;wsk|ViVtNo+&Uw~tDYgZW3n$yfcsc@{btx5h1XJ?!y&cc*)$t$`RWV-x>kvkc z+m@wNtOvfLqP%ek3d9qn|n zEf#ECwX%7uHGbBx^KRe8IG}HWwdzTegtZ#QYWbS=Ec-5C9rG7%j_X{mJO}kUtvmW9 zAJlKje{-RGxVUq~FL_<> Null And c.GetString("total") <> "null" Then total0 = c.GetString("total") Private p As Cursor = Starter.skmt.ExecQuery($"select count(PT_TICKET) as ordenes from pedido_TICKET where PT_PAGO <> 'MULTI-TICKET' and PT_PAGO <> 'VENTA' "$) p.Position = 0 -' Log($"Total Prods: ${cant0}, Total Compra: $$1.2{total0}"$) + Log($"Total Prods: ${cant0}, Total Compra: $$1.2{total0}"$) ' l_totalCarrito.text = $"Total: $${NumberFormat2(total0,1,2,2,True)}"$ c.Close If WobbleMenu1.GetCurrentTab = 2 Then LlenaProdsLL(Null, Null) @@ -1225,6 +1229,10 @@ Private Sub p_mesasItem_Click Starter.ticketActual = m.Get("ticket") Starter.comensalesActuales = m.Get("comensales") Starter.totalActual = m.Get("subtotal") + Log(Subs.traeTotalesTicketActual) + Log(Subs.traeTotalTicketActual_P("VENTA")) + Log(Subs.traeTotalTicketActual_PT) + l_montoTotalMesa.Text = "$" & NumberFormat2(m.Get("subtotal"), 1, 0, 0, True) l_mesa0.Text = $"MESA ${Starter.mesaActual}"$ cb_opcionEfectivo.Checked = False cb_mostrarDescuento.Checked = False @@ -2993,6 +3001,23 @@ Sub b_impAB_Click Log($"Tarjetas: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel, 1, 0, 0, True), (30 - "Tarjetas: ".Length), ".")} "$) Log($"Efectivo: ${Subs.alineaDerecha("$"&NumberFormat2(montoEfectivo, 1, 0, 0, True), (30 - "Efectivo: ".Length), ".")} "$) Log($"Total: ${Subs.alineaDerecha("$"&NumberFormat2(montoAmex+montoMifel+montoEfectivo, 1, 0, 0, True), (30 - "Total: ".Length), ".")} "$) + + 'TOTAL DE MESAS + If imprimirAqui Then Printer1.WriteString(CRLF) + If imprimirAqui Then Printer1.WriteString(Printer1.BOLD) + If imprimirAqui Then Printer1.WriteString($"*** TOTAL DE MESAS *** ${CRLF}"$) + If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD) + If imprimirAqui Then + Printer1.WriteString($"Total Mesas: ${Subs.alineaDerecha(Subs.traeCuantasMesas, (30 - "Total Mesas: ".Length), ".")} ${CRLF}"$) + End If + cs.Append(CRLF) + cs.Color(Colors.red).Append($"** TOTAL DE MESAS **${CRLF}"$).pop + cs.Color(Colors.DarkGray).Append($"Total Mesas: ${Subs.alineaDerecha(Subs.traeCuantasMesas, (30 - "Total Mesas: ".Length), ".")} ${CRLF}"$).pop + cs.Append(CRLF) + cs.Append(CRLF) + Log("*** TOTAL DE MESAS ***") + Log($"Total Mesas: ${Subs.traeCuantasMesas}"$) + End If If imprimirAqui Then Printer1.WriteString(CRLF) diff --git a/Subs.bas b/Subs.bas index bdd8ea8..58ca465 100644 --- a/Subs.bas +++ b/Subs.bas @@ -1548,6 +1548,12 @@ Sub revisaEfectivoBorrado As Boolean Return efeBorr End Sub +'Regresa cuantas mesas tuvieron venta +Sub traeCuantasMesas As Int + Private cm As Cursor = Starter.skmt.ExecQuery($"Select distinct pe_mesa, pe_ticket, PE_TIPO, pe_origen from pedido where pe_origen Is Null order by cast( pe_mesa As integer)"$) + Return cm.RowCount +End Sub + 'Change CheckBox colors Sub SetButtonTintList(View As View, Disabled As Int, Enabled As Int) Dim States(2,1) As Int