From aac7f57fbea2994c93943ab83a7fc2e503a4317f Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Mon, 17 Feb 2025 17:10:43 -0300 Subject: [PATCH] feat: taxa de serviso part1 --- .../__pycache__/htmx_views.cpython-313.pyc | Bin 5274 -> 6811 bytes .../comandas/__pycache__/urls.cpython-313.pyc | Bin 1655 -> 1763 bytes .../__pycache__/views.cpython-313.pyc | Bin 7238 -> 8122 bytes gestaoRaul/comandas/htmx_views.py | 16 ++++++++++++---- .../comandas/templates/viewcomanda.html | 2 +- gestaoRaul/comandas/views.py | 12 +++++++++--- gestaoRaul/db.sqlite3 | Bin 311296 -> 315392 bytes .../__pycache__/settings.cpython-313.pyc | Bin 3242 -> 3893 bytes .../__pycache__/urls.cpython-313.pyc | Bin 1714 -> 1767 bytes 9 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc index 26337a75ffae3c94d0fd0bfe7cdda2ee64762475..defa748f442c5a74c227539133456f08109cb8db 100644 GIT binary patch literal 6811 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 literal 5274 zcmb_gU2GHC6~6Q5e@|lPmjH_cA;cRtU(8SajCV~1VnG^Yyn9NHwa^yEd!|}rAsPbS z+e2u0K6H>MKE*%EDS;kx+TIFnYmf&UlQmt56pz2SGFmWc$+jhVoH~b0kxBWM0 z9+MarBZz5ogB~X^1~+*1Eax=W=li`ntH^Kvz@W5}o%He@>c&s#4Z3&gG zd>-t6$W{G;)iWz+9vOe~@2v*fSEpB|*T()FcwY^?i> zWwE#oi;*IR=wyoi;aA!cc*x6wISy`0H%6rglvo`9o59R$#j!9a;etrBy%3)~#HN_Q z<(tR>5{NNem(gyKyIbBQIYofTm*&u%-)eck)ZNnQ^O+Mqn)%=eBhzqUXO(yc!i2vUz8I1`tmLoFlInmo!r{G$WOx zQJ5+!(-8d7Fg6%#rl_ZuRR$Fl{X;RgO{qY$c>`uBX7y}dr5Ja#9UHV4>rSf{a`Nj zaQ#bYO5}wvv^uylxH`Ntymolq7b%TzcJ_Vdt8^wx(^au;L+q}I-Ot3HO~4Ppjt#lD zBKJP|VOj1i%Oijx-yjyf50BuSF!F_4e(?Ui_t*N?-EVBRc0B3&<3jmnrqZfDl&YTK zs&B>jL10tfw;}gc{B}QIUm|8QPf|kWiN5Nzl=8ix?$# zkU$Y*uo6Y5XQ2nz)h|F(B3}eTtJhbqZv^&N0{hFy-YP>IxKNtd1UDbLAFH;u-M?BD zy$@pdV)w6Y`n%S;pPVXp53Kv6Wie_QztOBUKUb?={%5!Gi5mXH(QMl7 zCa~S>sE}P(sJX7DMv?-nlf)#Ss8uud-n!cr0jej_MpoDC4|c=-1iH707_v$=WW`iw z#44ro;b8*~DF6PrP3qJD;67G$wNLUS^Jp@)z|urgg4HK#(&!@%b_ ziZN^;2pMFJqTmEJh>UeWqNm_f$K1dG1F~YQovKUPvT9?IgV*OlZ3Ojy0}Vu5XWvHW z(Msphjn0uu=Sca~L>b!7%cbd^XrpcPpRe?v-{`+s>A%PTX$%2rCz4DuBso`_e1Txr zQxSWfiTnPasL~kNXc>koIbgm6sz9loujZZ$6 z*d5g1+V8<=1`kgK%X93WL8s}sPR&DsbWYP%$1`t3*E!TdMexk-XkYEvUz)rhuZsQ$ z*X~{Wd7Ndu>7G>KePpOR9xpWueFPJJ7Yl(+YRL~%*`)BSPy$$4B#Q7YZ74c69KSZL zOk6U>>6wW*y$Dm&F=%$$DM(cfN`J>tlb|q;N@t+?W<$YM_};zu*1Ff-y;V=(#hwEX z-5`uVgXfnO{7#fhDNVK%3Z?Cu6l*JTE)040`7h_;!9CfL_j!v zDMAgBM}(`@&u}W660*b9f13~vYb{2zH=ru5SG;)tHBmh!6n9e0)pibVg8!;Lhgil) z@i><_T)*D=WYI!;VeRsXXc2TEC0~E`HhEzqTTZJOS<2vx-d8{j*Wiy&S>Zxb5 z>Bj}(KM-(F78K(?Sb@m!*!0$Rtm7>RNzcf_W*K&hBb|_*290a*r~eWf2x;fFc(@Wi z{OeFTe7GDQEKN1zZLMdYi z+a67=`y*vB!V)JQ-2;YxHgXX2caols#_ZM>POLFo# zIq;kug3ssV;BzwacbA)6=C;CwZ(WO4xV|mEg}cgc3xq%XlCfI{>s=D}rriVFR%^Y( nTOWh$R%g9S;M(jlz-UP(Y=QF3Nt&SVD`DK046 zPg8Vq3QIXtk=W!LESX$#Kr(h%-c1&c3!GXjysqoGUes~D;1hF^CH8|b cmk84Z27wO}42(P%_~kD$$TxBq$pCc$0JkbHl>h($ delta 128 zcmaFN`<+MQGcPX}0}xDEG(Fvtm4V?ghyw#WP{!vkj2ktcF$(Fk7YWC3#|Z24GB6Zz zrz>bGZgygFWMcNy6q&r8rF^n6YZ{jHxp2D++Xb7%=q3LVzaV92D&^^y8th;r;Zx}SICzlkxeJOrI&^t2ZRe|;#@Kg_Y_8!ou4(R(1=sOSS`vwG-jyMAV5M8juydT#CS5SzST!xj-u#d&aJeMFa(Sa#rD2dX-i=W6wKdar zXcq$RW`q1()Dv-PXTRs?j=GUj&9c{4YbdN5R@o?pz!(e(1Rj2SzvP$_dc0BKbnX;q zg^H2DLl2E}zHIS7s}%|%mHfJ$5KCMfpT`3q86$D9@iQtRF_I$%0^UQQ2^WO@^9td4 zOcP6`lI%Z8wGrIu?G8QM}FU!U4mGaJX)>GkRD zRCePj_U!uPf8(jE+w@1!@<@Au#8zt^2_cIWT5 zk2dF|(Q6|3q_R6<(thZEN8fg5W@G%Xzq)<=FK3(C(Z99d?L5945fb6`shud1)%980 z51>jds(?rc#?0f^G|yg)PBKk+k6jlsyjV=KFQdJj%IcvkA1YsInKtn1&&LWE6V?g&qzvU+iaZiD_M}a)#^dcc;V8sl?8f-_{KjW$7L*-FWM&~u$(2#?xb7bZT zpQ1C*_-pa80N~<8Kt?NGi0d)D0#+H<5g@h{Kz0yHA9DQH`Ke(}WOcZIN?$V=lG zM;Jik@Cs}w4WXp$=+*Xf5C%a9%abw!$rzRI%e#LZL zzG68Pi`cJ|7)nX6TD;=H=0$thSCR2KtYBBL;1wu#TR>f}n^xK5x8K?l6!S|@pf%dU zyA1E?RZ|X4_&Od2dWO9s^}Ki%T{{AF%QadyEu&nsX&xOhz;qO+A((6g5LDPt3N425 zneh80{SA0wcrJ@RR+d2)Jdae0T3H@V3WEagxImwEnqewUE3MShPE`4SH* z@e=P96{{!Gn@iEtT;n*P(Rd2{h4`(Sw&4nEwn@GAueG_tg*knJo&zgAk5dvSuW5N{ znen#S2Ji#ByC(WU_D+l7X&B*Y+=F4Zk%L}v{2ml9(RR~t%pf`!!TcmUBHLX5=DYGI zJ~;XuZpR*_Md>Wc9-4ht?Bnt-!n^4lP97p*ACaGGbg~7Q5QvW>W|k{X0Ac}5m?rxg zVV^740ZKVh3!TC^x#5ZFIeqeJAC2NiF}f$C&Wy#iS*0(Ao8lEx>YFm4tW)C^XK?87(k7J56%_YBE;H<#bnhre%H^x3MKKX>v{GJf6@s6CRJ7=>AU)aH$~YQAiiYSeIQ)TZ!%z$b!V)tDrDQO6l`=7q^adWU!%_j4nDN1EqpnzN6TPkUT0pI@}%^C#7gfnG;H}6q&^gwqUdekN4oI9z4;5 zr+e_e9z4VGB(LA!gJ(+vDFV4&X;2-a+k$)ir?4RiaXKT728NNq2wjtkVIJa^pwFb@ zNL4^`?G<5HiT%#TCHh2JrXl$&p^ttcrX_zR`7rpp6sQc+`Cvg9rp;u3C@|Z8nH~)c zOjpvKGNtnemFzhtcalrNIdLP81?aEAq$F3y=p8xR>XQx55G%AL_mf*ogjnINAd9ZC zD6$pV7^fEo`iH}%u%8v3FB77RgshGb!k$g=dLM>jQfQ-qc|wFf38fB85i7doV?`J_ zD_s6%U9)s;lidWgs%st?p4%dDagWcJdvtPG8ziYc%%?q{*Ilx39>aZuREN^K-+i`6lAfb zA6#b$y4KO?f01?iUi9bH(;!h|_m=|Q+_!_4XhBqi!^5G4zC%lClXX5KJX$=dL z93R_|KwEA@H{FihE9}uc=G-TAH2Hv0d6u-rIn>7sEZ#1bmX}&=Vl5@kDS7_)YqsWk zG8m1T#*EXVNQ;9LN|#RnGW6cy*cH?P*0B%z3%PXI#5G-Cv@KU#*7{A{wMu|Am>=PrsnC>?3Z&2x*MG7x~&^E2e7dh z?^wTs^3N=aJ~&T|(+9cqVgk$KY`Mz;4FEU*erDeHIs3 - Total R$ {{total}} + Total R$ {{total}} - Taxa de serviso {{taxa}} diff --git a/gestaoRaul/comandas/views.py b/gestaoRaul/comandas/views.py index fc3b87d..6f19940 100644 --- a/gestaoRaul/comandas/views.py +++ b/gestaoRaul/comandas/views.py @@ -29,7 +29,12 @@ def somar(consumo:ProductComanda, comanda:Comanda): totalParcial += p.value for produto in consumo: total += Decimal(produto.product.price) - return total - totalParcial + valores = { + 'total':total, + 'parcial':totalParcial, + 'taxaTotal': round(total * Decimal(0.1), 2) + } + return valores @group_required(groupName='Garçom') def viewComanda(request): @@ -51,8 +56,9 @@ def viewComanda(request): for p in products: if p.name == produto['nome'] and p.active == True: products_ordenados.append(p) - total = somar(consumo,comanda) - return render(request, 'viewcomanda.html', {'parcials':parcial,'clients':clients,'comanda': comanda, 'consumo': consumo, 'total': total, 'products': products_ordenados,'mesas':mesas}) + valores = somar(consumo,comanda) + total = valores['total'] - valores['parcial'] + return render(request, 'viewcomanda.html', {'taxa': valores['taxaTotal'],'parcials':parcial,'clients':clients,'comanda': comanda, 'consumo': consumo, 'total': total, 'products': products_ordenados,'mesas':mesas}) @group_required(groupName='Garçom') diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index a9cfccc4ae0f97632b62c03cdf85ef9a5a6f9d51..7c6cc5317e6dad2f4236494262cae1e15f82cd77 100644 GIT binary patch delta 479 zcmZo@5N=o?JVBcEEdv9C??eTAAVaULdt(ZFo}jscp_!Gbft9hDo~ebYvAN~un!FB0 z9wz>8K(!3M{J;6XZ5EjDj9(1M^ELt!K5|?@Qk-WU18)z{y3Je*7V)U6F#9qZT9{QN z<`|V3lo(njmSyB;8t0prTb5R2n5U)}W#%RsH(y?}{qh<{LuY1jUW@7M9~gC+cr7*? zDlqZN%P~7L8W|Xw>KYgW5t556jSVe~jN8NiG6FHv_VB;VXBJIXp3qibV$9-O=}5@V zRAU1x!;)+hZ*QxdsBlwX!@{bR_=>Xf$ndn#pzs`nbl33mz^HWdBA=4P0zcnC*BsxJ zvU030F*h|eHE&WfV)bnfcFfY*D{84~K6k!(`#U1d^OQ08ZD92B1G8WrkMW>FdzW|SSITV&vg)m7l| F0RTh)kdy!b delta 145 zcmZozAl%R(JVBcE6$1l<&qM`#AVV*iabpU5o}i(Ep|O>zg_WtHo~enYk*USzn!FB0 z9!CD(K(!3s{J*(#HVaI6#xG)JVyb5W(l5saB*l0xGw}9o=2@_aXW|0&=F4lgUtYs# t=*%p}8$O-=1EcO{Lj`5t_VB-qK+Lo~{4evFMbnixu>9FBzmVmj90098EzAG_ diff --git a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-313.pyc b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-313.pyc index 6b2bfb0b454d080bf5d0b617635dbbf23e9df9b8..f853361cf07fd79306d68e7dd5ada8dc3f664768 100644 GIT binary patch delta 763 zcmYk1OHUI~6vyY$GSc^3Xbp^|KnG~2KqQ8R$=FVyv7M=NON?%su^r2V($+hJKsVH- zi5ul3xG-^NCVm1Iu1va|+?9!m>!M%4TV&9aoSS=o|MUDb`(-Zh+wb=f*xt6R_Fm*& zV1{C;&)M%}38djXSb!|Zz`I}(roj?i0Lw4~vTzY_a0#q{Rj>wfd73BTGLG_q&r>i9 z3XlV{aHUOg>z0rDMv_qr(bJ?G(fwo9`r)EzGHLx}-jHWUK0J6wGt7$*JyubVI*6`4 z5sp%rmNcUY^^1=arPX8qPZ}@_g)76K7gvTnhN*U2YNyxL5UqAk5y=k{Jcg#;+OrPn8YFpzm*cggo*^H;y&=?U4N0hqDB?t5S61qOS=3=A5fqhjtzMQTbOY7Nxpy)ivy-fx3Xl?iEEXBgfxLJdh ziJ4Jyvo=R3Ba^25=AB%bjFXvoqquB=x*37EIAwAguP?i>5K{x+C#}u9cm)_aE;0xe HSp($&w4514 diff --git a/gestaoRaul/gestaoRaul/__pycache__/urls.cpython-313.pyc b/gestaoRaul/gestaoRaul/__pycache__/urls.cpython-313.pyc index 531fc643994dc149ad17cf8ebe7ce05249879e3a..670b5e7a418a5f28767f8e2b71f1891051d352ce 100644 GIT binary patch delta 132 zcmdnQ`h6C62^(ltW_KZ<%yFGShq4>p8SmUfb>lkjt-&D@Ci|uc@-|RD1MOS N=Vxl