More production updates/fixes #97

Merged
mattn merged 3 commits from matt/prod into main 2023-03-29 16:42:44 +13:00
8 changed files with 32 additions and 5 deletions
Showing only changes of commit c980479d6c - Show all commits

View file

@ -1,3 +1,4 @@
__pycache__/
staticfiles/
media/
*.pyc

View file

@ -8,6 +8,6 @@ gunicorn==20.1.0
pandas==1.5.3
pdfkit==1.0.0
PyPDF2==1.28.6
redis==4.5.1
redis==4.5.3
celery[redis]==5.2.7
stripe==5.2.0

View file

@ -0,0 +1,3 @@
from .celery import app as celery_app
__all__ = ("celery_app",)

View file

@ -1,5 +1,10 @@
import os
from celery import Celery
app = Celery('righttree')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'right_tree.settings')
app = Celery('right_tree')
app.config_from_object('django.conf:settings', namespace='CELERY')
app.autodiscover_tasks()

View file

@ -0,0 +1,19 @@
# Generated by Django 3.2.17 on 2023-03-29 03:36
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('api', '0015_auto_20230306_1620'),
]
operations = [
migrations.AlterField(
model_name='activationkey',
name='key_set',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='api.activationkeyset'),
),
]

View file

@ -222,7 +222,7 @@ class ActivationKey(models.Model):
)
key = models.CharField(max_length=20, unique=True, default=key_default)
key_set = models.ForeignKey(ActivationKeySet, on_delete=models.CASCADE, null=True)
key_set = models.ForeignKey(ActivationKeySet, on_delete=models.PROTECT, null=True)
remaining_activations = models.SmallIntegerField(default=1)
creation_date = models.DateTimeField(auto_now_add=True)

View file

@ -239,7 +239,7 @@ def purchase_key(request):
invoice_creation={
'enabled': True,
'invoice_data': {
'description': f'Your product code is {key}',
'description': f'Your activation key is {key}',
'rendering_options': {'amount_tax_display': 'include_inclusive_tax'},
'footer': 'BioSphere Capital Limited',
},

View file

@ -11,7 +11,6 @@ https://docs.djangoproject.com/en/3.2/ref/settings/
"""
import os
import stripe
from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.