From 5c1188ecdea56283b3644b45a5134b1a6667cf79 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Fri, 10 Jan 2025 20:42:14 -0300 Subject: [PATCH] =?UTF-8?q?feat:=20mudan=C3=A7a=20de=20etapa=20do=20pedido?= =?UTF-8?q?=20da=20cozinha?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/admin.cpython-310.pyc | Bin 204 -> 280 bytes .../clients/__pycache__/admin.cpython-310.pyc | Bin 201 -> 270 bytes .../__pycache__/admin.cpython-310.pyc | Bin 202 -> 312 bytes .../__pycache__/htmx_views.cpython-310.pyc | Bin 2330 -> 2565 bytes gestaoRaul/comandas/htmx_views.py | 7 ++ gestaoRaul/db.sqlite3 | Bin 262144 -> 262144 bytes .../__pycache__/settings.cpython-310.pyc | Bin 2693 -> 2701 bytes .../__pycache__/urls.cpython-310.pyc | Bin 1266 -> 1303 bytes gestaoRaul/home/templates/home.html | 2 +- .../mesas/__pycache__/admin.cpython-310.pyc | Bin 610 -> 264 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 153 bytes .../orders/__pycache__/admin.cpython-310.pyc | Bin 0 -> 267 bytes .../orders/__pycache__/apps.cpython-310.pyc | Bin 0 -> 432 bytes .../orders/__pycache__/models.cpython-310.pyc | Bin 0 -> 1058 bytes .../orders/__pycache__/urls.cpython-310.pyc | Bin 0 -> 469 bytes .../orders/__pycache__/views.cpython-310.pyc | Bin 0 -> 1241 bytes .../__pycache__/0001_initial.cpython-310.pyc | Bin 0 -> 1143 bytes .../0002_order_productcomanda.cpython-310.pyc | Bin 0 -> 783 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 164 bytes gestaoRaul/orders/templates/orders.html | 21 ++-- gestaoRaul/orders/urls.py | 3 + gestaoRaul/orders/views.py | 33 +++++- .../__pycache__/admin.cpython-310.pyc | Bin 196 -> 274 bytes .../__pycache__/models.cpython-310.pyc | Bin 1003 -> 1011 bytes .../__pycache__/admin.cpython-310.pyc | Bin 202 -> 273 bytes .../__pycache__/models.cpython-310.pyc | Bin 989 -> 1012 bytes .../0003_product_cuisine.cpython-310.pyc | Bin 0 -> 613 bytes .../orders/htmx_list_orders.html | 99 ++++++++++++++++++ .../typePay/__pycache__/admin.cpython-310.pyc | Bin 201 -> 271 bytes 29 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 gestaoRaul/orders/__pycache__/__init__.cpython-310.pyc create mode 100644 gestaoRaul/orders/__pycache__/admin.cpython-310.pyc create mode 100644 gestaoRaul/orders/__pycache__/apps.cpython-310.pyc create mode 100644 gestaoRaul/orders/__pycache__/models.cpython-310.pyc create mode 100644 gestaoRaul/orders/__pycache__/urls.cpython-310.pyc create mode 100644 gestaoRaul/orders/__pycache__/views.cpython-310.pyc create mode 100644 gestaoRaul/orders/migrations/__pycache__/0001_initial.cpython-310.pyc create mode 100644 gestaoRaul/orders/migrations/__pycache__/0002_order_productcomanda.cpython-310.pyc create mode 100644 gestaoRaul/orders/migrations/__pycache__/__init__.cpython-310.pyc create mode 100644 gestaoRaul/products/migrations/__pycache__/0003_product_cuisine.cpython-310.pyc create mode 100644 gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html diff --git a/gestaoRaul/categories/__pycache__/admin.cpython-310.pyc b/gestaoRaul/categories/__pycache__/admin.cpython-310.pyc index 069680224ed48d8dcb310b98dd19637ec7244157..c93574dba0f7c0271863a87cfbf537f1cf659835 100644 GIT binary patch literal 280 zcmYjLu};G<5Vhm9R8@=MFUXP)s0u;^R)!#!$cu?jmMc3(K1Ya=jn9CQ-(mF1#4j*$ z=}>smy?b|hx_4o{UNXYx>x)6^U(@g(f`&^fJR{OfbH_aIIG=Rk3NJdr8Sq{CHUsfK z?Zq9d%5QSBiszZq-VP*|jY?obw1BtOygSxAHJDKMVMx(F#DeVkv_E)iA2c|OQ+zJb zCdi8j#$tl_!Qv6E_w;k#Y~(#cMEL|R1$iC%(Zi5Xw(ZqTBMo3up;e=kf7j*ytNQUd UFSZmkI=J9;5$8lJwkl4g`kg2xr%=}sUT#6bp3K#l_t7YhK16owSW9EM!RC`Lwx6sBMXP3D(CQ3g%M zTdavGxtV!>noLoADOrhm>G^ue`FSNpnMp+;16DE=F#{_H`JuGVuyb zoTCn$bl-jVqwhPnT;4E>ulI9zp!yw~{~@T^QsNzfVu~APdChs`iAk)e1!usI>BkJj zXPk>Y%hMmaW;q{cjk3BYl9fh7AD;58Ua4c#cdlq%AH06?37yufcG_cModSbC`i?2; z0OQ<4r!j!PFrU$Qg5Pzymd^+t>k?m5X})LgJdax4A-g`kf-M!{=}tiUF^Gc(44TX@fuanW zjJH@5Q*tx&{4|-O_)@YG^V0M6lJoOQiZYXmKnAR2C}IXuVB(j9vsFxJacWUV+0yn J46;Cg0RV_yGZFv* diff --git a/gestaoRaul/comandas/__pycache__/admin.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/admin.cpython-310.pyc index 84b1566d7d34d4543e0985b2bcf81c918efa6183..40945851e1ae2d765c8bab7990d0959eca820ef7 100644 GIT binary patch literal 312 zcmYjLu};G<5VakbM5rzOjVzffKnM|75en)Od2!=Yl**2g?Fccl@fl_0cNo1g@e53x zp-4RG-o2;OyF0sB923O*%X7cS{*laoWN0q2{2ECSMKv+Br8H@#naSGB@Rm~obT``{ zLH3HXgXT%A?4FeT6Vs%maVC`+#*)RnwnmOh#^s%}YU;wl-g`kg1r^t=}tiUF^Gc(44TX@fuanW zjJH@5Q*tx&{4|-O_)@YG^V0M6lJoOQiZYXmKnAR2C}IXuVB(jfvsFxJacWU%|7~ff)D-#e}Q<;B-@s{A>YiL+nn>All?OEVZ;rJMO%U2x9ztZ-0rz2 z$ot;p{dtAcrn6bB7Ky@5&fY6kms{M1b$}PR18a#FxeMzcAK)cehxi~Lf_0b=uPWt{ z-jD0lSP|S8KYwY2n8|N4JK?}Zso53*->OB`g4b+TvVABDs3PqhMI26UsgH=Ad{jrf zM?qTC0Qx`7mBPCKZ}=G?QerhGoNTKdE!Mt~?+Q^OwV^e1kgD6Hqeq53sq$n*G}asD zJ3tk=%#U9a;UlB#w7I91AeYS;OCE!gy0+>`s8oqL zP+?!T#W2c85oDGF{VemGq>C7regU>oJUNTT6DY}A7zN@miXUhNmR=y2K$Ora|5Ndn}pJ*SZ32#TWuXIE`=yplr#q_th#Zl9^HNH~q-Za=m~a zvN$S>O9%Hc2}A<_ViIk3>kt?5DAT7|5lP7y9mT6dWYv`k@1{GG{4q`@>&E#y=31qd z`LzejOFM=ne=on3hLIO-h2k7o?PwX%$gyPeAZ1Ri8H7GI8&aGCs}Q^95=tB*X5q%w z6}&B_3lCRT?=7bKO6A_NxQyYhA{^*IQTRdIZ{_jOEW}R+>DLKWA?952iGHOS+sRdP zii{_odAxfKtln6c^6rOaM_3qsZ^Cf)vSGqm+ebOWBi1UeAmGHyyHYdhu|uyg&#Idz(|3?X;=ha>MlplCS%f(RylEf9*^GcJWw+tNt)_n$XEj9s Sl2QV8vxjNSVkLN~!~Ox}F(x(u delta 1186 zcmZWo%}>-o6z}w7+U`g90}#PgL?lo_JP^c#F;O6DVwQ~@jGGwJbQ-c7c3Y=~i0Qf} z>XAg!o8chGz55sVXY}aNvwGF{+Aa`mGryU>nfKmre(&|u=$ESD7K=Fn9{=yVomu_J zsF62E3r|)kQ$GsL0@IidbCKm(9%h3TSP|wDGgt}cGApwR%oSGM63mgKZ>uN22%*t$ zvO@CFf;gGS*fH@20w0SS;`6?asmcHaVi1{VBnPkfzDoEw7;On)_^7a;FxFuBb$~z! z#gH&^DE6dK`btg&0=Bl;mO_zLQi=;7SK>&ayTuA z3R8~74-)XDbyMVd2ps1;?y@~Q*lw}tyY!;3as|z@Z|ytWfF&;>jG$5Rc*}OU2y0X2 zRkUA5NCK6Hfo!*9b(zJl;?^~QSWUJ9mye+-flFx5S&TK(^cc*CbQMrX%k(h_XfqT2 zl=u4s5{oUyC(xfDTtTP-n0i7urCLO5!gmr@F=fuK6F3QZejWD`>NKI=tYn1OQobMn zpT;w%y!j3MM7q=GNRM)-Dsf+t&R0q-fV2t`8=5TErbh|D00X3oNks0Bm3CC26U)Qs0i7Xq8;^^VoW{} z>DppHQCJHOJZIap4&pp>e4DqtpyhV?A{=|G-?39=eY3zdbUaldEm=~iL>}y}v_RPT zi8kEC6<*2I&QxmVF=4|x=sa?|L0YOrIP9~eUQOMzcB~HU{?~2>@WhSmmdnu}ZAx7R z$GTaKYWltTVGH|99T!^1=csnGl)0T+)#$T6x}Dqz|6D$UFo%G`@g)QddrsuDp4aX} c?7dy*0k*M^zd>0jgTVM|lBR1p7_^}M1IG980RR91 diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py index f3831c2..fd935b2 100644 --- a/gestaoRaul/comandas/htmx_views.py +++ b/gestaoRaul/comandas/htmx_views.py @@ -1,6 +1,7 @@ from django.shortcuts import render, redirect from comandas.models import Comanda, ProductComanda +from orders.models import Order from products.models import Product from payments.models import Payments from typePay.models import TypePay @@ -18,6 +19,12 @@ def listProduct(request, comanda_id): def addProduct(request, product_id, comanda_id): product_comanda = ProductComanda(comanda_id=comanda_id, product_id=product_id) product_comanda.save() + product = Product.objects.get(id=product_id) + comanda = Comanda.objects.get(id=comanda_id) + print(product.cuisine) + if product.cuisine == True: + order = Order(id_comanda=comanda, id_product=product, productComanda=product_comanda, obs='') + order.save() consumo = ProductComanda.objects.filter(comanda=comanda_id) total = 0 for produto in consumo: diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 9d19f7d4db185275d9dc49fed37af73c11bb656f..ee86a20049aef347af823d33135885ac97eaa2fd 100644 GIT binary patch delta 4642 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 VJI-?#P)nxzx diff --git a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-310.pyc index d849a14b66f9db70a4a36c0808bcbfa7980f48f4..eb19c774e726ab78a69ef36f292d424d75e9e049 100644 GIT binary patch delta 48 zcmZn_?G@$C=jG*M0D?;$jp;!fc^@$`3QYdM^qeD#Ex#xwwWxUWb>>VqM&ZehTrL1s CZ4S8r delta 39 tcmeAbZ58Fs=jG*M0D^@6+H~iQypNa|`6qv1dcOHSb0!<3&}2_87XZ*%3sL|8 diff --git a/gestaoRaul/gestaoRaul/__pycache__/urls.cpython-310.pyc b/gestaoRaul/gestaoRaul/__pycache__/urls.cpython-310.pyc index 02b3318d933654c9d010487a5a610e012d3abb26..b263974d481c918c8da8f9639150615e0d9de065 100644 GIT binary patch delta 134 zcmeywIh{*8pO=@50SGR2G^U?qVPJR+;vfTFAjbiSix*7P?iWjCNfAwDO%ZEmY-UR5 zisDES4`$Gm*mxw3S*VJmAT=d3CBIm|iaWn3CAFw{vMS4Z1sR}T76u*x0Y)BX9!7M? G@eKeseHpd@ delta 101 zcmbQv^@&qEpO=@50SH=er=`zgVPJR+;vfSaAjbiSi>FM~?&nJ9jN(WU4Q9|3+jt?3 bd9p9dDmf{jBntzNfB+*8GY=yw -

DashBoard Aqui

+

DashBoard

diff --git a/gestaoRaul/mesas/__pycache__/admin.cpython-310.pyc b/gestaoRaul/mesas/__pycache__/admin.cpython-310.pyc index 496b963cc87da82af91a0ca01842b7f8e03c477b..f80f6fa36d46537682a4f6554dded8a80b645672 100644 GIT binary patch delta 170 zcmaFF(!s=+&&$ij00fsh8q-r4Ci2NJYE0CYu1{smVp+hN%Dj+~ks*aSm_d`}B}kPf z<1N<2l-$fbAcMs>wK&mFlP!ubB`Yy6Jzp<5Kd+=HGpUFPs4$8r7bsh-mz$rGnp0fF z3>3P>Qk+?mdW)kdH9fPqB(-QILlGNL7)<=KaJGsGElw>ejww&gDaoJA$z;g|lI3CG IVG>{l06dE=q5uE@ literal 610 zcmYk2zfQw25XSBNY0{9U?am8i>5LFUh`w`KX?&$U*446XWB8xPn)IK`2p)ITDy)+_A$Q;S$%f%RS)} z-?GOiA|QbXNocjtry?SerKlT#D5Hi|Qq@d@nq<6YjY*w0$fTf6N!w(tWVtWQQA1Mjc-XNu zJ#=`y1oZBhruXTRB;}Sim0T6FF{*x1utn4^i=oX*$dYlbx=oU#unqOU>2>D3=z9;Y z53ZWneAD;-&kt<=t{-v84?8y&FwkI4!D>BS8`g%3Rkb!ueIhjj+lJq>>^y(cOzHfU zaU=5^S?mSuLg$;!^=+0{OdBdUbkB2JIJX;I?G9~t0e`gT>=HvUeF`B)u@mD3j{Cg`kf=eBZ=^*+sh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6wp*(xTqIJKxa zraU#LBtOO_Ke;qFHLs*NCMd|s)j1|TwYVfPKPa&@Cnmor1*9%MJ~J<~BtBlRpz;=n UO>TZlX-=vg$kbvcAi=@_0Q6lXe*gdg literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/__pycache__/admin.cpython-310.pyc b/gestaoRaul/orders/__pycache__/admin.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ba4772165b69fc04926154fe9aa6231e71281eba GIT binary patch literal 267 zcmYjLy>7xV5Vqrh5F!tmFW*I~@c#49jy zhJ};v=ezsvyR%6$WMrqm-wG(719&z;;FTOF6ckfjGs6qcLmlbJh(d4%d>{Y!Kpa9} ztXUdgh|N;o^-5*xCKM~DzOjm8V1P`8%1Mr1NTit#{d8T literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/__pycache__/apps.cpython-310.pyc b/gestaoRaul/orders/__pycache__/apps.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f81099ddeb2c285b5f0eca6962b9860234963e4d GIT binary patch literal 432 zcmYjNxlY6|5Vhm%D(ul9S|r*usS!eG4~}k;7STkOEVJW{7CCW<6Cvmj6np{y!0%AH zrQ#Q;7$+;SBhB+1&u{E8~t_TFc-Uu*7 zUs)PJcthge53)#1-QKh;=cZV1vX!sw8pULSZVwO?NhuJ#O;ZLz8UjO=(2cGuP?hZz zo)6((7MV%lF3AljZIjt1n>Mw%+$asMZ(8yq?zu>aLgq>cHxL53jrQ?Kh=)e%ZD$|U zS~j{C5*5U{l?Z+BlT>~eE&LwOPx!6HH}FTLYs1gYs>xMRTfSV*F6KN_ww7jzLcAN# zWm(#!e5x2~_^sJKLPSCu(YCgTnHz3@;<;7ehk5q@*e)7k%|)l(`_KHotQQ=S1NH}{ C&ueV} literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/__pycache__/models.cpython-310.pyc b/gestaoRaul/orders/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cdb1c364d5e8ce68039bcb750c38de10ae544e6a GIT binary patch literal 1058 zcmY*Y&2rN)5SIKC+reqm0zGze^?^J~0I$PQS5CYFCsvB-q|#{heY=*eZ+9&^oi>8;>)V&vI~SqfhO7<`$PO&^0t`b8 z=cvF0V}qUCDO}=O?B-tK6TfJY7DlfS^O%2wn9uP%`0A37wN6kH{DF6%1nX8I7|#`; z;7AHqPpiby!B7-w$x^-6_!>SnhgOFVWCxb|4u&Iw86pmM=N|XLwiss4txE#y3Bg9p zy>&?2@<;bP2GoIPG4mk025cR$e~U@C!I-rmvhjdzK46a@uqP~F;SC~BSp;I++J7q< zmt&9?iIRd~UUBV}b)F|!25@(X_-A=qevqMISjTBy30jIvnlhF+)-5B5O);4N!{8RI zAuP2GhT+d>j_#l!uw&R=*qyn1hklr}d!y^%h_j4|-gVr2*0brY#9+yqEDw5#r=5)H zcE;#pSrm(>O;x-yEjZlKQ#?QaiDVZ({C6-MOimS-YI4c*N=){|v@UpAsmby2%l+YG z##NPyu5>`DswAbGMur1s8((*9%KA-Ylx*pcQuAR-b(>N+T;~SI zlwQA z9pjJ2{8M$1@thG?oGIPeODjIk3T}Pczo>c5NwkoBk;<%`>F_)&GxeS`5EbQ-AIkFw=Kufz literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/__pycache__/urls.cpython-310.pyc b/gestaoRaul/orders/__pycache__/urls.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..46143da0f4cd8abc98217d289a9747f88a49c0d1 GIT binary patch literal 469 zcmZvY!AiqG5QcY~q)D1IXZr}f)T@+I#OhU{B1(uzaK>~?k`22_i@o^(K8N^9xq9j= zhzDm&ErQOnKYTkgyZ@~0_j`=u_U$FR=Zt+A_#Ga>DQ$g60t|T03LbOLpaWLkDXiGy z3^~|nEp2e1`)U!nL=Jd+@`<|8+fzW~LTD(nV-Nb*Y#43nb~fa#U8VJ6OGXShD}ig> zve>N<1W0WP%Cx}Epi)?+N|f30M3nVdDnRuhV0zs8ht%fiNt8k_5dIW-Kbg${Fc&LS z{}lO$)aB4`16ZbICP$6Rwd#;T@L zK2K)j)N3M^}#%;#qpvm`@Zr*fV)d9oW%C+6u<_1t=sLPC?{)cli< ONJ1X+$cngG-q$yvQi1{i literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/__pycache__/views.cpython-310.pyc b/gestaoRaul/orders/__pycache__/views.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..614567e0260eefc2275e32f474a5b880ee21ad3f GIT binary patch literal 1241 zcmbu9OK;RL5PVGgUcJRa|KyuqLyk!qt2(A*E~rw%}=@lQ>)QT zmqp{X#?Y6Dq_Hb;+=N&$E#+&Aa=2BvjL%Z=MhpJID;6e7^ig+x7EZ)IX_mT z#h0dQG{Z`T5KDO=cIbd^QF#m0308eQklQu8t1%crjm|CLL=7kV+_@l2D*;mH-UXpV z8xPR*nT0HYt!?%MOPe{c$I&6Mg?2BUmhH+vfaX~_lURuKQD9vskAddrWFpE1bQ+Gf z*Pdk0xQkrrq;(kThR(2K=*m89Z|sa~(*fBqZ_Zs7_b)*2?rC>aQDG3dpV6FXehEI~=XucpuG8H7zhlm6&UTh+%_W dYJ%smt1kEp{6|pO%pQfG)uVwOxIx$pegms}23r6C literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/migrations/__pycache__/0001_initial.cpython-310.pyc b/gestaoRaul/orders/migrations/__pycache__/0001_initial.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a3e66b18964465a0f947bd7582a46057a8e38b47 GIT binary patch literal 1143 zcmZ8g&2HQ_5EiMQmDaoVrgdHC1p@44+oHE12;!{mpfKzJj(b@wKyWoFt=&5_x;!*@PwxQL<_cFW*pee2M&J5X90%G2m%PPw~T?&7eNo=o8Xc|Lb{~Y z^=~-gEy8`mgBwO@*dYe%-R(Pg=MEm-!S@Jn;b1vj_Lker9ryu$Y`yH>(f_p8X9?`x z@Qlqy@H1s$-zBFT_7{|kIMszLL0b1Kjo(EFg{@>&TOsobjaV5Cby{uqI@nluqIJ8i zbq7USE2~O$;d29M99MAc_#cPkzzt+wX^|R~6@uGZ8C6JgC0^l`ODq~Cb9Iew@CMC7 zTNI@%(D`~{$yvC_W%bF7yxMXE;C5GpWX?s~LgJ?R8G9<-50mkM*RXXAS= z7H#lCxV{inWOa@t4}^GK%e*;Es7Dc2MA;1hS6Bj;sX}Wwm7Lp}wmCX&%G3CbX7E&H z2b8_z#)nHT@ULnu4i71r7plND>>q1`Dl1PYrx7e=nQ6yi;o_DKRlVy?4_-_U4v$=4 zudwTckDh6os$Kp&nLeEVNzY;DZ!xd*{7|QLfn{aq=jTt4rt=J`KJ>Y)^SN$b*v`MT z)SN2eH_k0WGl?aPD&!+y)V6yL`m9*{J*W**@c6g4_82)@B^J`|I#0 wu$Zj-bh6=K#&j9IY)g;!+oZL5YHh!9Sxdh(r{hQKcX-U2Xrd+>^1tVQ1M)KI-c*dXojrDXI5wx$LKjd>p$TtUWnup*3hl$Yv0jfws zab}8DJmHm>c$B;(z`^@Oz>~c6Kk~!}dO~LYcdQ|c8M9GUF(+ZRIr#$Z7BM<5H=D5 z^ExGQJrUwvmnoO)5XiNxLDs86ng$z4Z1@b|$eqz}2csk1$Re*_$x9nRnbo$x0?o#h(_`A=T1@`W6 v^%&0M;s3Q2vp=c literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/migrations/__pycache__/__init__.cpython-310.pyc b/gestaoRaul/orders/migrations/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..80085051da138002b0e0e46a105c60a9e125f17a GIT binary patch literal 164 zcmd1j<>g`kf=eBZ=^*+sh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6w=*(xTqIJKxa zraU#LBtOO_Ke;qFHLs*NCMd|s)j1|TwYVfPKPa&@Cnmor1*9%FGrcIWBr`v+I3_+m fGcU6wK3=b&@)n0pZhlH>PO2Tqf?_5h!NLFl*}5qs literal 0 HcmV?d00001 diff --git a/gestaoRaul/orders/templates/orders.html b/gestaoRaul/orders/templates/orders.html index 2a0eeac..16a35ec 100644 --- a/gestaoRaul/orders/templates/orders.html +++ b/gestaoRaul/orders/templates/orders.html @@ -26,7 +26,7 @@ - +
@@ -37,7 +37,7 @@
{% for order in orders %} - {% if order.preparing == None %} + {% if order.preparing == None and order.productComanda != Null %}
{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- +
{% endif %} {% endfor %}
+
{% for order in orders %} {% if order.finished == None and order.preparing != None %} @@ -70,7 +73,9 @@

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- +
{% endif %} {% endfor %} @@ -91,7 +96,9 @@

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- +
{% endif %} {% endfor %} @@ -112,12 +119,12 @@

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- +
{% endif %} {% endfor %}
- +
diff --git a/gestaoRaul/orders/urls.py b/gestaoRaul/orders/urls.py index 95e3298..957ecee 100644 --- a/gestaoRaul/orders/urls.py +++ b/gestaoRaul/orders/urls.py @@ -4,6 +4,9 @@ from . import views urlpatterns = [ path('', views.viewsOrders, name='pedidos'), + path('preparing//', views.preparing, name='preparing'), + path('finished//', views.finished, name='finished'), + path('delivered//', views.delivered, name='delivered'), ] \ No newline at end of file diff --git a/gestaoRaul/orders/views.py b/gestaoRaul/orders/views.py index 53d5cbf..9fc814f 100644 --- a/gestaoRaul/orders/views.py +++ b/gestaoRaul/orders/views.py @@ -1,8 +1,37 @@ +# from datetime import timezone +from django.utils import timezone from django.shortcuts import render from orders.models import Order +from django.db.models import Q + def viewsOrders(request): - orders = Order.objects.all() - o = orders[0].id_comanda + fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) + orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) return render(request, 'orders.html',{'orders': orders}) + +def preparing(request, order_id): + order = Order.objects.get(id=order_id) + order.preparing = timezone.now() + order.save() + fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) + orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) + return render(request, 'htmx_components/orders/htmx_list_orders.html',{'orders': orders}) + + +def finished(request, order_id): + order = Order.objects.get(id=order_id) + order.finished = timezone.now() + order.save() + fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) + orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) + return render(request, 'htmx_components/orders/htmx_list_orders.html',{'orders': orders}) + +def delivered(request, order_id): + order = Order.objects.get(id=order_id) + order.delivered = timezone.now() + order.save() + fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) + orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) + return render(request, 'htmx_components/orders/htmx_list_orders.html',{'orders': orders}) diff --git a/gestaoRaul/payments/__pycache__/admin.cpython-310.pyc b/gestaoRaul/payments/__pycache__/admin.cpython-310.pyc index 65363028f03c12b6fbb7a95f401025bda4cae754..a1a0a51b70ee4f13092796831770a8b2a5f94615 100644 GIT binary patch delta 197 zcmX@YIEkq~pO=@50SGR2G^XbQ>Bk@rGGGRB9Dul314yJWq%h_%qqeyK&A9@^HWlDii<#Y-eM`vEJ?k^QIwjVSzMA@w34BS4Jcg1HZk9y N3&i4K;9(MA0svE?EV2Lq delta 142 zcmbQlbcC@!pO=@50SI>Frlvaq>Bk@rGGGF79Dul307#@Tq%h_%lA(whNP&r8*3MQjp~b01 R#WCfn6HnT+ffNWZ000889H{^R diff --git a/gestaoRaul/payments/__pycache__/models.cpython-310.pyc b/gestaoRaul/payments/__pycache__/models.cpython-310.pyc index ed96c1bd785f1c3529853bd27efade25cc7fbf97..d7901bde3fc69a9aa4f512ee0ba38074ff22a0da 100644 GIT binary patch delta 146 zcmaFO{+XROpO=@50SGR2G^Wqq$a|7ehXcr~VaQ_0Vhm=`Wc1Tyy2YNHpPQJMl6Z?H zFEKY&lkpZyacWN5N`@kl$v+r_8965VFvYOnVl7L|DNUWcmPwPfNDyeox&V*jqj$J?3|E^tGq{ zLQh?#6gsfGv&%5Eb}|_;!sYm0z0mv&%YO)3mQ;90O)HSJ2+d2V1rV8jmu|R*!300s6vbMXTkXx4gcS W9^Sg)J;k&d7M%Prn2y;vx)neEJV$~6 delta 157 zcmbQpbc(S)pO=@50SI=Mho?IM>Bk@rGGGF79Dul307#@Tq%h_%lA(whNP&r8j?Pvwp~b01 g#WCfn6HoAQr>7Q|B<9B#C6?w)ysg6qQZK*&00spjxBvhE diff --git a/gestaoRaul/products/__pycache__/models.cpython-310.pyc b/gestaoRaul/products/__pycache__/models.cpython-310.pyc index 2009b5c801a6f1b3afdbded34d06b37262fd45c4..6515a55bbe9f7a43f443f0e6d2b1b54e375dd5b0 100644 GIT binary patch delta 117 zcmcc1{)L@4pO=@50SGR2G^THy$lJjejNlre?3moZ8-g)dbsjVXmcMWBTxN_?|A pqXHwNz+?|5Sw@M;X-t5Oa6rHcU50#Y8j6Or21x@s3sx(R_H=H7-pl9^{FLAsQ7;imt> zjep1GY+d;m3R3T+uOAoYFlX-N-g8f4x3^P9@%zX3`X^`XPauy&5!s{TUJ?KU-m;G8 zyc4=Oe4@{)l>zLFO*m!LkgEc#2eEE7KMnz}EC#v12mods-N6;h95Mr4nUdqsdO z=fH9Syym$?wTi+3oULL|5M6PYT}jF$5Yw2%&yVl=)39XSTNtas@J$vI|GUb+Y7Sd&HeJ5O?TJlefX}y zdiRtdVM3}K6$vhQ%GJN*X3C#r%Fkg{n%eHdmuZJd`ILN+czb(BeSGrn){Xb{D=`;l IJQ2_3e|JNuKmY&$ literal 0 HcmV?d00001 diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html new file mode 100644 index 0000000..4729b86 --- /dev/null +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html @@ -0,0 +1,99 @@ + + + +
+ + + + +
+ +
+ {% for order in orders %} + {% if order.preparing == None and order.productComanda != Null %} +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ + +
+ {% for order in orders %} + {% if order.finished == None and order.preparing != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered == None and order.finished != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
\ No newline at end of file diff --git a/gestaoRaul/typePay/__pycache__/admin.cpython-310.pyc b/gestaoRaul/typePay/__pycache__/admin.cpython-310.pyc index e765bc0ce204cd88163b78c7ec7bae8a9206f1da..256446a8e7770f1d74649d2715f0234124e904a0 100644 GIT binary patch literal 271 zcmYjLyH3ME5WI&Iq9}>@4BYqwB7{&LEkXtw>zX6CGLG(i(d}8tB^{puCBH-ImWp4X z%3h#gq}`oejb_%*=Tk=be0`~(Xnv*TKO`;JRCqznFvBf#yy84@VTF^G9?>Yx}g{&&$ij00he`!qc6A^kWbQ8887k4nSNi03=cvQW$d>av7r-85vTTf*CZK zUjjuLG#PKPCZ^m}#sl@w(r6@d&`$xy@$q`<^42WP98(Bjmh g;+XQ(iO2c4(^HE}67%DW5=(O?-qL0RsTW`X0Qy2Apa1{>