From aab8cf69fb83c195336ef51565db846279e9d2c1 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Fri, 10 May 2024 13:44:30 +0300
Subject: [PATCH] 1.0.9 subscribe buy routines

---
 BillingApp/admin.py       | 1 +
 SubscribesApp/admin.py    | 2 +-
 SubscribesApp/funcs.py    | 7 +++++--
 SubscribesApp/js_views.py | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BillingApp/admin.py b/BillingApp/admin.py
index 1ace31e..895351e 100644
--- a/BillingApp/admin.py
+++ b/BillingApp/admin.py
@@ -21,6 +21,7 @@ class Admin_SubscribeOrder(Admin_BaseModel):
     list_display = [
         'id', 'enable',
         'user', 'subscribe', 'subscribe_for_user',
+        'bank_order_id',
         'sum', 'currency',
         'status', 'last_operation_status',
         'order', 'modifiedDT', 'createDT'
diff --git a/SubscribesApp/admin.py b/SubscribesApp/admin.py
index c11f6c8..66b2131 100644
--- a/SubscribesApp/admin.py
+++ b/SubscribesApp/admin.py
@@ -74,7 +74,7 @@ class Admin_SubscribeForUser(Admin_Trans_BaseModel):
     )
 
     list_display = [
-        'id',
+        'id', 'enable',
         'name', 'user', 'subscribe',
         'last_paid_DT', 'paid_period_from_DT', 'paid_period_to_DT',
         'auto_continue', 'receive_finish_subscribe_msg',
diff --git a/SubscribesApp/funcs.py b/SubscribesApp/funcs.py
index c22eb08..75f8abc 100644
--- a/SubscribesApp/funcs.py
+++ b/SubscribesApp/funcs.py
@@ -9,7 +9,7 @@ def get_cur_user_subscribe(user):
 
     user_subscribe = None
     try:
-        user_subscribe = SubscribeForUser.objects.get(user=user)
+        user_subscribe = SubscribeForUser.objects.get(enable=True, user=user)
     except Exception as e:
         pass
 
@@ -38,11 +38,14 @@ def check_n_enable_subscribe_by_order(order):
             'paid_period_from_DT': datetime.now(),
             'paid_period_to_DT': datetime.now() + timedelta(hours=order.subscribe.period),
             'receive_finish_subscribe_msg': True,
+            'enable': True,
         }
         subscribe_for_user = SubscribeForUser.objects.create(**kwargs)
         order.subscribe_for_user = subscribe_for_user
         order.save()
 
+        SubscribeForUser.objects.exclude(id=subscribes_for_user).update(enable=False)
+
         subscribes_for_user = [subscribe_for_user]
 
     return subscribes_for_user
@@ -89,7 +92,7 @@ def get_profile_subscribe_page_content_Dict(request):
 
 
         if not subscribes_for_user:
-            subscribes_for_user = SubscribeForUser.objects.filter(user=request.user)
+            subscribes_for_user = SubscribeForUser.objects.filter(enable=True, user=request.user)
 
         if not subscribes_for_user:
             tpl_name = 'blocks/profile/b_subscribe_variants.html'
diff --git a/SubscribesApp/js_views.py b/SubscribesApp/js_views.py
index 5389032..b7ebe1a 100644
--- a/SubscribesApp/js_views.py
+++ b/SubscribesApp/js_views.py
@@ -54,7 +54,7 @@ def subscribe_now_ajax(request):
             'paid_period_to_DT': datetime.now() + timedelta(hours=subscribe.period),
             'receive_finish_subscribe_msg': True,
         }
-        subscribe_for_user = SubscribeForUser.objects.filter(user=request.user)
+        subscribe_for_user = SubscribeForUser.objects.filter(enable=True, user=request.user)
         if subscribe_for_user:
             subscribe_for_user.update(**kwargs)
             subscribe_for_user = subscribe_for_user[0]