mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add a 5 min trial period to subscriptions for test purposes iff

Browse source 
ADD_TRIAL_PERIOD_TO_SUBSCRIPTION is set to true
This commit is contained in:
PCoder 2019-07-18 09:35:57 +05:30
parent 9b798b4376
commit 9b3e292598
5 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
datacenterlight/tests.py
View file

@ -1,6 +1,7 @@
# from django.test import TestCase
import datetime
from time import sleep
from unittest import skipIf
import stripe
from celery.result import AsyncResult
@ -8,7 +9,6 @@ from django.conf import settings
from django.core.management import call_command
from django.test import TestCase, override_settings
from model_mommy import mommy
from unittest import skipIf
from datacenterlight.models import VMTemplate
from datacenterlight.tasks import create_vm_task
@ -119,7 +119,8 @@ class CeleryTaskTestCase(TestCase):
subscription_result = self.stripe_utils.subscribe_customer_to_plan(
stripe_customer.stripe_id,
[{"plan": stripe_plan.get(
'response_object').stripe_plan_id}])
'response_object').stripe_plan_id}],
int(datetime.datetime.now().timestamp()) + 300 if settings.ADD_5MIN_TRIAL_TO_SUBSCRIPTION else None)
stripe_subscription_obj = subscription_result.get('response_object')
# Check if the subscription was approved and is active
if stripe_subscription_obj is None \

5
datacenterlight/views.py
View file

@ -1,3 +1,4 @@
import datetime
import logging
from django import forms
@ -785,7 +786,9 @@ class OrderConfirmationView(DetailView, FormView):
subscription_result = stripe_utils.subscribe_customer_to_plan(
stripe_api_cus_id,
[{"plan": stripe_plan.get(
'response_object').stripe_plan_id}])
'response_object').stripe_plan_id}],
int(datetime.datetime.now().timestamp()) + 300 if settings.ADD_5MIN_TRIAL_TO_SUBSCRIPTION else None
)
stripe_subscription_obj = subscription_result.get('response_object')
# Check if the subscription was approved and is active
if (stripe_subscription_obj is None

1
dynamicweb/settings/base.py
View file

@ -724,6 +724,7 @@ X_FRAME_OPTIONS = ('SAMEORIGIN' if X_FRAME_OPTIONS_ALLOW_FROM_URI is None else
INVOICE_WEBHOOK_SECRET = env('INVOICE_WEBHOOK_SECRET')
DEBUG = bool_env('DEBUG')
ADD_TRIAL_PERIOD_TO_SUBSCRIPTION = bool_env('ADD_TRIAL_PERIOD_TO_SUBSCRIPTION')
READ_VM_REALM = env('READ_VM_REALM')
AUTH_NAME = env('AUTH_NAME')

3
hosting/views.py
View file

@ -1034,7 +1034,8 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
subscription_result = stripe_utils.subscribe_customer_to_plan(
stripe_api_cus_id,
[{"plan": stripe_plan.get(
'response_object').stripe_plan_id}])
'response_object').stripe_plan_id}],
int(datetime.datetime.now().timestamp()) + 300 if settings.ADD_5MIN_TRIAL_TO_SUBSCRIPTION else None)
stripe_subscription_obj = subscription_result.get('response_object')
# Check if the subscription was approved and is active
if (stripe_subscription_obj is None or

9
utils/tests.py
View file

@ -1,5 +1,7 @@
import datetime
import uuid
from time import sleep
from unittest import skipIf
from unittest.mock import patch
import stripe
@ -8,7 +10,6 @@ from django.conf import settings
from django.http.request import HttpRequest
from django.test import Client
from django.test import TestCase, override_settings
from unittest import skipIf
from model_mommy import mommy
from datacenterlight.models import StripePlan
@ -231,7 +232,8 @@ class StripePlanTestCase(TestStripeCustomerDescription):
result = self.stripe_utils.subscribe_customer_to_plan(
stripe_customer.stripe_id,
[{"plan": stripe_plan.get(
'response_object').stripe_plan_id}])
'response_object').stripe_plan_id}],
int(datetime.datetime.now().timestamp()) + 300 if settings.ADD_5MIN_TRIAL_TO_SUBSCRIPTION else None)
self.assertIsInstance(result.get('response_object'),
stripe.Subscription)
self.assertIsNone(result.get('error'))
@ -247,7 +249,8 @@ class StripePlanTestCase(TestStripeCustomerDescription):
result = self.stripe_utils.subscribe_customer_to_plan(
stripe_customer.stripe_id,
[{"plan": stripe_plan.get(
'response_object').stripe_plan_id}])
'response_object').stripe_plan_id}],
int(datetime.datetime.now().timestamp()) + 300 if settings.ADD_5MIN_TRIAL_TO_SUBSCRIPTION else None)
self.assertIsNone(result.get('response_object'), None)
self.assertIsNotNone(result.get('error'))