lingo/invoicing/migrations/0002_invoice.py

@@ -1,4 +1,3 @@
-import django.contrib.postgres.fields.jsonb
 import django.core.serializers.json
 import django.db.models.deletion
 from django.db import migrations, models
@@ -48,12 +47,10 @@ class Migration(migrations.Migration):
                 ('total_amount', models.DecimalField(decimal_places=2, max_digits=9)),
                 ('user_external_id', models.CharField(max_length=250)),
                 ('payer_external_id', models.CharField(max_length=250)),
-                ('event', django.contrib.postgres.fields.jsonb.JSONField(default=dict)),
+                ('event', models.JSONField(default=dict)),
                 (
                     'pricing_data',
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
-                        default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder
-                    ),
                 ),
                 (
                     'status',
@@ -110,12 +107,10 @@ class Migration(migrations.Migration):
                 ('total_amount', models.DecimalField(decimal_places=2, max_digits=9)),
                 ('user_external_id', models.CharField(max_length=250)),
                 ('payer_external_id', models.CharField(max_length=250)),
-                ('event', django.contrib.postgres.fields.jsonb.JSONField(default=dict)),
+                ('event', models.JSONField(default=dict)),
                 (
                     'pricing_data',
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
-                        default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder
-                    ),
                 ),
                 (
                     'status',

lingo/invoicing/models.py

@@ -19,7 +19,6 @@ import sys
 import traceback
 
 from django.contrib.auth.models import Group
-from django.contrib.postgres.fields import JSONField
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import connection, models, transaction
 from django.utils.formats import date_format
@@ -376,8 +375,8 @@ class AbstractInvoiceLine(models.Model):
     payer_last_name = models.CharField(max_length=250)
     payer_demat = models.BooleanField(default=False)
     payer_direct_debit = models.BooleanField(default=False)
-    event = JSONField(default=dict)
+    event = models.JSONField(default=dict)
-    pricing_data = JSONField(default=dict, encoder=DjangoJSONEncoder)
+    pricing_data = models.JSONField(default=dict, encoder=DjangoJSONEncoder)
     status = models.CharField(
         max_length=10,
         choices=[

lingo/invoicing/views.py

@@ -19,9 +19,8 @@ import datetime
 import json
 
 from django.contrib import messages
-from django.contrib.postgres.fields import JSONField
 from django.db import transaction
-from django.db.models import CharField, Count, IntegerField, OuterRef, Subquery, Value
+from django.db.models import CharField, Count, IntegerField, JSONField, OuterRef, Subquery, Value
 from django.db.models.functions import Coalesce
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect

lingo/pricing/migrations/0002_pricing.py

@@ -1,4 +1,3 @@
-import django.contrib.postgres.fields.jsonb
 import django.db.models.deletion
 from django.db import migrations, models
 
@@ -114,7 +113,7 @@ class Migration(migrations.Migration):
                 ),
                 ('date_start', models.DateField()),
                 ('date_end', models.DateField()),
-                ('pricing_data', django.contrib.postgres.fields.jsonb.JSONField(null=True)),
+                ('pricing_data', models.JSONField(null=True)),
                 (
                     'agenda',
                     models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='agendas.Agenda'),

lingo/pricing/migrations/0003_extra_variables.py

@@ -1,5 +1,4 @@
-import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
-from django.db import migrations
 
 
 class Migration(migrations.Migration):
@@ -12,6 +11,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='pricing',
             name='extra_variables',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
+            field=models.JSONField(blank=True, default=dict),
         ),
     ]

lingo/pricing/migrations/0011_payer_variables.py

@@ -1,5 +1,4 @@
-import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
-from django.db import migrations
 
 
 class Migration(migrations.Migration):
@@ -12,6 +11,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='pricing',
             name='payer_variables',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict),
+            field=models.JSONField(blank=True, default=dict),
         ),
     ]

lingo/pricing/models.py

@@ -20,7 +20,6 @@ import datetime
 import decimal
 from typing import List
 
-from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.template import Context, RequestContext, Template, TemplateSyntaxError, VariableDoesNotExist
 from django.utils.text import slugify
@@ -198,8 +197,8 @@ class Pricing(models.Model):
         through='PricingCriteriaCategory',
     )
     criterias = models.ManyToManyField(Criteria)
-    extra_variables = JSONField(blank=True, default=dict)
+    extra_variables = models.JSONField(blank=True, default=dict)
-    payer_variables = JSONField(blank=True, default=dict)
+    payer_variables = models.JSONField(blank=True, default=dict)
 
     class Meta:
         ordering = ['label']
@@ -417,7 +416,7 @@ class AgendaPricing(models.Model):
     date_end = models.DateField(_('End date'))
     flat_fee_schedule = models.BooleanField(_('Flat fee schedule'), default=False)
     subscription_required = models.BooleanField(_('Subscription is required'), default=True)
-    pricing_data = JSONField(null=True)
+    pricing_data = models.JSONField(null=True)
 
     def __str__(self):
         return self.label or self.pricing.label

lingo/settings.py

@@ -117,6 +117,8 @@ DATABASES = {
     }
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Internationalization
 
 LANGUAGE_CODE = 'fr-fr'