diff --git a/BillingApp/funcs.py b/BillingApp/funcs.py index d94dd3d..e7ef09b 100644 --- a/BillingApp/funcs.py +++ b/BillingApp/funcs.py @@ -8,6 +8,9 @@ def get_order_status(order): from BaseModels.pay_systems.DVL_Group_kaz.api.funcs import get_order_status res_status = None + if not order or not order.bank_order_id: + return order + try: res_data = get_order_status(order.bank_order_id) diff --git a/SubscribesApp/js_views.py b/SubscribesApp/js_views.py index b7ebe1a..f969c2d 100644 --- a/SubscribesApp/js_views.py +++ b/SubscribesApp/js_views.py @@ -41,23 +41,28 @@ def subscribe_now_ajax(request): 'sum': subscribe.price, } - from BillingApp.funcs import create_subscribe_order - order = create_subscribe_order(kwargs_for_order) - if order: - return JsonResponse({'redirect_url': order.pay_page}) + subscribe_for_user = None - kwargs = { - 'user': request.user, - 'subscribe': subscribe, - 'last_paid_DT': datetime.now(), - 'paid_period_from_DT': datetime.now(), - 'paid_period_to_DT': datetime.now() + timedelta(hours=subscribe.period), - 'receive_finish_subscribe_msg': True, - } - 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] + if subscribe.price > 0: + from BillingApp.funcs import create_subscribe_order + order = create_subscribe_order(kwargs_for_order) + if order: + return JsonResponse({'redirect_url': order.pay_page}) + else: + subscribe_for_user = subscribe_user_to_null_price_subscribe(request.user) + + # kwargs = { + # 'user': request.user, + # 'subscribe': subscribe, + # 'last_paid_DT': datetime.now(), + # 'paid_period_from_DT': datetime.now(), + # 'paid_period_to_DT': datetime.now() + timedelta(hours=subscribe.period), + # 'receive_finish_subscribe_msg': True, + # } + # 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] if not subscribe_for_user: tpl_name = 'blocks/profile/b_subscribe_variants.html'