From a8354ec1052a5ab9b586a9c53d501211f5301d0c Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 11 Jul 2024 15:29:22 +0300
Subject: [PATCH] new

---
 .../templates/listing_pages/products.html     |   4 +--
 .../templates/products/osimenu-plans.html     |   8 ++---
 osinaweb/db.sqlite3                           | Bin 1560576 -> 1560576 bytes
 .../__pycache__/consumers.cpython-310.pyc     | Bin 4599 -> 5436 bytes
 osinaweb/osinacore/consumers.py               |  33 +++++++++++++++---
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/osinaweb/customercore/templates/listing_pages/products.html b/osinaweb/customercore/templates/listing_pages/products.html
index 4d4928d0..b8eb4632 100644
--- a/osinaweb/customercore/templates/listing_pages/products.html
+++ b/osinaweb/customercore/templates/listing_pages/products.html
@@ -48,7 +48,7 @@
                             </p>
 
                             <div class="w-full flex flex-col justify-center items-center text-center">
-                                <p class="text-osiblue font-poppinsLight text-[17px] s:text-2xl font-semibold">$89</p>
+                                <p class="text-osiblue font-poppinsLight text-[17px] s:text-2xl font-semibold">$9</p>
                                 <p class="text-gray-500">monthly/restaurant</p>
                             </div>
                         </div>
@@ -61,7 +61,7 @@
                             </p>
 
                             <div class="w-full flex flex-col justify-center items-center text-center">
-                                <p class="text-osiblue font-poppinsLight text-[17px] s:text-2xl font-semibold">$169</p>
+                                <p class="text-osiblue font-poppinsLight text-[17px] s:text-2xl font-semibold">$29</p>
                                 <p class="text-gray-500">monthly/restaurant</p>
                             </div>
                         </div>
diff --git a/osinaweb/customercore/templates/products/osimenu-plans.html b/osinaweb/customercore/templates/products/osimenu-plans.html
index 172baf84..7bee6217 100644
--- a/osinaweb/customercore/templates/products/osimenu-plans.html
+++ b/osinaweb/customercore/templates/products/osimenu-plans.html
@@ -139,7 +139,7 @@
                     <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Standard</p>
 
                     <div class="w-full flex flex-col justify-center items-center">
-                        <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$7/month</p>
+                        <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$9/month</p>
                     </div>
 
                     {% if not active_order_item_standard %}
@@ -255,7 +255,7 @@
                 <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Premium</p>
 
                 <div class="w-full flex flex-col justify-center items-center">
-                    <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$24/month</p>
+                    <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$29/month</p>
                 </div>
 
                 {% if not active_order_item_premium %}
@@ -493,7 +493,7 @@
                     <p class="text-secondosiblue uppercase font-poppinsBold text-xl text-center">Standard</p>
 
                     <div class="w-full flex flex-col justify-center items-center">
-                        <p class="text-osiblue font-poppinsLight text-xl font-semibold">$7/month</p>
+                        <p class="text-osiblue font-poppinsLight text-xl font-semibold">$9/month</p>
                     </div>
 
                     {% if not active_order_item_standard %}
@@ -610,7 +610,7 @@
                     <p class="text-secondosiblue uppercase font-poppinsBold text-xl text-center">Premium</p>
 
                     <div class="w-full flex flex-col justify-center items-center">
-                        <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$24/month</p>
+                        <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$29/month</p>
                     </div>
 
                     {% if not active_order_item_premium %}
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 3f1ac2642f3cbbf5e02bdcfe56773dbe18a8e4cc..687413d3160868369690744e09095c0822a5eab9 100644
GIT binary patch
delta 1322
zcmah}Z%h+s9DeVvy%u`CUqN7TE`z~LHYWA%%3ZH46KiQf{tV0CLbjArj@sJVlR{-g
z2dF#ri#qQElO@8JWhVO*XM?wxEi>-Rq5)&F8E0hEMKcmm2y@BiK5PeUnb|)0;mMOc
zdEeikC(rwiOa(`#f+sg&r{8_fgPs1Y>;6laE#rGxz;rrTT909K>XldC!^BK@%Nd6Q
zAyj}3An?)0tg}{zI&OJjY0ti#y)|npi#Atc1Eyi}JV_cm43`bXL=3-)Z_A9zZp=LD
z^IFm9Yi{-ZNY}F*!<CmY&N7xQVz~-VsBpOK<&2Z%1@(_eje4_dLOs9tl-d{iJaafK
zVCr|>pQ@$ZAFI~h8MQ&Wl=19d##Ab<T5`9q7DeX#oD%hJ_r}a`F%qLjpWn8wZqC`P
zPDVDW?XiQI$@pVT^(4Pkzwf<xNLFM_k#R*P6xpE2MnxtS*`&y3Mb5e)XB(!>1S}v}
zfEA6hS$+f)NnkjR&uJ@#mfRv62@?pG;0Kt2FW@7X(DJrh6mZZ-L=tVn5NhPg8HVAD
z=_Af3g>qdGo)jF#+DxOxY10edKyVM{;0F8-E3lyDby+S${%Y4^TwEvTItk+oNy|pc
z0J{);3uoZ~?8@Yv+YW(Jn-LYdaZfTK$EAL$=RY2c73Hj56j{zC;9@B}<*Y-rb0Y5$
zINYh79k#q-%QnD0v_9OlE%ye{B!OeNXj>yEXe*PJ+!2C+dCgQr-37CW(ESqdx$)(#
zR9-d#4-q_q$M8_28R`y@Mgpzc`KXdQu!a6N0iuf)w727wLg<#<M*4+E@DS$VC%CQU
z$<#M6o-W+*qB25V7_l0<bQ8h|K7s3S6vDa*&9J#xv6&Et+*xMt|Mqt{>>|&x3_E^w
z$yxz_2amTiJTJNg?fR1StEnR5PjZ>OLViFF6A`k5EXS{rv~k|}HIc!8HJ-t9v~wqE
z2`dWsh7;1jU|JrE4er~Y*q?F=gR+$BO-BY;HXdTe_*1kF(D+lfYY+7OrxDD;&oHgg
zBRL;JLBTt3W+4nm=mn%3A*|0Tj$J*Gqa#<x1|50Y)f4#wQ=-2)8mR<z%+j6xYF2@1
z+4L6KWZYsP@jKW>q|&#n8Ff@nYU-u@LhCSgsN_(YvEgv5`)NbkrP{%^nAh7FiMjnv
zQn0zdeQ&a*uBKHEq#OO!9YRv@BwCuIsaQ=<z`Hvn1f?=paA;?&TS_tA@%BKtsdMP{
zIK#-UvZlHghH)}21H<v^pih?T1D)+5XI(H9Vg0<%RkMe8)R$F7r9P&wC&0RQa^9$?
znrUf__!CJ_qqln39$(*3I?$lE=!|-$U{$j_(ce&87v0gv)U>6mf-Rv~kE?=BHKkI!
zD-vxXSF5v^+sFEM_@Yt2tFzX>v#p-5Vx&^HEO>nVT)iA_4yNmz4gchT<DdL%){=H>
qHor8ar|AA_((c0|{Gz952FB+q3(RXz-b>iV7Ap(1#mZ;$PW}aX%!?8L

delta 1162
zcmaiyZA@Eb6vv<YwDj%1oR+l(!UAQ4L|6;Ax4kWNnZW80He^%KknIC-+wu;*gyCe7
z@nTZYFROb@sxg@uW1NXwSUSCGmPphO>H^E+3rgagiDn;QK#)Y?gYjw6nE1s!&p9VK
zIp;k8`#X1PzGG^>BU#8OFCPpu%8kxnA7LQfP#$0yAw5yi%rL9utHZA{aysI^;tS|+
zAtzeV8Ge8;e~+)@u2>|t*YY*Tn%^?pOvj8Qr`f>aa{R6SkZy(<5pJLrd=#ZhMBF1x
z7v}S5`Y19L9w;}Ni5ShZkBv0Onj0S*Y3e@}4>q@-kBvOtMjlmOCj*fWiLv`Vawc{y
zT^bEArR<-G-ek6aTHlf#G_fDdc|316`*^a@=O7U!Ocs>_GS#z4(%nns@%TrkY4`DL
zJ(=k0B)@kxrt5mQ7_u?&X8N=K3WgV6L;JeQY-J`=)&ENR(%>GGj}XewJ}2|C$z0E?
z%0RSR>KG;8D}=l>d}~Hcs7yk|300R+^$9g6p&AmZF`=3gs`&%eqMtWm*ha7oyBcR@
ze*)vXu!{`%y0%@+=DMspSVFJ~_h1QzGDox5u?g_?p;87R$uEkc?4izEM1{1`BvbNl
zQp_Z4|EbiLPO(8N9k_;Im%g_K-%-D<**n=!!9go4if|<jrA637!@(l#POZh+0uIAf
z1mD0_I16XfwuKgGe!I9HhvP%)VC-BhDv6TcBL+NP(d89GaxmnpuJl#=f<X~Wbk2C8
z51)<=NBf3*_A9C0pi7cMk{lAn3L$lIk}XJWPO=8=%SrZ#)sn@L5%|md*4!1~sT3@6
zbdm#$thW6In>(e$u%#JY+|OWwKadGa_<CxqinG(+9RxeD2RoV|a`(Xids&t{wcPV=
z!5fnOA+N7e_KG#4U%NQSC3KX>2Ff(R20Y9h&8~7^KrTXMSsKMz7zNmkW;Z4|ZDW#m
zc3N~Whu|9Ag*nRO0;J|P`4EV~kiR-41uCoQRwTc6ca#5Q9%EZ7nG}k&g`^N;TwSrz
znn=z0@vgYPZ>U#^D8a!CK40+JF@JY3>JuZg@@0V<X!2$2orm;umJuw&16bCCDcd{X
z6yX8=-OL!3AnK*R(a+w#WTTc#?Ep2qcKebeAeQnANI(Q}FS3f|h}mh}GL9Rb%5m!r
z_&)P7BEl+vlT52|jVwBf`NK#*b7;ns^TZ3S_5Y_bRrR^!X47cPiBM#0xZWQ>H=;B(
zoNgHFX_e2kN2Ag3lY!BW;bX1OwGD;aPn>Kysff=+_O%8*lI-&SXA!H*j*2b{bv?6)
db@+`!y#uKqYn>*edB1ITz1FF%*XG%ie*yM+SEm2~

diff --git a/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc b/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc
index 29e95ead23c8d05b2dacefac9df7767300f617f9..ff564bec17677ccf8b6bf4beb523f9f19c573510 100644
GIT binary patch
delta 2576
zcmZ`)-ESL35Wn5~^!e<>Y5Eb;q$+6<E;KFB(hs7FmNxx>hLogyBoycBy|}hqpSySI
zm(DUGAkl{i(DK+y2|}Q}P$6FX1`m`M)YttFctQdRUH~z(PGTn%pKfk;W@mPG<~QR%
zhaT+7hMA13!SC%KKbgI=`P=LT(xk97;C%(&=mQ{$R?!&ggKvSvw4zrGkPt=}$fCKV
zHAq7EP(na!F&#8k!DhI_DmX|NQ%f4rYOb<$m8H(i1&aIQG_1W!W}Yw$xa>S7+J!`0
z>_QXxcH@_66I$LLlg3;W@MXds2x)S3nJPwFVXa!O1=4GM3%DuD=cE}G!+N0hh>|hz
zf;6gr6ic@l)@ng9E{8Rq21n9kW!R}?0h31LUk{{J<bfXt;vqS^GfzPnRA=R;;AT0B
z%e7LW?P6Ku17eWg*zyFp@<=Z+h(#QDfTu1M_vpPY-UB+m2}v&yF{K|Q{o+%7uzvt$
ziVOlL-F76~#Y6q`8J+_1Xg<xexUmaKHxf($&mmD>hmcc;;Dyv79OKDT-oK_=e-?iV
z6hq>XalVPwH{n&)egI4iwOypGx>j_i>fE3S0UjS?fi4=%Tp~<k)<?8YYv{3=(0Kw>
zpC?<jhQVy+e5fV#q&80)W=U&U@Y;!SQoGdGaAGTQDmF{aQ$CVd%|$11mI%?V4X-F%
zP@GQe4tXlE=V1p+Cw5{bCiCtZjZ}<KN>@C9P9_0oD>%uHO#(zP5u<Q_{7&Vt@P#M{
zYK1~Ms?Alax81#~GOP9r-d^O)%`+3g{Ejs$0roCg2<!?Z<1>1VPP7WO3OZV5%T&_g
z{jI#OPp))Fs(_SYc(s0PKf1(*>eX%^5kHx`4-Su1!=hh}jsdf}OLi6KqBy)7@H!7?
z%T+*g6#KKYtE)lLZx1%}hBV?^^+4v7vIB;Z>|J%RPTJks6NNI1xCf!+Gi^Xg-LF;^
zs-zQg7VyI5ThJ*Gn6$6>ksrr=rOo_iy&lw<H0!)vi@61k_!c12E%9)!4*9LIysHo=
z)9nt4rg~O_=#*^=XJ@f%JENWIi9#L+tW(C1;4z1h9GXOmFqdX<J%A9_XI(-58Bj;h
z0&$@Ox07y?g^n~-KYAc>34Pz8@FVzGf4P?U!5pbzn<@C81STPB)B)`KG^XFB4H|1O
z&M1zo297rvfr~nfD?K652zE(ZqRhFgLqnt%5T!V++%bL#e5uF*hHJbSvBvkROD*ft
zRo5t}k{VaytJRi*$W$EMj0?<<{k$peTieb_y%fZGqt(tQ&@qO~N0DsE!a<PXH6qNE
zMJ;0e;~9>+uS>fB7M49dx&!U<NN^0O#BsFi@TI)sRN^)eoDmU1$I)Q8<s92_ygu=@
z{r#~FZc+1S4G?@Q%C;ft0|MQsrqG5sF@_28l~X?T25vGs0F`M03a6pZneqgEr<^>E
zUN?Bci%g5j)Hho>#wk<K9r0WQaL*Gy3=*-!oo+%EPNA{N*=gX`jn$*5TAQuXnoutI
zYbeI?z|SH%hvZctdAp+&@1b-W$-77%Um5Y6+e>_5r%#+ckGsZ@ypE(@j2T?EFV`-?
zI4Cen5hhxd!0{|TE|%>9aX)>9ToBv5-9tFNxN4HN4^=@tp^nOnV#YhZ|4m@?bc|m{
z(OXE~L9)RJvw8#NQ{s{LrOEdIk3;f+ItE*;Ww95zeQV2h(9eOaiSp;c@Yl>ya!TyU
z9&WyfBGuJ+em<p=D$Q!>!*ts4Kc~{)#?{McV6`%T26$;;i}2&XwmhoNSbq;`^Pm`%
zuLlY2ineIq{gLe<&ElE~whC8p@c2&Tp9G>D!zjdc`(O7ZTs{U23MH#?VF=QUL+0P&
zWi)sk99&fv2I`N+7u^@f{}&M@^nm+1s?*M}4~h`p2w|^aVLPVhabKLy?IY*Jjog7<
YyU-Y0m?MZdn*7I?_&K**Khrz#FP<eL4*&oF

delta 1740
zcmZ`(&2Jk;6yKR$+w1lED|Pxo601!==(aQ;C8ecxp)E9!pt?bYs=&b*@3h&-*)=np
zlvIg~RB@w1Xy^?}D{=9K2sqLk7ygF%2N0Zk>kW8s?8G4?w&tgK^X7f*`@J_$Pdq=I
zi?UhAfM4nNuWqmBf6Bc}as)&Z)*G<Il>9k!a&pypoO)sq!#8dio>^7al3-l9QP>PZ
zRzpE}wn~Ub)MDHQJK3f)ZigsKu;%TK!3X4@^seoK#wCs^m(A}EDyI>JA#21z6e`yb
zz*vjS2dnxrlcUxdQk1u>^3VX-aSeN5r=0%fLHV`yjpGp=blS_vaXNBM3(9KNMa*A7
z)BOks&@|ainGfMf9>Al#xS{Qa*o?!=pcs~4B(BMF(UzaP)|kK}pZGK&Ya}*SjRmqm
z?-So#CHHBsJQkEEUTHB^mg`Qr%F`Id<VlQ@0Z`5z9xb(Mf`xuBx=OHR7RKA-V}3_q
z31rAJt$!R#4yG#=bfw982{wVTMq|inmHPAnT{AJKm_9ZkC)2mSrB8^TctCo&C9Cq+
z^jy0`m7^opbfVULyx0V?(lPriuKD%2?pZtmzLCBV=vWXyQNmwZYzffldYu3@KZ!7g
z@Lz`baX7<sfs9+kHElxSU-<jp<n^#AzjtnWB{VyPfHl=zXtOP@x=hG&W^c-|Q?~6o
z@<Qgf3RXi?+^;FeI6RAxLnt6@%LxNkWW^1xz6!gJ)wfpJE+g1hb?$3FonBuY+`$uO
z{igiO{c!~N!*1ut090DU^>|6t0^cKw2EJU+e$?j35g!NeGJF*Ghw-jiZ#Fq{+wIll
z4Q;B-J1o|f=aZ;Ajqoynm)cVGt9W`D0h?e~5>z2%cXPE~Qkw2r`6zc~W(uv&AiRRm
zCt?Q0e$~3=$Fs8l7hnneSlh4(aFOI^<;Bd1oX*dab8<a@^!Rzax?ANxKqdOPH!2qk
zLvml?&_o49k5>6RsJn>pIzm4KoOazKALHhdoG<)f!K@#Xx#BPp@>%l0CA_@B!WF$&
zbZkNo`!+|)sWbx-H=@PXYx8hZP=J#Buy~%Fk`IgL+Ao5v3R~Yapi=1UytL**C7Mwk
zjy8GhQusC)_PdFDAbQCzVH4=n!jV#${&Oez9Gd7E+Wgu)*N<C@vjz*68T(~=U_WVB
z@gm-aC*&0F^|)zs-Bd2$i>LblbR5RtLK&M(C#UR)`;6B<S=p(tIHtalE2g6oapc!m
z_)WBj@gCZFzORG&Q~Af9_vdzPruWbT-rGV$zoTYBaSN7y+H^;y?1by`S@~sYoSc?V
aOH)UN(Kv;G{m0Sdf4*dC@TfUi8u=Hx9#=mA

diff --git a/osinaweb/osinacore/consumers.py b/osinaweb/osinacore/consumers.py
index 95228301..d0c0850d 100644
--- a/osinaweb/osinacore/consumers.py
+++ b/osinaweb/osinacore/consumers.py
@@ -10,7 +10,14 @@ import threading
 class OnlineUserConsumer(WebsocketConsumer):
     def connect(self):
         self.user = self.scope['user']
-
+        existing_connection = Connection.objects.filter(user=self.user).last()
+        if existing_connection:
+            self.connection = existing_connection
+            self.connection.online = True
+            self.connection.disconnected = False
+            self.connection.save()
+        else:
+            self.connection = Connection.objects.create(user=self.user, online=True)
 
         async_to_sync(self.channel_layer.group_add)(
             'online_users', self.channel_name
@@ -34,10 +41,25 @@ class OnlineUserConsumer(WebsocketConsumer):
         self.modify_online_user()
 
     def modify_online_user(self):
-
+        connections = Connection.objects.all()
+        online_connections = connections.filter(online=True)
+        offline_connections = connections.filter(online=False, last_seen__isnull=False).order_by('-last_seen')[:5]
+        sorted_connections = list(online_connections) + list(offline_connections)
+        online_users_ids = [connection.user.id for connection in online_connections]
+        customer_connections = []
+        staff_connections = []
+        for connection in sorted_connections:
+            if hasattr(connection.user, 'customerprofile'):
+                customer_connections.append(connection)
+            elif hasattr(connection.user, 'staffprofile'):
+                staff_connections.append(connection)
+
+        print(staff_connections)
         event = {
             'type': 'online_user_connection_handler',
-
+            'staff_connections': staff_connections,
+            'customer_connections': customer_connections,
+            'online_users_ids': online_users_ids
         }
         async_to_sync(self.channel_layer.group_send)(
             'online_users', event
@@ -45,13 +67,14 @@ class OnlineUserConsumer(WebsocketConsumer):
 
     def online_user_connection_handler(self, event):
         context = {
-
+            'staff_connections': event['staff_connections'],
+            'customer_connections': event['customer_connections'],
         }
         html = render_to_string("details_templates/partials/recently-online.html", context=context)
         self.send(text_data=json.dumps({
             'event_type': 'online_user_status',
             'html': html,
-
+            'online_users_ids': event.get('online_users_ids', []) 
         }))