entrouvert
/
lingo
15
0
Fork 0
Code Issues Pull Requests 7 Releases Wiki Activity

misc: remove some warnings (#75591) #37

Merged
lguerin merged 1 commits from wip/75591-remove-dj32-warnings into main 2023-03-21 15:00:45 +01:00
Conversation 0 Commits 1 Files Changed 8 +17 -26
8 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lingo/invoicing/migrations/0002_invoice.py
View File

@ -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(
default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder
),
models.JSONField(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(
default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder
),
models.JSONField(default=dict, encoder=django.core.serializers.json.DjangoJSONEncoder),
),
(
'status',

5
lingo/invoicing/models.py
View File

@ -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)
pricing_data = JSONField(default=dict, encoder=DjangoJSONEncoder)
event = models.JSONField(default=dict)
pricing_data = models.JSONField(default=dict, encoder=DjangoJSONEncoder)
status = models.CharField(
max_length=10,
choices=[

3
lingo/invoicing/views.py
View File

@ -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

3
lingo/pricing/migrations/0002_pricing.py
View File

@ -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'),

5
lingo/pricing/migrations/0003_extra_variables.py
View File

@ -1,5 +1,4 @@
import django.contrib.postgres.fields.jsonb
from django.db import migrations
from django.db import migrations, models
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),
),
]

5
lingo/pricing/migrations/0011_payer_variables.py
View File

@ -1,5 +1,4 @@
import django.contrib.postgres.fields.jsonb
from django.db import migrations
from django.db import migrations, models
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),
),
]

7
lingo/pricing/models.py
View File

@ -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)
payer_variables = JSONField(blank=True, default=dict)
extra_variables = models.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

2
lingo/settings.py
View File

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