1.0.9 subscribe buy routines
This commit is contained in:
@@ -21,6 +21,7 @@ class Admin_SubscribeOrder(Admin_BaseModel):
|
|||||||
list_display = [
|
list_display = [
|
||||||
'id', 'enable',
|
'id', 'enable',
|
||||||
'user', 'subscribe', 'subscribe_for_user',
|
'user', 'subscribe', 'subscribe_for_user',
|
||||||
|
'bank_order_id',
|
||||||
'sum', 'currency',
|
'sum', 'currency',
|
||||||
'status', 'last_operation_status',
|
'status', 'last_operation_status',
|
||||||
'order', 'modifiedDT', 'createDT'
|
'order', 'modifiedDT', 'createDT'
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class Admin_SubscribeForUser(Admin_Trans_BaseModel):
|
|||||||
)
|
)
|
||||||
|
|
||||||
list_display = [
|
list_display = [
|
||||||
'id',
|
'id', 'enable',
|
||||||
'name', 'user', 'subscribe',
|
'name', 'user', 'subscribe',
|
||||||
'last_paid_DT', 'paid_period_from_DT', 'paid_period_to_DT',
|
'last_paid_DT', 'paid_period_from_DT', 'paid_period_to_DT',
|
||||||
'auto_continue', 'receive_finish_subscribe_msg',
|
'auto_continue', 'receive_finish_subscribe_msg',
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ def get_cur_user_subscribe(user):
|
|||||||
|
|
||||||
user_subscribe = None
|
user_subscribe = None
|
||||||
try:
|
try:
|
||||||
user_subscribe = SubscribeForUser.objects.get(user=user)
|
user_subscribe = SubscribeForUser.objects.get(enable=True, user=user)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -38,11 +38,14 @@ def check_n_enable_subscribe_by_order(order):
|
|||||||
'paid_period_from_DT': datetime.now(),
|
'paid_period_from_DT': datetime.now(),
|
||||||
'paid_period_to_DT': datetime.now() + timedelta(hours=order.subscribe.period),
|
'paid_period_to_DT': datetime.now() + timedelta(hours=order.subscribe.period),
|
||||||
'receive_finish_subscribe_msg': True,
|
'receive_finish_subscribe_msg': True,
|
||||||
|
'enable': True,
|
||||||
}
|
}
|
||||||
subscribe_for_user = SubscribeForUser.objects.create(**kwargs)
|
subscribe_for_user = SubscribeForUser.objects.create(**kwargs)
|
||||||
order.subscribe_for_user = subscribe_for_user
|
order.subscribe_for_user = subscribe_for_user
|
||||||
order.save()
|
order.save()
|
||||||
|
|
||||||
|
SubscribeForUser.objects.exclude(id=subscribes_for_user).update(enable=False)
|
||||||
|
|
||||||
subscribes_for_user = [subscribe_for_user]
|
subscribes_for_user = [subscribe_for_user]
|
||||||
|
|
||||||
return subscribes_for_user
|
return subscribes_for_user
|
||||||
@@ -89,7 +92,7 @@ def get_profile_subscribe_page_content_Dict(request):
|
|||||||
|
|
||||||
|
|
||||||
if not subscribes_for_user:
|
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:
|
if not subscribes_for_user:
|
||||||
tpl_name = 'blocks/profile/b_subscribe_variants.html'
|
tpl_name = 'blocks/profile/b_subscribe_variants.html'
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ def subscribe_now_ajax(request):
|
|||||||
'paid_period_to_DT': datetime.now() + timedelta(hours=subscribe.period),
|
'paid_period_to_DT': datetime.now() + timedelta(hours=subscribe.period),
|
||||||
'receive_finish_subscribe_msg': True,
|
'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:
|
if subscribe_for_user:
|
||||||
subscribe_for_user.update(**kwargs)
|
subscribe_for_user.update(**kwargs)
|
||||||
subscribe_for_user = subscribe_for_user[0]
|
subscribe_for_user = subscribe_for_user[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user