From fdb9d9e453b40b5c93fcef855f1c6a8a47bfddb4 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Fri, 21 Feb 2025 10:33:03 -0300 Subject: [PATCH] =?UTF-8?q?feat:=20taxa=20de=20servi=C3=A7o=20conticionado?= =?UTF-8?q?=20a=20configura=C3=A7=C3=A3o=20(que=20ainda=20n=C3=A3o=20exist?= =?UTF-8?q?e=20rs)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clients/__pycache__/urls.cpython-310.pyc | Bin 403 -> 463 bytes .../clients/__pycache__/views.cpython-310.pyc | Bin 1340 -> 1804 bytes gestaoRaul/clients/templates/clients.html | 4 ++- gestaoRaul/clients/templates/viewclient.html | 2 +- gestaoRaul/clients/views.py | 27 +++++++++-------- .../__pycache__/views.cpython-310.pyc | Bin 4255 -> 4222 bytes .../comandas/templates/viewcomanda.html | 15 ++++++++-- .../custom_filter_tag.cpython-310.pyc | Bin 813 -> 1738 bytes .../templatetags/custom_filter_tag.py | 28 +++++++++++++++++- gestaoRaul/comandas/views.py | 5 +++- gestaoRaul/db.sqlite3 | Bin 331776 -> 331776 bytes 11 files changed, 63 insertions(+), 18 deletions(-) diff --git a/gestaoRaul/clients/__pycache__/urls.cpython-310.pyc b/gestaoRaul/clients/__pycache__/urls.cpython-310.pyc index f23e20b6ca70fc59b3cde05fabcc4709a0350d18..d1a2534f2a6e4dfc1ad61ec8050ad62e605218bf 100644 GIT binary patch delta 178 zcmbQte4bf5pO=@50SKl!Y)kK9WMFs<;vfS~AjbiSi?b$bhfAa~rf{XQWO1f&r?B-h zr?WOUN(Qq%Q|xYWA*B2?xhK9fl`i4| u8hVSnv?!+_v7{umD6e=WLlHkvtcZWI38Sxw0FWub$iv9T%*P0U9KQh?Ln(*6K6#+ z`)P7bmSZ#(yTx5vlv9vcQj%JfSG~z`=JpY{ieYo9noPV)$ z`*ET2BfRD>Fw&7McM29WhGm}f!j0WR#DeN>?iGIQQ(5Fe5yoNBid$6o@^-NnuTk00 zqoNacs2t?oq8Im=qt;|7TNg~W<=Sg!#p1q^C!H!C^BFTrm^0k^vrK?aYnQ4_;XcoU2rJ*etmqjv{N!8uerCg-8 zsY93Up)ME4`&#|6fKd`W{y5Ln9EXRy$!P&aQw6^$nBFRIwrId4DOAcZiss?)_23=D zYaW2H&Wv61E9ab9cL`V}U$Ts?TnOKtoJA=uVn#={$g7~K4TXj+a;l&_m_Y`na+5sQ zxI>r(#;A z$jyLP;iaq|Ljkjzama|Rm}D31oLd1NZ^8;qgumR-mFZt4y!JnM64<~O}#WO-(#}s={p8mA+4B11pc40J)APzw2Bc=;+E|%iby>ggig$!2=B-5HyVh)-Esg!e@q_*>Kuf;w zH9ZB@{HEpsyob^Ucmec*_cA10ts7kWBUndoqPYP>Spl%m!8>g053%tJG&f90O7{ln zFR=?@a%%~-YNq>HqoI3<+He8c8ql{e)Sx{3yvy(h>H$dlD{$RGgn~z@5+W3ug)4)0 zo=@s{SsenS5bjGgI8IJ?VAH>Ykp|}pef>3jCc{A$$oh_?qfqtbESVpcBXd-0n=Y)O z!$EUb51KZVn9dGH$-*9uic+fFXq0!{yFPi>UOZ|#08? zJqpzq_aJ1tsjj{FH$^uPoh?!kaiTXsI17jfV~geWh75E4HU7eL(>iCj>+ww5i)2FBh>a9Jew zzyS_b4m<}CK;1xJAcBF+ik|#4`f8YFkU$dWa)~0Dp@S7ZdnSBh;v(f4dBS8eM zNkdE8c%?^e?A3k~l!5d8I&4_UoFCMKhL@ZY$wVmFH!22#ugPaxMw?6|VwZ_GnJtmH z%$7(+wkBmFwkM>>e-m<@kis(zbsAXc(doyVltDz^Zu(09S3! zb?m#2P1F~7jof?o?n0{>F)?mk_nltrR^cA*{Cjxkr7KH&Cfd(_0f~aVt3Eu!HQq#4 zW%b|;#`t?yq$U@q)ne8js5dR>=~62v82H^Sc4KT+F}pLAt!fXeWqlyzw1rBypdjo% wvEi|s&MFA|){LyN)c-aAZ`u4_(~4y+?^ArC?EE=NsNFRWV#-52QB0HgFMAK5t^fc4 diff --git a/gestaoRaul/clients/templates/clients.html b/gestaoRaul/clients/templates/clients.html index 950c372..7baa309 100644 --- a/gestaoRaul/clients/templates/clients.html +++ b/gestaoRaul/clients/templates/clients.html @@ -1,5 +1,7 @@ {% extends "base.html" %} {% load static %} +{% load custom_filter_tag %} + @@ -34,7 +36,7 @@ Clientes {{client.name}} - R$ {{client.debt}} + R$ {{client.id | totalFiado}} {{client.contact}} {{client.active}} diff --git a/gestaoRaul/clients/templates/viewclient.html b/gestaoRaul/clients/templates/viewclient.html index 12dddc5..f4fdeae 100644 --- a/gestaoRaul/clients/templates/viewclient.html +++ b/gestaoRaul/clients/templates/viewclient.html @@ -16,7 +16,7 @@ Comandas

{{client.name}}

-

R$ {{total}}

+

R$ {{client.id | totalFiado}}

diff --git a/gestaoRaul/clients/views.py b/gestaoRaul/clients/views.py index a597eb9..97d513c 100644 --- a/gestaoRaul/clients/views.py +++ b/gestaoRaul/clients/views.py @@ -15,21 +15,24 @@ def clients(request): return render(request, 'clients.html', {'clients': clients}) def viewClient(request,clientId): + # config = { + # 'taxa': False + # } client = Client.objects.get(id=int(clientId)) comandas = Comanda.objects.filter(client = client).filter(status = 'FIADO') total = Decimal(0) - for comanda in comandas: - totalConsumo = 0 - totalParcial = 0 - consumo = ProductComanda.objects.filter(comanda=comanda) - parcial = Payments.objects.filter(comanda=comanda) - for p in parcial: - totalParcial += p.value - for produto in consumo: - totalConsumo += produto.product.price - total+= (totalConsumo - totalParcial) - total+= round(total * Decimal(0.1), 2) - return render(request, 'viewclient.html', {'total': total, 'client': client, 'comandas': comandas}) + # for comanda in comandas: + # totalConsumo = 0 + # totalParcial = 0 + # consumo = ProductComanda.objects.filter(comanda=comanda) + # parcial = Payments.objects.filter(comanda=comanda) + # for p in parcial: + # totalParcial += p.value + # for produto in consumo: + # totalConsumo += produto.product.price + # total+= (totalConsumo - totalParcial) + # total = total + round(total * Decimal(0.1), 2) if config['taxa'] else total + return render(request, 'viewclient.html', {'client': client, 'comandas': comandas}) @group_required(groupName='Gerente') diff --git a/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc index 81ab57b8567c312bc86e24c8ac49d46aa1e90a02..03ba2835578beb0fcd85fdaee0a35a1bbb14f916 100644 GIT binary patch delta 1015 zcmZ8f%}*0S6yLYsyWQPZ0f7d!#-J$)8o3xhNaVu;ffOPKv`Isn&eF7$R%QoH%xpOH z%xP|FV*4i;E_%^}|HWRsdDp9n`euufIGg$H@4b2RX6E8;p)vE` z|EV8m(eiLE;f#JD5Flz3V&FyRQ5UWh(Y7b(KX)V14TqF7k#5yz3GSM>7GMIJF zGMU}d`_4d#E#^u;F^PpyHp|FeeUI1!X!$HSCUy^4mN-2i?upvZk<0+_D2H7*OW-z? zIK!P~r8*IN+{OP$>~p_$k$c3ORQ6R`M{9(bDa-Unxjz6<4z~_B*cdms-c#d%UE&Jy zIq-m++~zv^Gu$G<+raK=+e$H8rqlTLlF-eLV<%?4+u3V2L}Y%nvvdkq=v{H!D#AVS z%$kDx;)S*1&Y@e^^xvK)zF0H*6`&>Y-5S865cXXDq1-etAtzx{f|Q=FiLZ7cyNEQg z4#KFm+az>V1kR1|$LNb>Ej%>`0p!4j37}=M?)0}-8ICAr$rD8&YpUdRN5*_v)iE(kMXi)I8+D#Lvc$ZlWu(RzezfSXc+N{tg3)jx+6+ zmU!(>A7gb@j(vjF)zXf@UP&z-W!830X7%lXg3KY(cDdfq3=}}m@XtJA^Z;vMmMcz^ zEOifR9a4McM`1gxv)OvPiMOD4@X*94tt~8X4rTC%;;yH{{3nLg5NkNxDX*Joo$kxT zCTzFf?nYr^My$q;qH_uv;!`GX(Efjz6!rDT^S7DuF@b3cfr`>W5Cp4MuxOg3lR!w2B9ItSjm$h3X7G%Y=NBrW zH_Bo*NEK4mx2;M*_{!XmF!OOOMvkoa0@ennSq(f z?GG}GJ43T@OKn29r|Q(C7IxX(S8o*oB_#|)9#Jv{euUclQ=rZZy=YLkRG)JAM{ftX zkF<#=oE7cclM`RKxF4GYA{ZVOKJ`v%PjuG9>=-rc$SaPEpajr%H+I+f31JFjs!u}R z6dLtKC@f(M1FN1OH2B$`8rxbs-0ZrtNm8)o59CiHV)JstZlC@FNvN7TETelo%X_1E zkoTS@V>+N&&c2k=?vO=n33U0debJl;wknT0B`nF`oolV@_=Me1&`@wnfnuDk{p2nj zS;DBYM@b&{29$N=75B5bud$W~2!Y;!2pZtPNnp2S>K1ptQE$#6v^{oH#r61lUOoB! zhdS!18qaPiuo2oOn?I~BsHh_!cxS#+4Y`s%&|A;~g13V=+r(03cM_J2dC~{W-dzL( z3s>!t=khP_{9|+p6zG5w3R7uZ>L{La1{tDfD0%A)mFab632W$Z7iEDtO;|k#B{6#* zwGn+`6+x+iCeR^j=OJ~bfD*a#qW|&!GyiFvX6$l58}s-jT&iG^UB&ZMWO-w2dv#?- zQ8eTIkf+M}F3n8Aty>x$$&=6m@E91`U4yry;C zem087G+w8bGizR_U8_D8Tfh^Cm*WXrPQyE$BOjk>mRZZtw(1E!38L z7GBtVfX!XP2YfHhx>i49I~g84PV=OV4p);^N4vpH+$v+7eP6kJFiL2W@|Y-B-|)=Nen#oCl7B%k?0L F-T+NH?FIk< diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index bc8bcb8..cb2b2a6 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -117,6 +117,7 @@ Detalhes {{comanda.name}} {% endif %} {% endfor %} + {% if config.taxa %} Taxa de serviço 10% @@ -125,6 +126,8 @@ Detalhes {{comanda.name}} R$ {{valores.taxa}} + {% endif %} + {% if parcials%} Pagamentos parciais {% endif %} @@ -140,7 +143,11 @@ Detalhes {{comanda.name}} + {% if config.taxa %} Total R$ {{valores.totalComTaxa}} + {% else %} + Total R$ {{valores.totalSemTaxa}} + {% endif %} @@ -191,12 +198,16 @@ Detalhes {{comanda.name}}

Pagamento

+ {% if config.taxa %}

R$ {{ valores.totalComTaxa }}

R$ {{ valores.totalComTaxa }}

R$ {{ valores.totalSemTaxa }}

- Taxa de serviço + {% else %} +

R$ {{ valores.totalSemTaxa }}

+ + {% endif %}
@@ -268,7 +279,7 @@ Detalhes {{comanda.name}}
{% csrf_token %}

Adicionar na Conta

-

R$ {{ total }}

+

R$ {{ valores.totalSemTaxa }}

diff --git a/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-310.pyc b/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-310.pyc index f8f3af6e7277ea2ee90241fcbfa81a0ae057ab11..3222700e23a3f9e973a47e51014e78028892e8f7 100644 GIT binary patch literal 1738 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