From d2ab8212b91602b94ef55815005e95d169a2fd7b Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Wed, 19 Feb 2025 16:49:24 -0300 Subject: [PATCH] feat: acossiar comandas fiados a conta client --- .../clients/__pycache__/urls.cpython-313.pyc | Bin 564 -> 661 bytes .../clients/__pycache__/views.cpython-313.pyc | Bin 2268 -> 2860 bytes gestaoRaul/clients/templates/clients.html | 2 +- gestaoRaul/clients/templates/viewclient.html | 61 ++++++++++++++++++ gestaoRaul/clients/urls.py | 1 + gestaoRaul/clients/views.py | 8 +++ .../__pycache__/views.cpython-313.pyc | Bin 8151 -> 8110 bytes .../comandas/templates/viewcomanda.html | 4 +- .../custom_filter_tag.cpython-313.pyc | Bin 1232 -> 1798 bytes .../templatetags/custom_filter_tag.py | 12 +++- gestaoRaul/comandas/views.py | 6 +- gestaoRaul/db.sqlite3 | Bin 327680 -> 331776 bytes .../templates/static/midia/icons/details.svg | 14 ++++ .../templates/static/midia/icons/view.svg | 9 +++ 14 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 gestaoRaul/clients/templates/viewclient.html create mode 100644 gestaoRaul/templates/static/midia/icons/details.svg create mode 100644 gestaoRaul/templates/static/midia/icons/view.svg diff --git a/gestaoRaul/clients/__pycache__/urls.cpython-313.pyc b/gestaoRaul/clients/__pycache__/urls.cpython-313.pyc index 46cd597762beff79f9bf3f0bfba8a34c7e679bca..d1a44fa7c7c0c4e87518e70c069761fde0e91dec 100644 GIT binary patch delta 194 zcmdnOGL=>RGcPX}0}zOcZ%glCWMFs<;=lk{2FUq*Zld~1tr$inhG4E3mLMURJc179 z4ra4t)@Lo^O6Sq!op>Wkt4gvgGqv0~Co?s#MBgSeuf!@D%=S#NyTyf&^3&v=Y|3cL zRKzeU>85bS_QqiNB(l{WQ5I l*D;z--oco_B?MFj)X7jBF42mqAa61)Ha diff --git a/gestaoRaul/clients/__pycache__/views.cpython-313.pyc b/gestaoRaul/clients/__pycache__/views.cpython-313.pyc index 3d3cef105357e8bd0084a31bd745436c0a0e79a6..0355210fd8ad8f98e92ccba3281f865eb68633a7 100644 GIT binary patch delta 1259 zcmZuwPiWIn7=JHKlQeCbmFb+yTsQZJ=&Yb_P;i1yhf{R2SU0FBv5B?PwelsK=p{XP zP(0`e!n}zmg@MRGJScb(yeJ(W2BG4~gE#-&Jo&z)-HQ0&eedJ<{r~eCsg;cXXq1z5rImw7{3ZGD~0;9E~o0j7j1|b>66$#?t5aRPr9vewy&! z&@*xZgCmi>PHxQQ&`a}(?2WMd+h^nv$OEp$d`ahvZ< zY?E(sIZmfp>Q*B8pn(Yg*Hmd4Y`(dO&SmM$eWj!k0jkS=7n(PrWU zL=(?Gr#@FQHR}38pmjvt+zI(mFsqrPA}hO=PbRu@aw%}|)R=FFEh4z@C{zElVs zYip7pDWT;JU=K)42$+)}DOwI-8+_qvsq9z)7+Q-0X2tA-fKw)HA;cwtQ|M+AJIY8J z4|JfSj0sEx%CL(8Xl)ye)JP+ixI1^hr*^Et$L{vunQADV4=&xiw6657DZNh))Ro@4 zGE|#vs9g`-d+xeAxTX$1Tdb>tb#-iA9bZ$&-`%XM<8`%rx^}V=Pdyy2?;LsEwU)W? zIX+wGXCbwEf}5ajnni;?Mtt71t~k)o*gw+#umW3)`uw?R{XFbMHLTy~ZDY{_T!v=3 zkVYB02#kYj|1C680LyT!W~swWcN@EQk$5tHou*b7_!a6x5Blgtl18%O^86$WFhG-G zJK}>#HWCU3@{a)wp-PZrBpgXBEa-B{4D-WrZH|F`D`z4e&S4Le^m#9ZWt#F%iP@1L zG7X*4z?n_aIGmt(!?<-E`!>R`5$}cAEv6WER_pLSiAP+uwMm)zs%e$&aA&p_Ew+Kx z8DpWGF|9%s45tb<;OF#{&Ca(Bf}IO~G%g5W>i|;>0zM~z(ZW=u!z{)^**XFT8HPF9 mon=OUL@1?S$-XaS?>Dmhi&vA<(l04W=jhK4@2ND#ql>?8YX6@A delta 637 zcmZ1@c1Mu!GcPX}0}%Mwb*5LbPUMqdY@4WV85F~PCH%x1|L%r3=X3Q_?CMVv_D z97y6^NaCDG;@rVpQVc~r>D-z;6OX7&{CtR!eeyO&B}VSaHyM4oxIspO2+qj{OlF(w zSnL_=g+OA$K;jllN@`L`kqD6ai$gy-Co?s#q*#;n7E6GCaL6s@^wg3fcCfPI#In>P z79dlTwTKT$6~T=FYre$>)yoQ$QviV?evm$%5t-n1nOpt>i+qs)P|Q!0ck(YzyUBiB z;<0Q%{w+R;lZy3n^HWlDiXol>M-(WCia_oFo4S$#tRG?@hYe75X-=wLktR?c - {{client.name}} + {{client.name}} R$ {{client.debt}} {{client.contact}} {{client.active}} diff --git a/gestaoRaul/clients/templates/viewclient.html b/gestaoRaul/clients/templates/viewclient.html new file mode 100644 index 0000000..454df85 --- /dev/null +++ b/gestaoRaul/clients/templates/viewclient.html @@ -0,0 +1,61 @@ +{% extends "base.html" %} +{% load static %} +{% load custom_filter_tag %} + + +{% block 'title' %} +Comandas +{% endblock %} + +{% block 'head' %} + +{% endblock %} + +{% block 'body' %} + + +
+

{{client.name}}

+
+ +
+ + + + + + + + + + {% for comanda in comandas %} + + + + + + + + + + {% endfor %} + +
NomeAtendenteData aberturaData fechamentoDetalhesValor
{{comanda.name}}{{comanda.user.first_name}} {{comanda.user.last_name}}{{comanda.dt_open}}{{comanda.dt_close}} + + + + + + + + {{ comanda.id | total }} +
+
+ + + + + +{% endblock %} \ No newline at end of file diff --git a/gestaoRaul/clients/urls.py b/gestaoRaul/clients/urls.py index f363f31..ef9ac40 100644 --- a/gestaoRaul/clients/urls.py +++ b/gestaoRaul/clients/urls.py @@ -7,6 +7,7 @@ urlpatterns = [ path('createClient', views.createClient, name='createClient'), path('editClient', views.editClient, name='editClient'), path('payDebt', views.payDebt, name='payDebt'), + path('viewClient/', views.viewClient, name='viewClient'), diff --git a/gestaoRaul/clients/views.py b/gestaoRaul/clients/views.py index 8e3198b..eace8f2 100644 --- a/gestaoRaul/clients/views.py +++ b/gestaoRaul/clients/views.py @@ -1,6 +1,7 @@ from django.shortcuts import render, redirect from django.contrib.auth.models import User +from comandas.models import Comanda from gestaoRaul.decorators import group_required from clients.models import Client @@ -11,6 +12,13 @@ def clients(request): clients = Client.objects.all() return render(request, 'clients.html', {'clients': clients}) +def viewClient(request,clientId): + id = int(clientId) + print(id) + client = Client.objects.get(id=id) + comandas = Comanda.objects.filter(client = client).filter(status = 'FIADO') + return render(request, 'viewclient.html', {'client': client, 'comandas': comandas}) + @group_required(groupName='Gerente') def createClient(request): diff --git a/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/views.cpython-313.pyc index b702c5af9c754220f8fadee0967a2c4ea29890bc..4b0829c2849577e57a41a4b1c3eda95e0b7cfa59 100644 GIT binary patch delta 2125 zcmZuyO>7%g5Z=wM*N&aFoz!s>JC5D-PcBX9U;0OXQc{{GQIirUP|+Z>@h-`>Ydf9Y zq_k9oLpcCKP+k#86*nZHLI}wcY6SvrT!V@PJW=3QI8o6fs>IA&CpCyC?d-gndHZI* z`Pm3&)vPMcgY8@ZrSxnPAW)+z*uOs8Jb7K5EgrFEHc^xEu%W< zVjmofj>h2XD?`g@tdFHfyP-QL&2;xlg=itRUoON`(g1xM7i0>pGx0*(Ol-GWSeKH{ zs?gJ5nP{-gHptr>D<4AjJFfniNvJ< za{pQ&FpdylLq1?IhDKX!+gr}dY7SYp(w3A*YhUUydGO3S6o^#_49Im(n^q?ib#cQh zD(!0O!~Lq=Mkya;KSeXkdr+8H;5fdxTDDw+tBbA$TsTn=`BLP_f&qw=2h~IQ2v<){ z6sBMhkHAqPA_=0HM4l$Zw_F3uAVg}F2w|8H_;`xTf^=DN0MQ&LJ=KC6Kq3I~fzV4} zVfI#`m_qI2WVXy+k6FFfhTl7RJF)en7jN$U`oOINH@B_y4S$yyz8yKSqMm>p8nRqd zvbHY%fh?kglPD6Mkq^U@#19gASXvKb5gw73FiC`>$m2vHUPwjZl95ZXk;nDSS*Go+ zy8AS$D0}W}65G@E#-<$dJUDEDRq?D+Jzpr3Bnn%>=l%_u{oeKt8;tg_Ly3eU7ZmnQ za0BwmjIv*@sHcYmgjyUCY6V(^qnAbQ-8uc;NWR(PI-nj=G=!{{vIBqgFpi z0dl2My}(1JS1dVI*Gh8D#nxPO8z9E=VDGng4*2~wgNOcG5i!F==PI5tBs{WU7LBIK z@H+de{Q#Rx_9cI7PhT1Txg-1T<+m@hmtG$JUQPVi-p#HjdvREOl? zi}k+oyNU$$@s`&x!fWYgV$|m#t|MaB9;CmJM{>xH=Qr}8>Hh_QYJx}1vqojE+P?^n zD_V)StV%o^MFQJZqj}F;0FC{bNiNebK~ye}*X_;O{&E!qaT~^AtnRA2s*2Dt8nQg< zCvQz7G8$VjE|#$t)}&O0To*%iO-3-WD?M$AI4N7G(bsgX>_$)esWw#jKPmc?h#?2m z-at(wk}A;oSQ35gH&^H&dcWvchv8K;qW*EeMRHG(W%-Vjz9VH>XZ8hsM82;`O`GmD PY4V87u4nhDIkfr*0~_iG delta 2107 zcmZ8iO>7%g5Z;Y<*FWpE9jA8v6UR>4w6fBqziCO;(v&nHIc-v96NH*dVY|B&hxJcq zH!ZCyQi*Z_A=P?9y;cHIkPuR34nLPs z!Wg+9Il><&zeY0S2k~I2>0M^KLEWmFb;tI?l{_OfjCGyrvSe6J?Z#Sq=wy`g$QWXL zF$^M$k_+;n9zropnHy?=VZ!RA>k!9Jp{~_TIEJF6HJfJLV3@r`#h`%aj-oZ9(+AZJ zZMAB20kI@N7M)IzU*y5Xljxdk`Y2a1R$Vh1HXJ~o{mAf@c8s#pe+XFGP2^q(uB#ue6W6Ic(F!>(|CL0y7V)C$wcSPEI?S(fM7FJ!K8-qtl0`)%a2^@MCv@?7^+G3GpbSy@**1-;(}A>1O_*`}eU7w~AM!J7$)}zR6a=F8aONmCjGiBhRMCyj)E#qQdgvop&nR4)JWvc z&NR6oq+`+)Ul&%e4Ul~Gj@3RD4dSx6h!6W8tqgP&%g=+3Q`NF)VSh7vZOQ7y;?&@> zVBugeqIYJ=gT9CuJRA$H(83wPitMrVGg~G~WZOON(RK%c)CA9oNeoq}AjrQN! zdv{-J-;?CXW^&}-$*ttUC&{VJ~;L1bxf8Wxfa> nP#un~{XJ#R0zA+E#^uRhLvPEa?Eu#|`m9glO9YB92zdHmTz%U= diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index 4fa024f..bc8bcb8 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -34,7 +34,7 @@ Detalhes {{comanda.name}} {% endif %} >Fechar Conta - {% if comanda.status == 'PAYING' %} + {% if comanda.status == 'PAYING' or comanda.status == 'FIADO'%} {% else %} @@ -207,9 +207,11 @@ Detalhes {{comanda.name}}
+ {% if comanda.status != 'FIADO' %} + {% endif %}
diff --git a/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-313.pyc b/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-313.pyc index 45dcd7014bb740351fe149a6b095c31581e1b5d8..a6d45795e6be794ee103b4a1a3a49c701e0da86a 100644 GIT binary patch literal 1798 zcma)6&2Jk;6rb7kde>fi($o%teA#K8A}dO0nwm5zP|+kRa@r8BWhtsxinjJ*TvL;vBaaL>SNp5bCJslH;N zl90#?X1-K0%9K@Hvr;V^u9*~wJa1PFt6&hcg6%>r?{;M7wqmSTOv`nMsdZ(kapZ+vo;P^S!J_cD}!Q6>G3sW855^~IoQ>LpGb6#$N#v+{}EpSRf#jKDK zW})TF@p>`)nJdF*t`zA?DTh4U|6b|Ku$BI-KLS4L1;CP5XS8!(l*cx=}uKG%3)I4ae}yF~8J&*@pm z#EyRXYHDig%Ixg)wJZ99ov(3J>za0Rab7Q)j%(POQ7h}6b2z%!AFfe!^nA^6?aEsF zZfjIESzRX~Ph^dOV{~T*Rp)m))WJaj)o$hHnqZ@EfiT)%%m77XzD|93R)c21cgrnOZev_^*zK9HL$a_loyV$p}R_~=I{gg{v z5_O9X{-vJV?)$NSC-TEkvv+Lg^IbJrU)T$u-_)Pz%}}zwxEH1l+w#Wy4d0u`^ge(D zinM4|mdbnwR7?$6>+;rLp$uz%jcHGjcGC7;Ll$P>EYui`PLcN|Ju$;o@;T!u$fC8qONG;kT(gM1SWZ9cXpbo`=^r zuea3UraHVc*HDKW>SRkzHPzIvI@9pY;5hYLP9h=~+D|4&J@FUr8&=WA?AoNq!^&jE zE|_J9_e8r3da9jg(=+jQkZ+gnVFRxd1)D{B1KK9+J{&sygwFuqw|#o$JsP%FHb21c zP$%|=IypKViV(t=V32-)gXxzbaiB(8>fj&h;I2AcR}Ns{>)2PZ?P5LFfFnmj4}9xb d1VZePafb;Y1iAS$X1;JFKzNOrFLI7={x8#*dD;K~ delta 760 zcmZuu&ubG=5T5tm{z%epTD3LSnjgeKS*VJXf(7*;2$EtCyQ~PUl$dN|YO)*OCLZ*V zc&T`6S?bNBf`38(356czp-@kvr%3(*=RFc4)qx$pnfc~>vom|?<79ehSt&q!ceGcZ zq6g^h@*OB-^7ZrItsY4WjHgF${4xK)z*ls zUz{)#|1gV+?HY<|{zXmJ6L#{atRDPYinHWWPeaV`8-74{2p$AvlOR;)k<}3n=q4R! z9ocir9P?BHLyx*-jRef4f#$JuaBmSH&>!A)5)*E34F9){D;73r_p<;~fE#3AT$pVh*1FY>(A&IG z^^vSUuUu<(eL)*Fks7IOBSz&Q>b62|C?VC?2_qTBpV_nQc?9x*qX+2vaFR^-?|eNo zx9`N6emQ=rEwC@sR{TlJk&}2@e={q&HWNmjhuwC>t@ypZG(V3?k$h5#wpE(vFg_c9 z*O!+wh&Jq$FlxJ%pdNC09x*eTFS^Jq7~vtPOLeNxR%-|!1o1%SF#I+NQAeOheukb(A z$Bwg4*hlOD%TIMx?+JJ)@8r7{-z(XLlD%89ckGkj;Qq!29)7}Iq*6`y)bTHo57M)wHbMZdJf)$Z-ukAP)*he_0WOVEajWxTu(BUO%DZM zOOFmGtlb2yident@vxu(T6K{$a2W`F#CfdnPGI!FCCBli3P z;jxqY^HGj=5XY^hk&FB3DuMG-O#Dv9Re?s_j5&*|rd#pcqexl7Uero__)?IvmvOD- z>7^sY`>D03mqshRm%Qh_UwEhObG>vF+pSyaVNA%3{X-v}A41H>L>0pk1H<03GPNkxA(?{uIiKCEnQ(BipQ5?jQspV152{0M$CvNs!?5w z=?_JmYgc7cQ^c5IsG2%felk1L*=&OPR(HnR*R8H~Ak`*}dB3%M2Wt#HsFvJCIJlB} ze}j~iO00w1*ioP2cM8!Gr_kCx$U+sAtX#9MdsVx&emgUmPe!fQbej2_qGm)9jfk$t zBI}#o@xz@ZSMRd0e%#I)a}QcNyLWWztUn^g93G0)GmuJAR_eMo;1)MOg}bDfN<=gi zRo1k}pfocQ6P1{57_su7Ff=suKc3X!&hJMUS(^sfFO|MiNQXQ=~Fw z&F^5lDywRcT4wFH#s*o-{Ve;`AWIw(7CDca3bzrQh4sR1=gnRhmb|_n@d%dUZbv@q zBR`WXNV7e;wJbs3W3xw1*$^dFmNesyLarp}O-~AXMSC{bmr9Q$pHyA>_9CJtYqAmB eSa`pL(eo(A^l2IhKUK8uHJD0F)S{ZE$NmGS#E0Mj delta 872 zcmYk3|8G-O6u|Gd_V&GP?{wH^8yn?i6%!+CUcbDpt>9R2E*L|*K~zk{bz8f34%W$p zgqW;IbU%<7W|=3buwsHyLV^Ugiy>n6ACUdzPa+9F7*SLF0e`4L-)l56Ik`Ex=W{;i z=AKF|P^kpYc6+7>A=zbf&`Bbb^!n7+2&0W^B~qr<(~lzRQG{+eC1^ujRPr18C$EnB zYgoBSh5F(qo#^iL!KNc1Noc@hsKYPt0DgoYU{m#E`8uf0d(^U8KPO%zDB&c0YrLrp zKg$@w-CU9#+O{D%JX<W{^58)KN2PfbiI08kOgu`$M4nhXj;2NB{5j7v`D)l^j!aMt{q!}GZ z+o^PHAd*PM2dvaf`Pot##}?TxJTu6)3c(4*uLs$_W~LqwGTT~tj)rfvmj$@o3zXpU zBI~3?U0GyrnB4NLqO7qTmTN44l^PSuIqr)4=9bYwS!ZuCkXWv}n!2m;^W%o+b>j4^#uKJdhr7EX`N&F^C)VEQ zBZee2+4d?S>aM{PZuu{iem;Tob@tT%9NwnmHD!E91zk6}*hAaUGtQ6U$#LGVZjJMI zskZLD=Kach$@{6=Il-4H<4k=&$?q||_$3XijRN1R@ifh&Ec4^lG5^mhKhJBwbGc-o zZ(Q^~tw*(nc3QvP8f=->?&yDOqjITrL*DlN=39dc@>kyhUyrkll*FZJv68UEIvFB6 z2qi%+X2tA2E7liHx&IPRq!V@|-k-Dwk|*-B3v)-!BXbK2IX#2fqDTpCJK2es=0pd| zqJXwcwtu^;3OlMU+$f6fuBpOwGYW-*$POLaw|~S6xkxvjEs6m4ltfF%zl_LahxhBN zB<57zx8TRqBHX;h(USP7CBDUN+}3pOnh{~i_P&xiF#IAGW<-^>wqs*P% + + + + + view-list-line + + + + + + + + \ No newline at end of file diff --git a/gestaoRaul/templates/static/midia/icons/view.svg b/gestaoRaul/templates/static/midia/icons/view.svg new file mode 100644 index 0000000..2bb3f2d --- /dev/null +++ b/gestaoRaul/templates/static/midia/icons/view.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file