Skip to content

Fix Django JSONField module #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v26 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Django JSONField module #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
---------

1.4.1 (2022-09-13)
------------------
* Fix JSONField module for django>=3.1

1.4.0 (2022-08-17)
------------------
* Add Django 4.0 support
Expand Down
2 changes: 1 addition & 1 deletion atol/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.3.4'
__version__ = '1.4.1'
3 changes: 1 addition & 2 deletions atol/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Generated by Django 1.11.3 on 2017-11-27 20:43
from __future__ import unicode_literals

import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import uuid

Expand All @@ -26,7 +25,7 @@ class Migration(migrations.Migration):
('failed_at', models.DateTimeField(blank=True, null=True, verbose_name='Дата ошибки')),
('status', models.CharField(choices=[('created', 'Ожидает инициации в системе оператора'), ('initiated', 'Иницирован в системе оператора'), ('received', 'Получен от оператора'), ('no_email_phone', 'Отсутствует email/phone'), ('failed', 'Ошибка')], default='created', max_length=16, verbose_name='Статус чека')),
('uuid', models.TextField(editable=False, help_text='Идентификатор чека платежа в системе оператора', null=True, verbose_name='Идентификатор чека')),
('content', django.contrib.postgres.fields.jsonb.JSONField(editable=False, null=True, verbose_name='Содержимое чека')),
('content', models.JSONField(editable=False, null=True, verbose_name='Содержимое чека')),
('user_email', models.CharField(max_length=254, null=True, verbose_name='Email пользователя')),
('user_phone', models.CharField(max_length=32, null=True, verbose_name='Телефон пользователя')),
('purchase_price', models.DecimalField(decimal_places=2, max_digits=8, null=True, verbose_name='Цена покупки')),
Expand Down
3 changes: 1 addition & 2 deletions atol/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from uuid import uuid4

import shortuuid
from django.contrib.postgres.fields import JSONField
from django.db import models, transaction
from django.utils import timezone
from django.utils.functional import cached_property
Expand Down Expand Up @@ -44,7 +43,7 @@ class Receipt(models.Model):
default=ReceiptStatus.created)
uuid = models.TextField(_('Идентификатор чека'), null=True, editable=False,
help_text=_('Идентификатор чека платежа в системе оператора'))
content = JSONField(_('Содержимое чека'), null=True, editable=False)
content = models.JSONField(_('Содержимое чека'), null=True, editable=False)

user_email = models.CharField(_('Email пользователя'), max_length=254, null=True)
user_phone = models.CharField(_('Телефон пользователя'), max_length=32, null=True)
Expand Down