From ec212b0b227cfa0ce7f2518d4df6a06ad59fdc1a Mon Sep 17 00:00:00 2001 From: emile Date: Tue, 21 May 2024 18:08:16 +0300 Subject: [PATCH] New --- .../__pycache__/models.cpython-310.pyc | Bin 6247 -> 6247 bytes osinaweb/billing/models.py | 1 - .../__pycache__/views.cpython-310.pyc | Bin 9551 -> 9790 bytes osinaweb/customercore/views.py | 5 ++++- osinaweb/db.sqlite3 | Bin 1323008 -> 1323008 bytes .../add/__pycache__/views.cpython-310.pyc | Bin 13679 -> 13888 bytes osinaweb/osinacore/add/views.py | 7 +++++-- 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc index b5c56e7e6b415525c56886a84ec0d852dd9f1d16..9ea9c6976b0fe3b1c4cfea2f3fb45bb2152f3369 100644 GIT binary patch delta 141 zcmV;80CNB5Fy}B0Zw(C!00000yR=MZ)3FWB2>~*b+X>zS1#&Wz5d#5^pcD@Q0fdvV6|ez)lVKLn0gRI}7kmMTldl)83mFm(5)u*{5(pLxea~;c+X>zS268f!5d#8_pcD@Q0fm#W6|ez*lVKLn0gaO~7kmMUldl)83mOs)5)u*{5(pLxcMmI} diff --git a/osinaweb/billing/models.py b/osinaweb/billing/models.py index 3956c37d..1e3a4488 100644 --- a/osinaweb/billing/models.py +++ b/osinaweb/billing/models.py @@ -47,7 +47,6 @@ class Order(models.Model): if first_orderitem: return first_orderitem.purchased_at return None - def save(self, *args, **kwargs): if not self.order_id: order_count = Order.objects.filter(customer=self.customer).count() diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc index fa986c577ba51144bc531a66da3747ec04aa126f..014ffd422e75255533ea5a627c3351526a80ca36 100644 GIT binary patch delta 3127 zcmaKte{5S<6~}#_fB*g!+p+V*c9JG@(iH}*U8}X-mMo=PyB}?$wl2lExlU&1hu!NJ z+M;K&l8tGw>__g#(CA9CF|nYb2_mLxXjOs1fOV_*lZS+We?S6>U*aD$X`JtSPTWQl zmfpwropbKF=bU@*dDrf_d?--$`#l!=`QA7*Dfay!@S!!BqE|0H_tR7Vj3RUG{RcQ4r*4%H2vDdTL3HJqwP^>PpQ(oER; zxNll{nu#E{G~D!fG}jbsc)7pfBdvcWzyqsHOg6{CRmK-W(~6iRH|~}J50g8$=B@-Q zA!B-^;hRf0^-*&0=yeWUH2+bWA8zT5`5w(viL~acQQk%tNX85#w#qPCpqSz`^l5I* z0|T{fCAMnei6wW#ulZNvs}^R_{FTH?yXIYG%%UbWzv-%J*-n)SXo04srIK3d;K@}s zVmak&1l3N>uLXIE5(;S{)8@=&-oZN`v1r~A%i;oSgw-yitYIp87a2y>ZY{D%OKA~u zGSG%_E!2D2}8H7(XRGuZCYGQ zXzf!>i}CD|omtNOK^@>dEPR`mT(lmw>qa!NjW!#vYg zWJx!sJ0B2LK0l!%{p{0nhqIUM zlt-NV+0Am=+jp}Ygdr&RS zitTd9-Nkb9p!-#Ji~N`Su7we-q7ZT^5vM=hRuofp-7$UE_z!MWrC=tP&ukGC&X(1O z3NyvJ+N@4Kxz%D~vru`wV7Pd@x*(npjKi?B|5e9R{gcm+GN{+9OuJ8?7IZ_LPK++4&6?Ff_+;5cvs$OE4T3cwc#dZ1Z^+0yK3I-a`h48#_SP#*;D z0gSpC=Ln5YOaMN>4{#s~pjC=Cptb)YbN}7VWy;*l!^qO8#zSPUdz;G_%DgTrH^D_2 zma&zd5P6*4r=S&gyo5~bpVTCUCs zNLz(n^PA;7EBA&{iB{Gqo^GEk)14I;E`^4Y@UDkT=gM`pJU3O?bbWzB z+QnX$?(h(MT;3W!%m(CQc>gDFbSv&f1jhZa8}$(-2qu9i05datBoh4@z1CfXh+?zZ zKJwYblk$%}opLlX;%!Yb?O%=fgV)IP-!_8HO18`Lok*T#WIB3m+F0|mq-pJ}?lK$3 z>GNhVj;+CDVE!yn15%slz-Wq~(^JRByOcOtA&8F@K2;Qa=M&jT0bKVogM7ip-w zYGzBUi%Za$b=e+Ius_R@cy{0=5>7C}#?MXzRLfZP>omyO?h|SGM0{sqJH1^O2#&-5 z+qajY|F|llGkr+U#x7cE7wuwHW)nx*pqx+a=`>a{PJ_+dfbYPU(W%V@exFE2T@<$A z!l&3w7q6^)+8JYM=}R7Wqw|cd(NUMP$&-CXYxuY`cL<&j1JB8SCOhdH5J+`LzD)w% zV>Xc^r6L#S<-SzE!#rQIk{TI!4O6}k;1cNG>sqr|huFAoX0(4vg;`wwH?^0&xqe$m zg0W%wKxZ=XFwDLQTmVq@91}a`!=2q}v_!E6N%P{O+GFB-kXXs)?aou|nC$54Sjdpb z+y*B`i$E(;TomKT=#DQIXXZ(SLv(zx%8lKfP}iOj8E=9xt#v)apOv~vVR1QjFY_OuzI%M z>vv%JbKn=iyTC7jUja4wOeV`7lk1sn>^=G0OwIQb5|4?WLiw&7&t`{yO~c&Qc9Hj2 z>*a}};Dysg8klZtay6TcUBc-_n}}GcP2l|6#8ql!UF<3OpX`w1X}EsI=;yn8V&2z~ zx`gcgrqS7+9oHLO?rHbFv1#-{)99lcjYfOhy;nAkuC14Q1MI;w@Y(=SWAP-g3`_wp k0l2Z^72r+a3h*9q6?h-`0JsLEjG%wlw~HN;(QUW?5Bl8h8UO$Q delta 2877 zcmaKteQaA-6~Nzpet!P8V>_`ECvoC9P3B|^ow^U$+GSes)!9U#?v~1mn1k(OMygv|sOhWqugtSQrX?&b> z-%AV?!qWS_`_4V*+EUBFZImI>?0~QRCqk5 zdxkW;)Z6gEoNvufed~nncgFs8LIbmMlkEp5XzVD^AUIP^wGyZVg?XsqTj+D zY+WLf>954s+D-2|A(GKy`fXQ^W_(3y1k8Y=DOD0{N!q?nCZrR=M$qUq{brDMz=1+$ z$ksXa0!`55Imz@+NXw)VZW>)8s9^|rCn!dYlo?rurOXI88E&-EF4#c#Gt#qiBWm=} z6u4}Ill0Q=Re4!%#Ei5V14nVAuhQRW7jv0LhcRGA&A8cacFYhnMtfG=L^^fF$kJZ$ zHb~Pe@}y+COojIMt;&srvBQ*TznNHeO-i}U!70mgm{n=LXyjb{l9~%{5X)Pv*Np1C z&iG%|3#mb<7B+_X6yiF>FyeZ?>KP(C`DIU*?Baj&jFS;Q>>VLT_z~~ZAo;WRx!{oH zJH)8Y_8Iy-=e}W?<@oP?y<~|0&G#}H<7@uAn|Glz8IVh|1iUOoV>2~NoqZ7B>~5Ui z3&_W6^~J?1GYV8+)R-}^FBr~FP-O}scDD5x3x! zY;7%DU!AldN*PZVjOWNLaZ_Yqg)?z zq2MrLKfnr3iNk%tUPNr|08YjbpGO=)Od^gVjv@vxIQ==q zJqQs>k#cMo>;Xg&5kj2cS|mQ*%37P9HJ{_SOzoYEb79!oR{&PPS+G#1HFgrk8ls4x zh&vEEVj3}nC~+$?M&`J$?S4|{N82ub26M3?GvOR7Gv^Xx%gc1FXq2l9Ow{Xk6gNV4 z?5cb`no72gh>^0~(`8mO*b-licBvxVck#!gqh09Tit1;|HKV*RQ`mOB#NUtJO4fKF zHcHO&e6oj6#%?47{Ohsto&W8c-3u=4qIQe$urH&afH;RJ@sDFW;%~sP<^{xLMN$40 zRM>g`+iVZNH$D+)8I<@_@&3qrp!SghP+Xw*D1S4aCxblGezb{eS#EL9T1m9LRlInG zlS}qC)N8jP;`ALbWhF#v8{OzGveg3$!cFaWAguWTUO7RWy*>_~MOoVXusuL_&!UxQ zQfH^jMLh?_ZY(Y8EDO>c$+vBLE0k*s^|?7V4->2pXBGA&-^ z5TPOl`74Rxo1VbolZfvE@?rb1WoR>^z@7r3v z@$QM?AL5Q)Lg1CK0&`kzyNzB%vABFCex-Ym#QBHad&sMs!#znt?&RaWT}f=B>;hs5 zffbu0Y!|Qgru(oHvLB$txxyIaDfS{tT%hyg-V@|7_ous?qB=$NJ!tbaMC+tp{KVq0 z)YIBrU9Yh!N?u0z5O_-V6T~URLx?W|ESCnw_apoiN$}c95X}rvn@@<-GX7#Z8vhv@ zs7@#UIog!?)$}OY!#_@sk6i*m(FNH0sW5QEgVn%JBOXM27188SC;qcAq>x|s2!E*W zJ^1@O&_5C!0HLK|<+9uP+5VS~iBfN!)kJ%7FRrOb|Ft*z4b=Q4;#Y{vh%1O+BTD?? zOop7}FJyL*xA@h}V(>K(PqEi=@-m+o$c(-T!`!uvA|I;O%0-RQ!buGVw%ZbaVj$D; z44g$Yg_sMP0#>WSu0jLrCEws542-JZMAzTq9og#w8+hz*?$t6Bg6 diff --git a/osinaweb/customercore/views.py b/osinaweb/customercore/views.py index 83f46002..516a813a 100644 --- a/osinaweb/customercore/views.py +++ b/osinaweb/customercore/views.py @@ -33,7 +33,10 @@ def redirect_osicard(request): # ADD @customer_login_required def customer_add_ticket(request, *args, **kwargs): - customer_products = OrderItem.objects.filter(active__in=[True, None], item__type = 'Product', order__customer = request.user.customerprofile) + customer_orders = Order.objects.filter(customer=request.user.customerprofile) + customer_orders_with_last_status = customer_orders.annotate(max_status_date=Max('orderstatus__date')) + customer_orders_completed = customer_orders_with_last_status.filter(orderstatus__status='Completed',orderstatus__date=F('max_status_date')) + customer_products = OrderItem.objects.filter(active__in=[True, None], item__type = 'Product', order__customer = request.user.customerprofile, order__in=customer_orders_completed ) customer_projects = Project.objects.filter(customer=request.user.customerprofile) support_department = get_object_or_404(Department, name='Support') diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index a076d8e78f31b0df8f057839112e7183a973f73b..d2639dc32144c1f7970478a2a004a8bd7614d698 100644 GIT binary patch delta 827 zcmajdOK1~e5CGtPG~Lv08q+lb6< zL>AlOouz|)h8?IkG4PmA_rS}wS3M-mt?u@$xoQy+yI7)fDLDhesW3QOP(?Mvo zk_hlVzfTG#O93Vj^$CUK=oAg;N?3Htc9)BbO>(gW&kG((I!ywSwgSdV5}gF?U~CSO z>}4omqlo$T{6c#k)*(7nSEn=R>UEgTsB6&L^LyT|z{?9;9gW&n2fky5m(?$)@Z;#F z`HR*J@DKWf_VokIz8;X5zS~soMzcD<-7whKHONbqAYZUi*8#*Di3m{ju`!57Qyw&krT7(HQV3;Y>DF bP%5I3lu6+Ky$C@6eXc(bNArp;&tCojVz~!A delta 437 zcmZp85YX@-V1hK`r-?Gote+V4%DOhDq-ry+n0!jxh|yy6U+rB^UgkyyK%nB4Vd`v} z5#(E0V&dnSSzr`US#D9{rDAN7lxgJTmYi6cmhSGF>699gpHXV$Q{EdaSZ#!MCQ%H=(*u=o1SvtR6I-e1UnShuXh*^M`6^Pk@m>q~YfS7Z;bUxRG z4UEg%-^g=sedY_rA8i*h;JFPH*#6F*M@)gai1F5R_5_}%lLa5V zo4zZNM__tPwlH7&k3^pBKN5L)>X?1mCvIndz#GoAJ>e0r7VE?S&g~PQ^A@jQ4rdOS z&OU*!aC_ARz70&10}?da119qUG5_{}$pZV|Fwf<0-7eH1*vl`j&dI>Y#K54)z`(?$ zV`N}tqHAcNYhb>8Tfd;+2WDN4=hN96grc_!3AA!BtF~B7pSVa+c>CWDA@=L?JdC2u z>|gk9@or{2%estb0!uS<9Fqm3D0dc@I|Bp5bVUQE>h1FqgzGri8Fg8Gn}Z#ve_YI` YFg<^x;6Jt|)y5!J-|g;M!aI)w09QnjbN~PV diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc index a05b2db27d8abae76b3aaa979b8a70f2c476b6ec..a3f7b407a9c9b4ff687802640e5c6ff0f4a4b02b 100644 GIT binary patch delta 1020 zcmZ8eTWb?R7~R?3TsGO=TzX5>R(*7#G;QLG7bsE@ENZ1KB0*U~X4PzSshbHcIBOn) zAV{9(Q6G|j&{9P4NmPoETCKjVTIr*p_!s;p3AA=$&VJvSb7s$c``3O`)GL}665x6N z>grwZ=BEC1vL1(4g*6AOx`70N2n11tQB!n9BHEHIQxS_zx^ z`$z!$feC=#M}l0BgIKsHVugy-heJ)-^%LdDIRO%~rB=8tv{W3fw~-s9f~{e7MRYn? za1~e~VDwf5Yi;B#LZBmkH&__!uG-f`KvM#Za@cn@3Jq6ns@PFG=7w?9Rm+LKA_k7f z;D|$C=br(hYYBm+anwQva2#&Y3p3D0{b~>@l`0hUzzmY1)^J$fG=dW_#3+sSL=Rq)aXd;jdjcn$;*vo9 zGyq|OcfdO;BgvjNK1k-aow4M|7RfQBD}m<#le7nkLQ>%RpYFlv_9Z z9H%^Gu2Nb}7cF98=N)&8*@6FzJ+bo^_LjZC4X1)@d1A=y)|3&>DqX2*7Rv0&)FZUb z0;ze_VT-AUXHPmZSey$yif@5Oagv-cIT6g2%N0mwdD6Aqx`!@%N>_4)SS9u+wGi~w zJ{KIYy))0GSsncYV^SvP delta 823 zcmYk3&ubGw6vt-)K*)eT510PFM@a$!S^2x#?Ux^~iOUvtLeJyR8NL|7UUXn3Zcxm{q7?6Y&rMsq2lT!Z;J`DfkFge+% zFE74rJF_sqSQFEoyuHy=m0c8QfKr;DzMQQ)h+VZ&9?V41-?5LPzNw#X lQT;7v>9)#@kI