From c20dbfc6c23f41cad0f7b37d4891b9fb1c74ca40 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 11 Jul 2024 16:21:09 +0300
Subject: [PATCH] new

---
 .../__pycache__/views.cpython-310.pyc         | Bin 7471 -> 7686 bytes
 .../templates/products/osicard-plans.html     |  61 ++++++++++++++----
 osinaweb/customercore/views.py                |  11 ++++
 osinaweb/db.sqlite3                           | Bin 1560576 -> 1560576 bytes
 4 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index fa6a0b83fbdef500ad68bbdb568bf7da39dc2550..00340c908d487c0f2dec9200f31a60e4fdb39507 100644
GIT binary patch
delta 569
zcmZ2))n>z&&&$ij00iYX`_sC#Hu6~tPX5N%#mQE~Uc*ttQo}mAlV7IZ*)hmP!O1b$
z)43=OsJ2SLAIJoW1&28Lxd0he{4kM#AXi_{P~VWE44^_ywxT>BRg@1R3V_5df&Ajk
z<iw(s_~Mepyc8hg7C%g+peQvrvosg1u1dO~C_kk%xujShC_VXzpeQ5P<XeLBY$YI*
zN+;hI(4H(N#IGa+<O(qhF$yt?fguwM6C(_={o>&&Dx2&mraC!FD2Vay<h{aDll_I|
zCqEPN<9-e@M-@a=fK}WP;+mW%?8p5PE?&9$xbT0*$rnWB*cw2Bjgu#GN(k~N7bNDT
z=EUb@Ca2~VrxyR7EG(wW*aS4AkXwooW@a<k%tvB=+^TS~7ND5OWPkBbjIEQMB;2{%
zK!&!1h>pn<g@q?Cmk?kyoV-Iqk+Bb~@}0y?-d3P=6>Dipnyy7r+vF*d0gPRfpGx{l
zbOXgTS&Bq~)Gd~j#FE4!uxWx|gJPw`8J#DWN+~kV06SxkR1$YM+!-?`Yf3+4oG_VN
rCPl9dWP3S?r~na_AfgFGG=qp15YY!BW`Ky9ljq75GfGSrl$8Sjjsclw

delta 502
zcmZp(S#QOc&&$ij00b^kt!cZ}H}Y8u`m+JKtU&A!#Kks1qJ$xfF^egMF@>p@aRKu}
zhFazl7LZ5{Ll$cmTMcsxa|%l@b1h2>YYj^#V=Ze5dksShTMcV7b1;J@`{WOTq8uSb
z89;-I@+PMUsWGxm?iP|~%$q!sQ)2RUAz=ZK1B95x7+IKE{`0UDl}z3!DKc3>IGOtr
zNRKLrC<TihU=^HfEy6W<udpBY9k^T>l3WD$Gq`y9=6NFj8QCg80+o|ziYZM#DyG8t
zVe%_6UB(8u9$RrAZhl6XJ&kbjo#KAnQgHDmu(+DUC&uQ<l9KM+Eg(Z%K}6eRMQP#5
zb&>*%YLojV6&ZVgD%bKh1Es21OH0ypEs9zuXG;Yzc1+$Q<ty9?6xU=a5(QGXSW*&8
z5`nTZ()x@RlYOKW8K=Q*pDdlk?E|-c`Xrf$jD3?I$)p&Ufb1*<5oI8v97HsLh(-|6
b1R{Ds#552w9Yjci9oQoq&B#0Xg{&L^Xjy+_

diff --git a/osinaweb/customercore/templates/products/osicard-plans.html b/osinaweb/customercore/templates/products/osicard-plans.html
index 3970454f..b2eb9aaf 100644
--- a/osinaweb/customercore/templates/products/osicard-plans.html
+++ b/osinaweb/customercore/templates/products/osicard-plans.html
@@ -127,12 +127,18 @@
                         <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$6/month</p>
                     </div>
 
-                    <a href="">
+                    {% if not active_order_item_standard %}
+                    <a  href="{% url 'buynow' osicard_standard.id %}">
                         <button
                             class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
                             Started
                         </button>
                     </a>
+                    {% else %}
+                    <button
+                        class="w-fit px-9 py-2 bg-white border border-green-700 text-green-700 uppercase cursor-default">Currently
+                        Subscribed</button>
+                    {% endif %}
 
                     <div class="w-full flex flex-col gap-3 mt-5">
                         <h1 class="text-gray-500 text-[17px] font-light">Features:</h1>
@@ -214,19 +220,25 @@
             </div>
 
             <div
-                class="w-full h-full border border-gray-200 p-9 flex flex-col gap-5 items-center  {% if active_order_item_basic %} bg-black bg-opacity-20 {% endif %}">
+                class="w-full h-full border border-gray-200 p-9 flex flex-col gap-5 items-center  {% if active_order_item_premium %} bg-black bg-opacity-20 {% endif %}">
                 <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Business</p>
 
                 <div class="w-full flex flex-col justify-center items-center">
                     <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$25/month</p>
                 </div>
 
-                <a href="{% url 'buyfreeosicard' %}">
+                {% if not active_order_item_premium %}
+                    <a  href="{% url 'buynow' osicard_premium.id %}">
+                        <button
+                            class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
+                            Started
+                        </button>
+                    </a>
+                {% else %}
                     <button
-                        class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
-                        Started
-                    </button>
-                </a>
+                    class="w-fit px-9 py-2 bg-white border border-green-700 text-green-700 uppercase cursor-default">Currently
+                    Subscribed</button>
+                {% endif %}
 
                 <div class="w-full flex flex-col gap-3 mt-5">
                     <h1 class="text-gray-500 text-[17px] font-light">Features:</h1>
@@ -311,19 +323,26 @@
         <!-- PRICING ON MOBILE -->
         <div class="w-full flex l:hidden flex-col gap-10 mt-10">
             <div>
-                <div class="w-full p-9 border border-gray-200 flex flex-col items-center gap-5 rounded-t-md">
+                <div class="w-full p-9 border border-gray-200 flex flex-col items-center gap-5 rounded-t-md {% if active_order_item_basic %} bg-black bg-opacity-20 {% endif %}">
                     <p class="text-secondosiblue uppercase font-poppinsBold text-xl text-center">Basic</p>
 
                     <div class="w-full flex flex-col justify-center items-center">
                         <p class="text-osiblue font-poppinsLight text-xl font-semibold">$0/month</p>
                     </div>
 
-                    <a href="">
+                    {% if not active_order_item_basic %}
+                        <a href="{% url 'buyfreeosicard' %}">
+                            <button
+                                class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
+                                Started
+                            </button>
+                        </a>
+                    {% else %}
                         <button
-                            class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
-                            Started
+                            class="w-fit px-9 py-2 bg-white border border-green-700 text-green-700 uppercase cursor-default">
+                            Currently Subscribed
                         </button>
-                    </a>
+                    {% endif %}
                 </div>
 
                 <div
@@ -420,12 +439,19 @@
                         <p class="text-osiblue font-poppinsLight text-xl font-semibold">$6/month</p>
                     </div>
 
-                    <a href="">
+                    {% if not active_order_item_standard %}
+                    <a href="{% url 'buynow' osicard_standard.id %}">
                         <button
                             class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
                             Started
                         </button>
                     </a>
+                    {% else %}
+                        <button
+                            class="w-fit px-9 py-2 bg-white border border-green-700 text-green-700 uppercase cursor-default">
+                            Currently Subscribed
+                    </a>
+                    {% endif %}
                 </div>
 
                 <div
@@ -518,12 +544,19 @@
                         <p class="text-osiblue font-poppinsLight text-2xl font-semibold">$25/month</p>
                     </div>
 
-                    <a href="">
+                    {% if not active_order_item_premium %}
+                    <a href="{% url 'buynow' osicard_premium.id %}">
                         <button
                             class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
                             Started
                         </button>
                     </a>
+                    {% else %}
+                        <button
+                            class="w-fit px-9 py-2 bg-white border border-green-700 text-green-700 uppercase cursor-default">
+                            Currently Subscribed
+                    </a>
+                    {% endif %}
                 </div>
 
                 <div
diff --git a/osinaweb/customercore/views.py b/osinaweb/customercore/views.py
index cdfa0ed7..b34a2a9a 100644
--- a/osinaweb/customercore/views.py
+++ b/osinaweb/customercore/views.py
@@ -197,10 +197,21 @@ def osimenu_plans(request, *args, **kwargs):
 def osicard_plans(request, *args, **kwargs):
 
     osicard_basic = Item.objects.filter(title='OSICARD BASIC').first()
+    osicard_standard = Item.objects.filter(title='OSICARD STANDARD').first()
+    osicard_premium= Item.objects.filter(title='OSICARD PREMIUM').first()
     active_order_item_basic = OrderItem.objects.filter(order__customer=request.user.customerprofile, item=osicard_basic, active=True)
+    active_order_item_standard = OrderItem.objects.filter(order__customer=request.user.customerprofile, item=osicard_standard, active=True)
+    active_order_item_premium = OrderItem.objects.filter(order__customer=request.user.customerprofile, item=osicard_premium, active=True)
+    
     
     context = {
         'active_order_item_basic': active_order_item_basic,  
+        'active_order_item_standard': active_order_item_standard,
+        'active_order_item_premium': active_order_item_premium,
+        'osicard_standard': osicard_standard,
+        'osicard_premium': osicard_premium,
+        'active_order_item_premium': active_order_item_premium,
+
     }
 
     return render(request, 'products/osicard-plans.html', context)
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 74b15379289a47bdf9959f0f82969926640590a4..1d2e9538ac786c1bf431cdb8f6ca4971f9218956 100644
GIT binary patch
delta 1150
zcmah{eM}p57`~6*U5}&pw!pzApdI2gWo_=RcRjA#AFBf*VSEU~>5`?aWg=g_T8aZQ
zH?|on36d(&OD4&PF~MXbY!*G8XvW+WGaWM;OxR}pz-R&)XiSXyk3Y~Dvw!^KNq+g|
zeV+Gu-{&2i2oFw#(}no_i$#0z`3o&Y9^93A*7F07>zU||$8ek)yXYOmAyemjT?fe@
zl$4<8_bG~~%UTA1>RpCMfBvAV_(Z*2E|*Tt8>x8%M<5VLYu>Q!S})>Y7K7hl6&B$d
zd<1ha3qQioa070_&5Y~(IGD2r^^l$3#@I*<ht#S;A<zhnwQAV6h)7{-L*W-#fv*tn
z6Ih1J@E**-6igw77r>mFwkugQ@d`~6IAKC+W!jFwS}W68ThloV3}dhcU&Cjp_gOd%
z!&d%ot_NKFb2^O`;uuyhE21a{O03iMT!%B8fdvdTxs5C@n0yOYY<XL_*MOl(oG2l5
zbJ5^@JO!l~d<k#BQD}ft<Rb?NkIOuEoV&;A4~lwF)_j_%E1F8^R>N^_#)&AmG5CFR
z5TuSM*ETefW!+^hpW#M6-B{>9OO^w&Y#r;$9wL$dMGXFcU*Qh?1mD3eShVuv*_XhK
z-<Rtd8q9us&@o`_M^rheN<LB5BvmUJ0tUmeke#iPMOpERnpcwC8zHJeMfL^!ims{K
zh8zsWZWP^BgF-F$>8dIPB<u4vhkt@RNN6UL<|obbX+F=ooaXECQhOn`J(6tgNNVkx
zl;~|s9zGK2Ywd4;G7^hN`nnRGs@86)FYycS7jlkC46Z^axcLwHQ9jHEc-pb(nB@O-
zymct+VJ?%7R}t3aL1@Gur2O{-i+LS5ixGwOP1SosjTP>ueWAJv^k50IAz`%kMw2Ob
z7!aJ6JM3D%VOwUeV5aDDE)nb%^8+WfYF(FdUZt(h@|-8|&E!O$GB4c9n@f!Za}aW^
zkziimRdN?2zsv}|Hb%BTpE(hKlivOSSxXGWl$hQlAMQNT6EXVxVu!kWqFsqZM<hAW
z)+UPy+-p6~2-EKr+p>qbNY+j^pIK-6=|*aYjV8XqFJfc-l4EA<MBK2(E(vaj2Rm7E
z(o5BzY6|_Iw7GjLE0|jrgfrF2=z-wgXmhN)p*P@f>eOnyUHh7=9(hKojy}D=+32mS
zJx~|ZAFbP4SyL0QM85t`T2?oc{_iC%T^Bqq+q$g`GmGN(ZgXuyD6mEwatYiT{Z_bx
z6Sgw*==Z`DO_40YQ<k(We6f=h$#W*-&JPphIkcJzvbb`bVlkJOEyLN6q}~;d8Jf#0
jDERl#{6W9&^OtJ@xm+K&nF}B1-J23h^DUvYVCC#z^w(d&

delta 1224
zcmaiye{2(F7{~9f*Iw7I_q1aj5(aiKe@$B7yY_m!LlerjZtMqJx3QHadUV~fUDxi)
z+I4kN#*auL!8u%{2?5<7Br_q)B!!&fOaOyoP{BxMg3~C>#AJk_Au$^N@D^jDf0-wr
z_n+r|zu#}(=Q%Jf9hjCT*W+hSl-J;A&hII&!tI4utA4`q>Oyo&7mkxtm)ui0UD)Y4
zD*)m}U$w{z9xu-`JX632KA>nu<a{FI^>9ew5ITHa&0SY<9YV*TU02EHAC_BS9)sWD
zJ}kfu_yn%NJp2N;;M>(IINm!A`FYj&wAorg!JnA%@!WmYsAJNhwEL?0F{CTZt}6Tr
z%kYi<@-w&!AHoHgT`gVVb;!@onSB-;adK6{M4Zem&zW_KwB<R=y2%m~oWfuQzK1V#
z?{jd9eoZUeW=(+u!&o0eh;!=)yAi`M?NqBZX1ADN0fQy@4i@tEJ=P7{vwN&(fzta-
z1+gx_pjth}B(!008{UOipiR%P4Yam#>jk@oge44qU(I^aUa|n%(mU4UpVO?!`bDqc
z@u6yg@oW3z#YYT!tVIm|fJg8EeulfS2<Nr3WbtJ%=|)uqmRlSz))vQYZ>!y`=tUyu
z^#}s*W4TR7^ei|QC^83G#QNNbcQcGjpAW~14C6s8&mn)s5gUaSVF7c|zwR)93vnKv
zV+7W(eYIlqP8(h#9C>Pzo+%|9WRo#V?lX1}ywPnmlXuB^?dl}midQ~iXd$9|qX~H=
zn@Ntvvin98qbc5>P0Fdgnf?)miARvey-DBvXuZWYgTXZz1Q-1=JwZ#fpElVRY%_XY
zj99i?3zNwpq0PJq?f6qwUck*bvA$dGO(|*Fm53-qX?Z9z6qQHIDu|OE@^D6p$~l(=
zI(E$^IhJmb_lj;{8gkg*Aa$+V25qpqWH(Ml<B?SAg-!YMi=|g`$HfwzHQI5pG<(gk
zl?uN_IY&tIQS;Hl!Q@5L<|jvE1M-kCI6T(Zn^k(#3ZIHcRYmUSRV5LNGHHB^7N(qY
z?{6>^AG7vawicC952=?;?Zz#niTDA(giX<RY=x<VNmZM=>~z`24{bi=Hntqz75Kkz
z^2m+Zu2@}NYkw>dYL}&sboY?j+0?Kr8P2qZ>UaB9e@&vZLrKLN`oeVs5x*q61!-(Y
ztXEE<-gtL7+TJs^GmcPFaJM&gBE+N4k@$GM6ig<Y!#&**zDbJoGa)W0Gz@ayW_PV3
z52N9}Fca9p)+sghsI#>{lu&D0>+0JEgTrH)aEoryqtwY#ZAT!HZfR^%whyC*u1u}e
z8Hx1?B9m%Qr3S=AS47yw?`8Kfq3uCM2?;%op&eb#TrH9V&m{dd!8F^PjCM$wCcfpL
ztz$WtzIFfE{ySefs~qGC$zb{Nq&bmanRc$#Cfe2zxHj>l^8udUf6qC4qRp%^OU|#i
k8lE#e%2Tc~Ngv#V!62L_^EW>&-I#M$mTAt)wae%J0^(bWHvj+t