1.1.13 not send to pay system if subscribe price is null

This commit is contained in:
SDE
2024-06-05 12:03:00 +03:00
parent 90405f64de
commit 3a235b4f60
2 changed files with 24 additions and 16 deletions

View File

@@ -8,6 +8,9 @@ def get_order_status(order):
from BaseModels.pay_systems.DVL_Group_kaz.api.funcs import get_order_status from BaseModels.pay_systems.DVL_Group_kaz.api.funcs import get_order_status
res_status = None res_status = None
if not order or not order.bank_order_id:
return order
try: try:
res_data = get_order_status(order.bank_order_id) res_data = get_order_status(order.bank_order_id)

View File

@@ -41,23 +41,28 @@ def subscribe_now_ajax(request):
'sum': subscribe.price, 'sum': subscribe.price,
} }
subscribe_for_user = None
if subscribe.price > 0:
from BillingApp.funcs import create_subscribe_order from BillingApp.funcs import create_subscribe_order
order = create_subscribe_order(kwargs_for_order) order = create_subscribe_order(kwargs_for_order)
if order: if order:
return JsonResponse({'redirect_url': order.pay_page}) return JsonResponse({'redirect_url': order.pay_page})
else:
subscribe_for_user = subscribe_user_to_null_price_subscribe(request.user)
kwargs = { # kwargs = {
'user': request.user, # 'user': request.user,
'subscribe': subscribe, # 'subscribe': subscribe,
'last_paid_DT': datetime.now(), # 'last_paid_DT': datetime.now(),
'paid_period_from_DT': datetime.now(), # 'paid_period_from_DT': datetime.now(),
'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(enable=True, 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]
if not subscribe_for_user: if not subscribe_for_user:
tpl_name = 'blocks/profile/b_subscribe_variants.html' tpl_name = 'blocks/profile/b_subscribe_variants.html'