From 2bb17b6e771b26ed9bf5fc102b4f91d1c809a238 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Fri, 20 Dec 2024 16:47:45 -0300 Subject: [PATCH] feat: pagamento --- .../__pycache__/htmx_views.cpython-313.pyc | Bin 2397 -> 3630 bytes .../comandas/__pycache__/urls.cpython-313.pyc | Bin 1063 -> 1276 bytes gestaoRaul/comandas/htmx_views.py | 31 ++++++++-- .../comandas/templates/viewcomanda.html | 43 ++++++++++++-- gestaoRaul/comandas/urls.py | 2 + gestaoRaul/db.sqlite3 | Bin 192512 -> 204800 bytes .../__pycache__/settings.cpython-313.pyc | Bin 3209 -> 3219 bytes gestaoRaul/gestaoRaul/settings.py | 1 + .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 165 bytes .../__pycache__/admin.cpython-313.pyc | Bin 0 -> 209 bytes .../payments/__pycache__/apps.cpython-313.pyc | Bin 0 -> 533 bytes .../__pycache__/models.cpython-313.pyc | Bin 0 -> 1458 bytes .../payments/migrations/0001_initial.py | 30 ++++++++++ .../__pycache__/0001_initial.cpython-313.pyc | Bin 0 -> 1876 bytes .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 176 bytes .../static/comandas/js/viewcomanda.js | 55 ++++++++++++++++++ 16 files changed, 153 insertions(+), 9 deletions(-) create mode 100644 gestaoRaul/payments/__pycache__/__init__.cpython-313.pyc create mode 100644 gestaoRaul/payments/__pycache__/admin.cpython-313.pyc create mode 100644 gestaoRaul/payments/__pycache__/apps.cpython-313.pyc create mode 100644 gestaoRaul/payments/__pycache__/models.cpython-313.pyc create mode 100644 gestaoRaul/payments/migrations/0001_initial.py create mode 100644 gestaoRaul/payments/migrations/__pycache__/0001_initial.cpython-313.pyc create mode 100644 gestaoRaul/payments/migrations/__pycache__/__init__.cpython-313.pyc diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-313.pyc index 89427d4be4812b225a9a72253d8150cc16710240..599eb8089f55e816e3a30c486c5ba1ceb1caf4b4 100644 GIT binary patch delta 1673 zcmZux&u<%55Z>qgX~$m2c8Z*-k;~ll*Dkyyuy3XTEv+ z@ds)BFcJv~xMDwA%PhF1ry36Kz7Pz-U`3(8fE5A|D2O0t$QLL|1sUXm0t(-YMYW)T z#%-w>EQBD$ZMoQ22tyccWk`UCp(5&rh8Q)1i2X(gF=q53#+SqS$Ri?=7ky;}tXjna zUjwVM0#>>1hcDIZ&b;M1cFnc6Zl6r%nXk>68&#`TchOd_Y&aI~zug&OO!IzXV^JN0 z`KkkUWvyI?h^GYJm!CpkaHkrWVodk$iyt&px+J;gx&<*bAx}I&hKfoe5GQoT6K$)g)E(MstP2$rjndGPM#xHa00ikg79BL z17KC{b*sziLibai#ak)wSLFsvdhe=(fmOj9md|_NsS}N5>`ng7F!NAw+T9-%2b)Q{bc6NTdBwP!kd?k z>5IN}d2YG{&tn3Zq*VW-69LP1tXhxHOL*ZKy7UUd6Zz<;nlpQbx7jB%hcB1qK;DDL&r@;+8iC+So&q?)`SCWK2^#hSAC)_mBDv4r=xobnoCXppqa*W#6hfFT>oS*fNj zsPhT$zC0XL7o=4_;B;j{;@)&)iJ0+aXlJl)v~no9(j(gNF2j)~KT6eC96M97GLE@y z($v|Rs{Nr^vGbBIubZoD7H_bx)o~E7I_8GoSFzkOtT^=*y9O^}NMGwti<=Kas6k2i z%yD6JopW__J<$kuR2?KMLoh)gA>_5kvhw>VVfQ8I2%dz-XOXMk4<0dgH9SG}@zv;P zP)DltIlZpGj#pm5pZg^Oc0E3LcXDfTH$K*mk9{3$#m8Fl@n-R%p5E1SZ9TWEkGJ*l zZwf7ayroYyXP%&1u99%1IsIE==%%`-MedGnjqb+0-=%1(KXq^IhrZS#wENxW?4A_a zEL|`CA`N(-Xla%DQ_3g22U@xTGH(26uYeO(8^_=6%pR4_@4ZNF?})w?z1=6W=cQ`; zdbeafCusxdX@ndBJpe${2s8pf6*0F3F62(lwAV2G+NyOPF5(%fh0n-8B4g|i;apod o_m^;bUpTQZixfSn@F5$1*(fzba~qrT_o{ delta 825 zcmYjPO=}ZT6rDF8ZzkU{Ch13N8;L~*G$2w}Vh|VF1Y%)U;zH7yM_NfT<-SR_>Bfz_ zGWa9hh}fMwe}I2rq+}`Xq;Vw(-uos+-{NrYy>IS4_q_SAbx|oU3x%wPXZBVM|5#_m z_4zZ5-f5oZv7Xjtz`8orQ+Ak~UYzGxk`@ZfUOBhZY72KY09NzyCCGR+dPYgN22ED$@2Bm3&Yox|fXP{jr%|zX)>byS+rC7am4enr#mX!|>PPJcLE7jvK`C42qG@7(Q z-_0lG;PqfK4BPT3gvg&pQkey2d{C&(l^*rvR}U!L;}GqYVB_~dzlVA*WsMs6UIS{K y3UVIe?deE7f_s=F59BVwPlGYG(C&WM?q6uFOKz|kyUf~zRl;S3vnIAdgZ~2TkFaV0 diff --git a/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/urls.cpython-313.pyc index f0e50d34efc8bad5d07e4eaac2b74f3be690c1ef..f9dd458681a6ed2d007aa5965d2dc98d115334b9 100644 GIT binary patch delta 297 zcmZ3^@rP6WGcPX}0}x!>o0`tV!octt#DM{BDC2X^Ms;b%uoy-qhG3Bx<{&AU0t6i_ z8q99V3|1iqR3U?qfw6+cK`QjwiuhwVV)%7=85oK<(j_z{H-|9#F>+MN6{Y4Eq~=Yo zVUiT*g|MCTa})DY607735-W34^GZN+LVQpTRMJmVVDeI?NcJKDpgl!`lYcX1a!CT2 zj6hs`V{#tze8-zC92Yn>S6E%wcD|_Xd_w;sOB7g0YlYW!9oLIGt`~e_F0#aa;O7uw Zy1*dtL4<*k=K{a{MF#ms?jmuZIRF=~MC||o delta 126 zcmeyvxtv4&GcPX}0}zyTrKYp})^QAs;vxzWWU=a8qz`)3JfnWY2 MgM1@*ktk3B0NoB4x&QzG diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py index 6aa19c7..f017cf7 100644 --- a/gestaoRaul/comandas/htmx_views.py +++ b/gestaoRaul/comandas/htmx_views.py @@ -1,7 +1,9 @@ -from django.shortcuts import render, redirect +from django.shortcuts import render, redirect, HttpResponse from comandas.models import Comanda, ProductComanda from products.models import Product +from payments.models import Payments +from typePay.models import TypePay def listProduct(request, comanda_id): @@ -29,9 +31,30 @@ def removeProductComanda(request, productComanda_id): return render(request, "htmx_components/htmx_list_products_in_comanda.html",{'consumo': consumo, 'total': total}) def closeComanda(request, comanda_id): - # id = request.POST.get('id-comanda') - # comanda_id = int(id) comanda = Comanda.objects.get(id=comanda_id) comanda.status = "PAYING" comanda.save() - return redirect('comandas') \ No newline at end of file + # return redirect('back') + + +def reopenComanda(request, comanda_id): + comanda = Comanda.objects.get(id=comanda_id) + if comanda.status == 'CLOSED': + pass + else: + comanda.status = "OPEN" + comanda.save() + # return redirect('back') + +def paymentComanda(request, comanda_id): + typePayment = TypePay.objects.get(id=1) + consumo = ProductComanda.objects.filter(comanda=comanda_id) + comanda = Comanda.objects.get(id=comanda_id) + total = 0 + for produto in consumo: + total += produto.product.price + pagamento = Payments(value=total, comanda=comanda, type_pay=typePayment,description='tipo de pagamento mokado') + pagamento.save() + comanda.status = 'CLOSED' + comanda.save() + return redirect('comandas') diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index 45a0bd4..194b22a 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -27,23 +27,34 @@ Detalhes {{comanda.name}} {% endif %} >Adicionar Produto - - - + + + -
Nome: {{comanda.name}} | Mesa: {{comanda.mesa}} @@ -63,7 +74,11 @@ Detalhes {{comanda.name}} {{item.product.name}} R$ {{item.product.price}} - + @@ -124,6 +139,24 @@ Detalhes {{comanda.name}} + + diff --git a/gestaoRaul/comandas/urls.py b/gestaoRaul/comandas/urls.py index 3501964..9bf1eec 100644 --- a/gestaoRaul/comandas/urls.py +++ b/gestaoRaul/comandas/urls.py @@ -20,6 +20,8 @@ htmx_urlpatterns = [ path('addProduct//', htmx_views.addProduct, name='addProduct'), path('removeProductComanda/', htmx_views.removeProductComanda, name='removeProductComanda'), path('closeComanda/', htmx_views.closeComanda, name='closeComanda'), + path('reopenComanda/', htmx_views.reopenComanda, name='reopenComanda'), + path('paymentComanda/', htmx_views.paymentComanda, name='paymentComanda'), ] urlpatterns += htmx_urlpatterns \ No newline at end of file diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 710ba1ea68c0ecaa74fcd851b48e463228cefdf1..71ce1282f02fc4cff72f6bc9b97e8152f0bc9019 100644 GIT binary patch delta 3022 zcma);4{Q_H9mn52pM7`Oem@8aAt@ooG(eWdzCXV6otfhp#{{G*1nAawV+~I1K-B!( z2x;m5B+;r?BAQBPiJKVfKTQKoQ%B{dS)nUoTDNu8fK{1RHZ8!0CzncjhY*;lJeOJva}g(Hd*QN(~Q8LAS_U0+$rt@e`h z4)`f8neNO$ zW|l6Wx~tUk%8tFM-aWIG`BYKqSE;hPrk6vP;Z@7>1ytTLUTddE8}Pa%`7|s? zLGzg?uJs0)dS<4!P-c!qv2Vq;)?^EuMI|%5Gu6zi4OntFc`UI-QDNTf!RkyIkFqJRW+qLiz7$90wmQ;>eOzn&@vSY*&2KegrnQ!~E~8ekgFNeb!u@U6Iaj%}%`?qT z2w8rb-@~rKYnW%z6%>ClUOqJ9+rpJU9%M$6UA^hd(}gi8&cL>T1O4{AZR<+6X-a20 z)t=JksN}?sWc-n&Z);0a@-d%(PW!wre&4p1p?So9-v<9ZRsFRiRn1)aqm(he0AojA zPpUVavJk_nrWjgh#~cJ{Uc{k&cY8XIi-ouV;axQatlZ3%e})1^7Xs|=qWh%9XJj

#JtGXGKN8+0v zPR`T+Y}})g!BqGDjNg~ebaeHky3H59gDcFPy-XSRkk6k^4P?v{38vgU_D%eRdHOJJ zH-B^luQ03InNoA=2v(We@r_x$nSJY9ILnStAH^<*&r4@6@4bfTmhlwGbes4g`4Xx3 zUW51Hr|@sMLznz7yh90|M_iOH6`?V<_P0x-{oftv>hGf*beG(dvff91zMj4(Q|Z3q zdZuqCBN9?0k`a*Pu&nBy1XncK^33Jt*Gs>=I1|Mfipb%BD$0gtxHh_Y#M>x~`?qXF zWFsIdT38mjgtLes57V9_v?vo=Uyq1Vz)&D9XBSI5shP6G3R)wBhzo zUf5MTzscJB$5o_5s|8eDmles&twK@Pq{*GYtIhQ%@OA=kbI)@fT+H=}Ytl7IU-GT4 zA%DhYZMDq3^FyCGxoB3G6esql=hH}XMAZU%$S}exkNNk}T5BH8_Q`AHkQ~w!-rqjg z=5yglNRP;JKng3mp$n`(HCL3^NC8z6MO7A@{@n{{=xIyQB~23?{x6un9>*)k-=o37 zd}Vy!!MH~5G)U56|1A#FYhn=Ky?Z$%epMb35> YoYpQlu@K zn9xSi2r)vY=2oMnMq>#Q1xK9}(AEb(@KIakhhkjNA8i1^KP@Izqj#n@B*sk6H)pEGUc$yXWxoGN)imTj|NRA(R%ouIP%l!iWTpxr{4W zekIq#rX{?LTktgY;6Z!^k75$T>@W1QY4(*72_IuQc%DRP$F{xA&8@p0Yw2if*|Xqy z^y$(v`jGAqb<(JQFtmYc`uR}s*2QU}xW;A)UdJ!-0)E71u^NMjIE3v+Zuk>+cqq%5 ztwJhAT})T1cNh)cLB(JjZYWaJozj*19iqt&w~=Zp?vkSHYh9VJn9YnIN`Y)lrdIx( ztFak^*YF4Y0?*(PJb>N!Fg9Wwmmy;_M*5a-nK?5~wU#9~NjzE)(R%Q8vCVbpV^iz{ z*2@}Lwsut;7Q**xa)_#gk5oYkK2TG;eziv>3Gq;p!CT^RJD-lhBkmQd#by&#u=Ozr zU|oH(cBRWA3+&YAtDx8>LyAS_*yOKwLcVNe@}f9I_@Wqu+@rNzLG6RS>Y_A65gcFHri3CRGw_WY4&NcSjwU9TE9S&zy8YUGCCdM5?5p ziE-A^5|1u9eXCZ{{daY>Y~8udKElq&ceQo5cI|2Y*Re^S{TeLUv=CSNz-KLcZvD+= z|2_Hty$*$I8k32Q$-u_M>bsMHd^^XSd>Mk&%vMi?1&WqaUGJd@uG7A<8)YPs`-XF-nxtFKYoe8H% zCd8b36`WGQ_UEBQyp{^P4Zp*2Jcpm-pLoMa?|c*a_=`}M?vN-2kR(;rT<1u+@-|ma zKrVfX7oLDd&`yb2Mij{3%qLCAGS3Q-=n*q@3I?g1m+d5G?-`f^z!AQE6dJ6S3;DYy zWTxFwT3!*Zh?aRI{?jNFIqFC`JIa+YsLt7qkFr15Ec*>>a1F-rS?tBVIEZuXdvoU) z2-Y@|fS-2hd;Z^oNyT*ROt@t3WWoI#h5uR=^*+sh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABz4Qh*(xTqIJKxa z#=ykX(9p=z(%8Z%#w92KczG$)vkyYXeh|iVi4maGb1Bo5i^hl0I$I(-2eap literal 0 HcmV?d00001 diff --git a/gestaoRaul/payments/__pycache__/admin.cpython-313.pyc b/gestaoRaul/payments/__pycache__/admin.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..14089d92e1dd334bb2ee854e474d21a25d56b4d3 GIT binary patch literal 209 zcmey&%ge<81Z7>R=}tiUF^B^LOi;#W0U%>4Loh=yqc?*WV-ceQLpqZt^GlGlCgUyE z#FX63JU>mQTYM>5iFxVyddc~DB}JJ@Ma)12D;Yk6)ZKD)wu%WYPAw{qF)%STG&Hib zG`28`ami0E%}vcKDUJyWa&mQ!Nlz^aAehnfhdgrJ^UD2Uu(Aq))T?cB1mx4X{F3TGQg zVU@q-B_r5pp$Dm#xM__jkB7B1Pj}1mvDZ$_~fJa0S z!Dr|cOT2~_(FP*UG9oU;J8qFDozU|uZ#M9;`EZbBtu*OIVW*%AkIP`N0^ku*Br!qK zAy~S^ksfhng?O?WR{W}&y5RkuNVF>Iym=tGUkz?}5~hvdy3tDm5v#^w6dvR{J&8md zm|9k9p3%8KW@?NjyeAkl literal 0 HcmV?d00001 diff --git a/gestaoRaul/payments/__pycache__/models.cpython-313.pyc b/gestaoRaul/payments/__pycache__/models.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fe8c717cd834ace010a53d38578a183e2bacc8f7 GIT binary patch literal 1458 zcmaJ>zi-<{6h2ZvNXiuHD0XbCMXbn00U?0Vs7X*2g^^me8(6Ixh)O5I2Zp>TY$;MX zQf?Jw&{Q-9iYyJ#(WARLQ_`vbLZw9l0Z*O06;Ly`??}mRkhmP4zIWffckg}oPLpgl zgW%i$k+gp15&DxkvoAFTlRW^>kcKp_hITp16&U7g{BD9KBAlotcT+SK;bbknD^Q_; zmQfLDsXWrsI@g$=B|ZDSk%%#sT0%)YVNQt)({0Zpjt@v^_B!N_(POacwGG!Y7+-a4 z;s)kf9)!|UXL5^Uh3bfM8lt?$(S)9CL=FCTJ7R_LTB5?yH1Nvn9P@xrYAG#U;i(8a za&OzAXMnl%CZh=uC7&CW{hui1+$dG!&xsQ&2|5p4@y$x03rWjBmpS0ye=E;xbHFcX zavsq|ElV%8l#&{Xpn4lb_D=+eYJ%!>9cs4?+QZ+F-U$=*1cn8b_%PEpzQdN?vI9R< zEMmeg2X`F9B2@85sx0^)7R<%L4slz-1Mp;{8+h3DzQu-RnQ)V* zAH!@|CV4Q=&|TCxrOv>6kg*PFQu~I}B><8>aqjypwh(SsKi2R1g!=ji*Kb_AR<2Y& z{HUyNd1g22Q*Sgjx2t-K_<`XyjIN`1rV8lsIIeekp@6X;P>jR*nLO*$l?!l&FN5i$ zv3l|8qbHC45LYIwv|mxZv=oXMyGENpXa-|Q*mW3|F@D%JoGGJXeBY*i;Mgv4J&Y-9 zIFvpGO?GVJSRrp)p}Z9<9Ienrwj;CSQDV2;8tKs_TM+IvzHDw+o1qxM`@zr%We+(N z%=isa_FBTU89k#=sy;Aie88MVe3ROp!1mlQyJZBVX}3wti59p4xOACCFS5psz&5cF z1k}FQ4TujVzXKd)cSM(%5od-?k^d8z@6lLNN7BkrS~;)=($)UvSk8^))uFt4Sbk{? zq)zwiCFH^_e8-x=qYN4erKS3EQaxpKc2!nO6SzjA&%UieZ#mXy8J-F!gcmQH;)v1R5Y&B9=iM2dkj08@7!T!f$4PMtJ6hDb) uV1t(7a5kX+6)=A#IF36;?;fM#F-O9ZNvRDG_1F^7?##~HnVmPYtJC4( zBm>|5A8`F3!Z5%1O8<-YgwqWWzGY-aX15r^!pv=Pn>^t+BP6oGOfzQ~na?qDq{d5u zx4wgLzQl(!iPqUd^w?K!7C4%0=yjqvx@Fo_XjmFHY&8Ui<48|AEpmSJS`e9VGD~=w zBavl@xy_PjO_0)WZVP2NQACc`;?n3q8z&2LOyn+davU(@12G9XDGvph6ksL?Vut0k z$by#Y?>;SN-Ib=bw^hW zFvL}>p_rOtQ!tb+pq`3sM{!yo4tDeghV_)vax7$8Um-=)s1T;TpYEk!4Cew* zBWBAmXu>iPTtDn!$~hLW6q2!@>9bPo2?dViAu#dVmB#(7QB!H}kM!~{`ZFv*A`w$* zU@AP&v7y=D!+js8afJLuglG~WxbH2)ms1EmY$-<1GJ?S5O z>veMrY9nZ0C}!QFoVE*W`h)=0GWT+-)%YAMu@xz zr#OWlL*?p~+GkK}yH>h*X=P91MO-+dRuK-!QM!qfb8hEfN_Qo_uKg!O&&Q3giMnfT$y|l~ z2cLWSm2Q6J&~fu?oy_`CcIM!+H+#N2d;Zzt%dY^D3%aQ9FB& z-Pv|0vwxJ$9c*}WOWnDpL*Yf@dBQ7SbIaGf^0r&v_R4qM@}188raSkrlOere#csZM zIQe4c`HUxCcg5?TD7m8KiFaM`ZU;5pypKH@iI1m$jSeM}C;afJ@bxCS+-IdA(3!A= zMQyhj{-qTAbtEOfEQ!DEK@SCO6VmFJE_C&Q4~%~pw&+LX3aG#|W4{B#3D2_Zslc%B Z{>;4pyD-HHPm^9|(akLW!GIDt_zR)5(|7;? literal 0 HcmV?d00001 diff --git a/gestaoRaul/payments/migrations/__pycache__/__init__.cpython-313.pyc b/gestaoRaul/payments/migrations/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a6e8988f482e40e77af0b0dc4a0cee4ff49c4712 GIT binary patch literal 176 zcmey&%ge<81Z7>R=^*+sh=2h`DC08=kTI1Zok5e)ZzV$!6Oi{ABz4Q**(xTqIJKxa z#=ykX(9p=z(%8Z%#w9 + td, th { + + border-collapse: collapse; + padding-top: 15px; + margin: 15px; + text-align: center; + font-size: 18px;} + `; + const agora = new Date(); + var dateString = agora.getDay() + '/' + agora.getMonth() + '/' + agora.getFullYear() + ' - ' + agora.getHours() + ':' + agora.getMinutes()+' - Raul Rock Bar & Café'; + + if (element) { + var content = element.innerHTML; + // console.log(content); + content = content.replace(/]*>(?:(?!<\/button>)[\s\S])*<\/button>/gi,''); + content = content.replace(/]*>(?:(?!<\/th>)[\s\S])*<\/th>/gi,''); + // content = content.replace(/<\/tr>/g,''+dateString+''); + console.log(content); + + var printWindow = window.open('', '_blank'); + printWindow.document.write(''+content+'
'+style); + printWindow.document.close(); + printWindow.print(); + printWindow.close(); + } else { + console.error(`Element with ID not found`); + } + } + +function reloadPage(){ + setTimeout(function() { + location.reload();}, 100); +} + +function backPage() { + setTimeout(function() { + history.back();}, 100); + setTimeout(function() { + location.reload();}, 100); +} + + + document.getElementById('openModal').addEventListener('click', openModal);