From 48b30a4cf09639a11c45cb75fee85808399b5af2 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Tue, 23 Apr 2024 22:01:27 +0300
Subject: [PATCH] new

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 osinaweb/.DS_Store                            | Bin 10244 -> 10244 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 5971 -> 6013 bytes
 .../migrations/0041_orderitem_active.py       |  18 +++++++++++
 .../0041_orderitem_active.cpython-310.pyc     | Bin 0 -> 667 bytes
 osinaweb/billing/models.py                    |   1 +
 .../custom_context.cpython-310.pyc            | Bin 0 -> 589 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 6981 -> 7503 bytes
 osinaweb/customercore/custom_context.py       |  12 ++++++++
 osinaweb/customercore/views.py                |  28 +++++++++++++++++-
 osinaweb/db.sqlite3                           | Bin 1081344 -> 1085440 bytes
 .../osinacore/templates/customer_index.html   |  23 ++++++--------
 .../__pycache__/settings.cpython-310.pyc      | Bin 2976 -> 3015 bytes
 osinaweb/osinaweb/settings.py                 |   1 +
 14 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 osinaweb/billing/migrations/0041_orderitem_active.py
 create mode 100644 osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc
 create mode 100644 osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc
 create mode 100644 osinaweb/customercore/custom_context.py

diff --git a/.DS_Store b/.DS_Store
index 75dd7790b45b5b589a151acd198d29d323601ee8..b4a0adb16d5eb6037d697fbef3cba8e1735b017b 100644
GIT binary patch
delta 20
bcmZp1XmQx!DadYOrlVkFY`8f<a0?#*KUoF5

delta 20
bcmZp1XmQx!DadYUuA^XNX0SOxa0?#*KTid`

diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store
index efeb95613642bba4004c364bb8ff9df667baad62..b0fc7a28c0c91bc8672248f0e2b3302d83407a1a 100644
GIT binary patch
delta 32
hcmZn(XbISmA<k}MrlVkFY`8gJ{3kz*GdW*;DgdDX32guX

delta 24
dcmZn(XbISmAwIcH$bIvA@tyo2#^m+lp#XfZ39A4A

diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc
index a20e4de8c8a09b06935f157a7b05ac8fb7384267..c02c0ccb2271f85ec1d5b3a40534a42133d39c78 100644
GIT binary patch
delta 505
zcmY*VK}#D!6rPu?o6Tl--JN7NRans!6oq;a6lqU_7CnfE_E7fHhR&q5VNDogOA#^A
zK#D~Wo@Xx}q(>X@qCY^-z4;dk{(=g9BU0!L@6CK4-}l~|`89n%?KWK3X0$qgCTct9
zF1O(rN9~#2tS}BUNkL{mIU-AYfROtSnS{Lm&>$g0`jmqQeeTdmxGV}w<hyJil2VV=
zK-i+twUV&M43<Q%*raotUsFP=m6lA^JdN@4^<+l*jG0X7vGB_N2@Cy3;Y|is@Y;O=
zWxO|ram0J#swooOn$`EM_0JOLypM&52#fjPgV#Uv#sFmhW{{31{`N;8MLRfw5BMWk
zB<3!tKpg|V6sP2RN3rQW+BsNM!h%vprPv5#JmMYrg1q<~I=EVl!!`-Gw8MOGIN*S4
z_jij=fdr=|5!H!L@}k<3Z=2P1p(=z`8{=>`-lOX_#bY-QJnF<LQ;j|9b^+gTJenK&
zt}Q*Cv?Iwit6x*O(NcBXik=M}5Z9&H)SqNA2W+ZB6%Oz+TK4seR9h$QC31D3j8o-G
LZi0v0jPid0jMQ#|

delta 474
zcmY*Tze~eV5YDA(o5UujX%l}yQ9CFOI*5utK}50QprC_fPzvuAEw+(oP;{w9u~cxn
z$wA!&M=AIxxH*VhS8>zHS@hD)_xQed-`#ij?q~RI*zgTQm+0Jo4HV`d4O@o`?A1pq
zGK*ZvUK@`TbtcnQNG1L$gOtKe;`Wv!dZl<4PqG+`pG#-p*)^#EOl8`+>ZNLuB6;a`
zX;5!!tAcT{9PpBuppQ2mWD#y45=4V?>k&GB>NhagxNO^$A&2kAG&tB}j^LKLqov8H
zN)}j+SF;a*HNM;Xpw|y)<cOMTuv_9MewjBTW&fzD9P_*odpMfBg#x}M7r@6(I}1ge
zwih#d)Ui!CFp0vcHmG0`(lYhj*tc+qGpQ-%l*+gg?RF{@1cZYakt!u10iuGxkxb(`
z6$3cMmo#&WRP!{J5BT<eewT?XX>u(&W6>&wCs=hlpi1L2_~cwe4cFZ9uFKGL5mM;!
v;`{mI5-$g$h<EN#v`)D*e05V$#}7AWg^P=DnU-7BakgVJ-fug0%+>w?4|#H4

diff --git a/osinaweb/billing/migrations/0041_orderitem_active.py b/osinaweb/billing/migrations/0041_orderitem_active.py
new file mode 100644
index 00000000..7923e958
--- /dev/null
+++ b/osinaweb/billing/migrations/0041_orderitem_active.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2024-04-23 18:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('billing', '0040_rename_due_at_orderitem_end_at_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='orderitem',
+            name='active',
+            field=models.BooleanField(default=False, null=True),
+        ),
+    ]
diff --git a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..84582786b37582c2ee98db63edc3035b6638f925
GIT binary patch
literal 667
zcmYjPO>fgc5Zw<uaiUa0Nc7AJ6bZ#a;)qZ|sJ%cr6fVB3HknDZVeK_un<{6xwm$=j
zzqD6Q`~?Imvv#2wX~y$rR`d3a*Bu>A8QJyk$D41Qu^$l}T0-E2+&`iK47g<_FL)^m
z!PyxD0rD#YiF_x&$U;JL!RF~tI?LuFOiQzEbZcDY!>DwC)~{ph(8dH#$o+x>vVsFE
z1n?~{BqqBw65wbzh6GX=T?rUpN$O>g5z!<}-u`1Cy79_bYpQK{vRpn}ss<}vqJj>U
zZk1~Q8`EN`u!307^eJ6~Ve-EfMta?v&v^PiP6OQN&bA?`I&0^W)I<d;4y9U*>BgXi
zbGk>S`npnKs%R>77Ac=8^{LagzXl<|nz*rA8}yAJxgmQAa2jVcGQ!y_=Pc@~FNLYA
z@pgOPS@VDn^x@Y&|KPFlIhMvElHxt)uhD;OU7cTOYs!ajbREGvZ`!phbLUN^^9nEf
z1a`XGx}kW9tNeCp`Q5+DX?;%*7B(zpQSY1h8b;*)K81`4ncO6);DXP1@+Z6L`{(l{
jOa_t#ta_cjy1scQW5|waPRO1Q8+$<ykom}QPaMm?!!*2D

literal 0
HcmV?d00001

diff --git a/osinaweb/billing/models.py b/osinaweb/billing/models.py
index ead54455..a96052b8 100644
--- a/osinaweb/billing/models.py
+++ b/osinaweb/billing/models.py
@@ -57,6 +57,7 @@ class Order(models.Model):
 class OrderItem(models.Model):
     order = models.ForeignKey(Order, on_delete=models.CASCADE)
     item = models.ForeignKey(Item, on_delete=models.CASCADE)
+    active = models.BooleanField(default=False, null=True)
     purchased_at = models.DateField(null=True, blank=True)
     end_at = models.DateField(blank=True, null=True)
     terminated_at =  models.DateField(blank=True, null=True)
diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..978e062c205d351ab4ad08d951d4c31e00eddadd
GIT binary patch
literal 589
zcmYjOv2N5r5Z$$XcMc-CD^egtL4`0y`~wj}3JnrUkP@0}EZ^=VtXX@_&X^GCuA|LQ
zq~n*irQ#Q;nDyPEj5M?Ro@d@0dEMdR6T$H+eSQ5Ph4>x8<4731<HQ$Sw9wLutL-WI
zOmzBFEEAnwiemDIJ47Lae4|+Df24fNIL|ool#3P{xfYFRq<>CHlQvmITHZ4r`N<}s
zY2<aXW{3M^BXzcxMn;!&cE|<<e^n%5S}QW&VL5kRgRd$zAh{NNINpA!a9E-8rYGY%
zEM`6~6BY)mdY~`Rkx?~)4)e3!;3w~{jfF6Cs|FNdm@*_5obRRkUB|&iwERHO7HODy
z_%;BNpG5t9-}_7WBPRaZ@-r`tCA6#!)|xvg-vfRn*O!;IHSNofbsxb68d9z;9h$B#
zJGdP$x~aPxw<T|3Rqo}L^RNSzavi}BI_dAi!9d0uGJx^7V|?FCK9jjz$UO54hUZ1P
uJX#rEq`Nt3od%1`#b^~Jcg)y1?*FLFc{=2$JTq8$8=o1cTyl}ir^!Ejprfb&

literal 0
HcmV?d00001

diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index 95a08adecf08e45c7712c2c3fffcb5f8dcbf9592..0537f91185998b2839666406f01f35ecb152cae4 100644
GIT binary patch
delta 3087
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
Zlwu?XDGq+Tt*4b}ytC&>=!Mvk{{qwQqW%B?

delta 2561
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
EFAn}5Y5)KL

diff --git a/osinaweb/customercore/custom_context.py b/osinaweb/customercore/custom_context.py
new file mode 100644
index 00000000..e1e7b971
--- /dev/null
+++ b/osinaweb/customercore/custom_context.py
@@ -0,0 +1,12 @@
+from billing.models import *
+from osinacore.models import *
+
+def utilities(request):
+    active_subscriptions = None
+    if request.user.is_authenticated and CustomerProfile.objects.filter(user=request.user):
+        customer = request.user.customerprofile
+        active_subscriptions = OrderItem.objects.filter(active=True, order__customer=customer)
+
+    
+
+    return {'active_subscriptions': active_subscriptions,}
diff --git a/osinaweb/customercore/views.py b/osinaweb/customercore/views.py
index 79c2ea6a..0f8582a3 100644
--- a/osinaweb/customercore/views.py
+++ b/osinaweb/customercore/views.py
@@ -10,6 +10,15 @@ import random
 import string
 
 # Create your views here.
+@customer_login_required
+def redirect_osina(request):
+    user_email = request.user.email
+    key = 'pbkdf2_sha256600000'
+    url = f"https://osimenu.com/login/{user_email}/{key}/"
+    return redirect(url)
+
+
+
 @customer_login_required
 def customer_invoices(request, *args, **kwargs):
     
@@ -223,7 +232,6 @@ def check_order_status(request, merchant_id, order_id):
                     recurring_cycle = 30
                     due_date = order_item.purchased_at + timedelta(days=recurring_cycle)
                     order_item.due_at = due_date
-                    order_item.save()
                     if order_item.item.item_type.name == 'OSIMENU':
                         api_url = 'https://osimenu.com/api/create-subscription/'
                         random_string = ''.join(random.choices(string.ascii_letters + string.digits, k=10))
@@ -243,6 +251,12 @@ def check_order_status(request, merchant_id, order_id):
                                 }
                         }
                         response = requests.post(api_url, json=api_data)
+                        order_item.active = True
+                        old_order_items = OrderItem.objects.exclude(order__id=order_id).filter(item__item_type__name='OSIMENU')
+                        for item in old_order_items:
+                            item.active = False
+                            item.save()
+                    order_item.save()
                 return redirect('orders')
             error_message = 'Failed to retrieve order details: ' + response.text
             return JsonResponse({'error': error_message}, status=500)  
@@ -281,8 +295,14 @@ def buy_free_osimenu(request):
         order = order,
         item = get_object_or_404(Item, title='OSIMENU BASIC'),
         purchased_at = datetime.now(),
+        active = True,
     )
 
+    old_order_items = OrderItem.objects.exclude(order__id=order.id).filter(item__item_type__name='OSIMENU')
+    for item in old_order_items:
+        item.active = False
+        item.save()
+
     response = requests.post(api_url, json=api_data)
     print(response)
     return redirect('customerorders')
@@ -318,8 +338,14 @@ def buy_free_osicard(request):
         order = order,
         item = get_object_or_404(Item, title='OSICARD BASIC'),
         purchased_at = datetime.now(),
+        active = True,
     )
 
+    old_order_items = OrderItem.objects.exclude(order__id=order.id).filter(item__item_type__name='OSICARD')
+    for item in old_order_items:
+        item.active = False
+        item.save()
+
     response = requests.post(api_url, json=api_data)
     print(response)
     return redirect('customerorders')
\ No newline at end of file
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 52cbfd600926b8bb36aaf8e96de0ef5fd465d88e..6948f832669e68b5b463b9bdf2efe4bbdd01901a 100644
GIT binary patch
delta 3136
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

delta 1853
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
O`FRqL(urNhpztloC;)l@

diff --git a/osinaweb/osinacore/templates/customer_index.html b/osinaweb/osinacore/templates/customer_index.html
index be7d56fb..64dd7e41 100644
--- a/osinaweb/osinacore/templates/customer_index.html
+++ b/osinaweb/osinacore/templates/customer_index.html
@@ -8,31 +8,26 @@
     <div class="w-full h-fit bg-white rounded-md shadow-md p-5">
         <h1 class="text-secondosiblue text-[25px]">Subscriptions</h1>
         <div class="w-full grid grid-cols-1 md:grid-cols-2 l:grid-cols-3 xxlg1:grid-cols-4 gap-5 mt-3">
-            <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300">
-                <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md">
-                    <img src="{% static 'images/ositcom_logos/osicardblue.png' %}" class="w-[80%] h-auto">
-                </div>
-
-                <div class="w-full h-fit rounded-b-md p-5 relative bg-gray-100">
-                    <div class="w-full flex justify-between items-start">
-                        <p class="text-secondosiblue text-[17px]">Expires in: <span class="font-semibold">2 months</span>
-                        </p>
-                    </div>
-                </div>
-            </div>
 
+            {% for subscription in active_subscriptions %}
             <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300">
                 <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md">
+                    {% if subscription.item.item_type.name == 'OSIMENU' %}
                     <img src="{% static 'images/ositcom_logos/osimenublue.png' %}" class="w-[80%] h-auto">
+                    {% elif  subscription.item.item_type.name == 'OSICARD' %}
+                    <img src="{% static 'images/ositcom_logos/osimenublue.png' %}" class="w-[80%] h-auto">
+                    {% endif %}
+                    
                 </div>
-
                 <div class="w-full h-fit rounded-b-md p-5 relative bg-gray-100">
                     <div class="w-full flex justify-between items-start">
-                        <p class="text-secondosiblue text-[17px]">Expires in: <span class="font-semibold">2 months</span>
+                        <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
                         </p>
                     </div>
                 </div>
             </div>
+            {% endfor %}
+
 
             <a href="{% url 'products' %}" class="w-full h-full">
                 <div class="w-full h-full bg-gray-50 rounded-md flex justify-center items-center py-10 px-5 shadow-md border border-gray-100 cursor-pointer hover:bg-secondosiblue duration-300 group zoom">
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
index 435f9f10d6906ed9390e93f9571fc19cda802b7c..0855606137fe53e918feb4dcc50018bd3a034173 100644
GIT binary patch
delta 62
zcmZ1=eq5X{pO=@50SMMJYNUw>Y~-8G%FJG+H2DInq;P3TW=>{FW@>SjYI13DNq%l>
R(dLb;TUZ&zC#P{+0RRlb5|;n~

delta 40
vcmX>uzCfHWpO=@50SLr?sHENI-^e$cm62`oDpu9a-&m)yGKx*^<+cI<+yDzp

diff --git a/osinaweb/osinaweb/settings.py b/osinaweb/osinaweb/settings.py
index 5f324080..a1e79046 100644
--- a/osinaweb/osinaweb/settings.py
+++ b/osinaweb/osinaweb/settings.py
@@ -78,6 +78,7 @@ TEMPLATES = [
             'context_processors': [
             
                 'osinacore.custom_context.utilities',
+                'customercore.custom_context.utilities',
                 'osinacore.custom_context.last_status',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',