From 3ad6135f60f824bdd1664ca906ccddb8f80d622f Mon Sep 17 00:00:00 2001 From: Jonas 12t Date: Wed, 29 Sep 2021 19:57:49 +0400 Subject: [PATCH] Appli QrCode --- DjangoFiles/Administration/admin_tenant.py | 11 +- .../management/commands/createdemo.py | 14 + .../AuthBillet/migrations/0001_initial.py | 6 +- DjangoFiles/AuthBillet/models.py | 5 +- .../BaseBillet/migrations/0001_initial.py | 94 ++++++- .../migrations/0002_auto_20210629_1625.py | 73 ----- .../0002_remove_lignearticle_reste.py} | 8 +- .../migrations/0003_auto_20210629_1627.py | 19 -- .../migrations/0003_delete_tarifsadhesion.py} | 6 +- .../migrations/0004_auto_20210629_1627.py | 19 -- .../migrations/0005_auto_20210629_1629.py | 29 -- .../migrations/0006_auto_20210629_1629.py | 19 -- .../migrations/0007_auto_20210629_1633.py | 24 -- .../migrations/0008_auto_20210629_1654.py | 29 -- .../migrations/0009_auto_20210629_1655.py | 24 -- .../migrations/0010_auto_20210629_1658.py | 24 -- .../migrations/0011_auto_20210629_1713.py | 28 -- .../migrations/0012_auto_20210629_1729.py | 19 -- .../migrations/0013_auto_20210629_1733.py | 30 -- .../migrations/0014_auto_20210629_1735.py | 24 -- .../migrations/0015_auto_20210629_1738.py | 24 -- .../migrations/0016_auto_20210629_1739.py | 19 -- .../migrations/0017_auto_20210629_1809.py | 29 -- .../migrations/0018_auto_20210629_1811.py | 29 -- .../migrations/0019_auto_20210629_1811.py | 19 -- .../migrations/0020_auto_20210629_1820.py | 29 -- .../migrations/0021_auto_20210629_1948.py | 19 -- .../migrations/0022_auto_20210629_1952.py | 24 -- .../migrations/0023_auto_20210923_1338.py | 25 -- .../migrations/0024_auto_20210923_1339.py | 19 -- .../migrations/0025_auto_20210923_1403.py | 29 -- .../migrations/0026_auto_20210923_1706.py | 35 --- .../migrations/0027_auto_20210923_1728.py | 24 -- .../migrations/0028_auto_20210924_1516.py | 24 -- .../migrations/0029_auto_20210924_1547.py | 19 -- .../migrations/0030_auto_20210924_1553.py | 19 -- .../migrations/0031_auto_20210924_1611.py | 19 -- .../migrations/0032_auto_20210924_1611.py | 19 -- .../migrations/0033_auto_20210924_1614.py | 29 -- .../migrations/0034_auto_20210924_1621.py | 19 -- .../migrations/0035_auto_20210924_1628.py | 24 -- .../migrations/0036_auto_20210925_1027.py | 19 -- .../migrations/0037_auto_20210925_1159.py | 19 -- .../migrations/0038_auto_20210925_1208.py | 19 -- .../migrations/0039_auto_20210925_1224.py | 19 -- .../migrations/0040_auto_20210925_1310.py | 19 -- .../migrations/0041_auto_20210925_1415.py | 19 -- .../migrations/0042_auto_20210925_1417.py | 19 -- .../migrations/0043_auto_20210925_1444.py | 19 -- .../migrations/0044_auto_20210925_1507.py | 19 -- .../migrations/0045_auto_20210925_1755.py | 19 -- .../migrations/0046_auto_20210926_1119.py | 19 -- .../migrations/0047_auto_20210926_1359.py | 31 --- .../migrations/0048_auto_20210926_1531.py | 31 --- .../migrations/0049_auto_20210927_1047.py | 32 --- .../migrations/0050_auto_20210927_1132.py | 28 -- .../migrations/0051_auto_20210927_1334.py | 29 -- .../migrations/0052_auto_20210927_1335.py | 24 -- .../migrations/0053_auto_20210927_1348.py | 26 -- .../migrations/0054_auto_20210927_1350.py | 29 -- .../migrations/0055_auto_20210927_1407.py | 29 -- .../migrations/0056_auto_20210927_1407.py | 24 -- .../migrations/0057_auto_20210927_1543.py | 19 -- .../migrations/0058_auto_20210927_1634.py | 19 -- .../migrations/0059_auto_20210927_1634.py | 19 -- .../migrations/0060_auto_20210927_1718.py | 25 -- .../migrations/0061_auto_20210927_1718.py | 19 -- DjangoFiles/BaseBillet/models.py | 19 +- .../Customers/migrations/0001_initial.py | 9 +- .../migrations/0002_create_tenant_public.py | 46 ---- .../migrations/0003_auto_20210623_1351.py | 29 -- .../PaiementStripe/migrations/0001_initial.py | 15 +- .../migrations/0002_auto_20210923_1338.py | 18 -- .../migrations/0003_auto_20210924_1547.py | 26 -- .../migrations/0004_paiement_stripe_total.py | 18 -- .../migrations/0005_auto_20210924_1611.py | 25 -- .../migrations/0007_auto_20210925_1027.py | 23 -- .../0008_paiement_stripe_metadata_stripe.py | 19 -- DjangoFiles/PaiementStripe/models.py | 17 +- DjangoFiles/PaiementStripe/views.py | 60 ++-- .../QrcodeCashless/migrations/0001_initial.py | 23 +- .../migrations/0002_auto_20210925_1159.py | 24 -- .../migrations/0003_auto_20210925_1208.py | 27 -- .../migrations/0004_auto_20210925_1224.py | 20 -- .../migrations/0005_detail_base_url.py | 18 -- .../migrations/0007_detail_origine.py | 20 -- .../migrations/0008_detail_img_url.py | 18 -- .../migrations/0009_detail_generation.py | 19 -- .../templates/RechargementWebUuid.html | 67 ----- .../templates/html5up-dimension/index.html | 54 ++-- DjangoFiles/QrcodeCashless/views.py | 259 +++++++++--------- 91 files changed, 365 insertions(+), 2102 deletions(-) delete mode 100644 DjangoFiles/BaseBillet/migrations/0002_auto_20210629_1625.py rename DjangoFiles/{QrcodeCashless/migrations/0006_remove_cartecashless_origine.py => BaseBillet/migrations/0002_remove_lignearticle_reste.py} (50%) delete mode 100644 DjangoFiles/BaseBillet/migrations/0003_auto_20210629_1627.py rename DjangoFiles/{PaiementStripe/migrations/0006_delete_configuration_stripe.py => BaseBillet/migrations/0003_delete_tarifsadhesion.py} (54%) delete mode 100644 DjangoFiles/BaseBillet/migrations/0004_auto_20210629_1627.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0005_auto_20210629_1629.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0006_auto_20210629_1629.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0007_auto_20210629_1633.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0008_auto_20210629_1654.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0009_auto_20210629_1655.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0010_auto_20210629_1658.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0011_auto_20210629_1713.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0012_auto_20210629_1729.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0013_auto_20210629_1733.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0014_auto_20210629_1735.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0015_auto_20210629_1738.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0016_auto_20210629_1739.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0017_auto_20210629_1809.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0018_auto_20210629_1811.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0019_auto_20210629_1811.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0020_auto_20210629_1820.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0021_auto_20210629_1948.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0022_auto_20210629_1952.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0023_auto_20210923_1338.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0024_auto_20210923_1339.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0025_auto_20210923_1403.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0026_auto_20210923_1706.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0027_auto_20210923_1728.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0028_auto_20210924_1516.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0029_auto_20210924_1547.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0030_auto_20210924_1553.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0031_auto_20210924_1611.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0032_auto_20210924_1611.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0033_auto_20210924_1614.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0034_auto_20210924_1621.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0035_auto_20210924_1628.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0036_auto_20210925_1027.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0037_auto_20210925_1159.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0038_auto_20210925_1208.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0039_auto_20210925_1224.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0040_auto_20210925_1310.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0041_auto_20210925_1415.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0042_auto_20210925_1417.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0043_auto_20210925_1444.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0044_auto_20210925_1507.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0045_auto_20210925_1755.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0046_auto_20210926_1119.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0047_auto_20210926_1359.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0048_auto_20210926_1531.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0049_auto_20210927_1047.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0050_auto_20210927_1132.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0051_auto_20210927_1334.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0052_auto_20210927_1335.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0053_auto_20210927_1348.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0054_auto_20210927_1350.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0055_auto_20210927_1407.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0056_auto_20210927_1407.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0057_auto_20210927_1543.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0058_auto_20210927_1634.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0059_auto_20210927_1634.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0060_auto_20210927_1718.py delete mode 100644 DjangoFiles/BaseBillet/migrations/0061_auto_20210927_1718.py delete mode 100644 DjangoFiles/Customers/migrations/0002_create_tenant_public.py delete mode 100644 DjangoFiles/Customers/migrations/0003_auto_20210623_1351.py delete mode 100644 DjangoFiles/PaiementStripe/migrations/0002_auto_20210923_1338.py delete mode 100644 DjangoFiles/PaiementStripe/migrations/0003_auto_20210924_1547.py delete mode 100644 DjangoFiles/PaiementStripe/migrations/0004_paiement_stripe_total.py delete mode 100644 DjangoFiles/PaiementStripe/migrations/0005_auto_20210924_1611.py delete mode 100644 DjangoFiles/PaiementStripe/migrations/0007_auto_20210925_1027.py delete mode 100644 DjangoFiles/PaiementStripe/migrations/0008_paiement_stripe_metadata_stripe.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0002_auto_20210925_1159.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0003_auto_20210925_1208.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0004_auto_20210925_1224.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0005_detail_base_url.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0007_detail_origine.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0008_detail_img_url.py delete mode 100644 DjangoFiles/QrcodeCashless/migrations/0009_detail_generation.py delete mode 100644 DjangoFiles/QrcodeCashless/templates/RechargementWebUuid.html diff --git a/DjangoFiles/Administration/admin_tenant.py b/DjangoFiles/Administration/admin_tenant.py index 06c559e..3cab2c0 100644 --- a/DjangoFiles/Administration/admin_tenant.py +++ b/DjangoFiles/Administration/admin_tenant.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import Group from solo.admin import SingletonModelAdmin from AuthBillet.models import HumanUser, SuperHumanUser, TermUser -from BaseBillet.models import Configuration, Event, OptionGenerale, Article, Billet, Reservation, LigneArticle, TarifsAdhesion +from BaseBillet.models import Configuration, Event, OptionGenerale, Article, Billet, Reservation, LigneArticle from django.contrib.auth.admin import UserAdmin from Customers.models import Client @@ -150,15 +150,6 @@ class ConfigurationAdmin(SingletonModelAdmin): staff_admin_site.register(Configuration, ConfigurationAdmin) -class TarifsAdhesionAdmin(admin.ModelAdmin): - list_display = ( - 'name', - 'tarif' - ) - list_editable = ('tarif',) - ordering = ('tarif',) - -staff_admin_site.register(TarifsAdhesion, TarifsAdhesionAdmin) class EventAdmin(admin.ModelAdmin): diff --git a/DjangoFiles/Administration/management/commands/createdemo.py b/DjangoFiles/Administration/management/commands/createdemo.py index ecd431c..15caeed 100644 --- a/DjangoFiles/Administration/management/commands/createdemo.py +++ b/DjangoFiles/Administration/management/commands/createdemo.py @@ -8,6 +8,20 @@ class Command(BaseCommand): def handle(self, *args, **options): + # create your public tenant + tenant = Client(schema_name='public', + name='Schemas Inc.', + paid_until='2016-12-05', + on_trial=False) + tenant.save() + + # Add one or more domains for the tenant + domain = Domain() + domain.domain = f'{os.getenv("DOMAIN")}' # don't add your port or www here! on a local server you'll want to use localhost here + domain.tenant = tenant + domain.is_primary = True + domain.save() + tenant_demo = Client.objects.get_or_create(schema_name="demo", name="demo", paid_until='2200-12-05', diff --git a/DjangoFiles/AuthBillet/migrations/0001_initial.py b/DjangoFiles/AuthBillet/migrations/0001_initial.py index f2c0360..12b78dd 100644 --- a/DjangoFiles/AuthBillet/migrations/0001_initial.py +++ b/DjangoFiles/AuthBillet/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2 on 2021-09-27 12:56 +# Generated by Django 2.2 on 2021-09-27 13:39 from django.db import migrations, models import django.db.models.deletion @@ -12,7 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('auth', '0011_update_proxy_permissions'), - ('Customers', '0003_auto_20210623_1351'), + ('Customers', '0001_initial'), ] operations = [ @@ -28,7 +28,7 @@ class Migration(migrations.Migration): ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('uuid_user', models.UUIDField(default=uuid.uuid4, editable=False)), + ('uuid', models.UUIDField(default=uuid.uuid4, editable=False)), ('email', models.EmailField(max_length=254, unique=True, verbose_name='email')), ('username', models.CharField(blank=True, max_length=200, null=True)), ('phone', models.CharField(blank=True, max_length=20, null=True)), diff --git a/DjangoFiles/AuthBillet/models.py b/DjangoFiles/AuthBillet/models.py index 6372e03..7fb3048 100644 --- a/DjangoFiles/AuthBillet/models.py +++ b/DjangoFiles/AuthBillet/models.py @@ -48,7 +48,7 @@ class TibilletUser(AbstractUser): #TODO regarder du coté du dashboard de jet, ça plante avec uuid ! # uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, unique=True, db_index=True) - uuid_user = models.UUIDField(default=uuid.uuid4, editable=False) + uuid = models.UUIDField(default=uuid.uuid4, editable=False) USERNAME_FIELD = 'email' REQUIRED_FIELDS = [] # removes email from REQUIRED_FIELDS @@ -157,6 +157,7 @@ class TermUser(TibilletUser): # Si création : if not self.pk: self.espece = TibilletUser.TYPE_TERM + self.email = self.email.lower() super().save(*args, **kwargs) @@ -187,6 +188,7 @@ class HumanUser(TibilletUser): self.is_staff = False self.is_superuser = False + self.email = self.email.lower() super().save(*args, **kwargs) @@ -218,6 +220,7 @@ class SuperHumanUser(TibilletUser): self.is_staff = True self.is_superuser = False + self.email = self.email.lower() super().save(*args, **kwargs) diff --git a/DjangoFiles/BaseBillet/migrations/0001_initial.py b/DjangoFiles/BaseBillet/migrations/0001_initial.py index cff500b..782b7be 100644 --- a/DjangoFiles/BaseBillet/migrations/0001_initial.py +++ b/DjangoFiles/BaseBillet/migrations/0001_initial.py @@ -1,9 +1,11 @@ -# Generated by Django 2.2 on 2021-06-23 09:09 +# Generated by Django 2.2 on 2021-09-27 13:39 +from django.conf import settings from django.db import migrations, models import django.db.models.deletion import stdimage.models import stdimage.validators +import uuid class Migration(migrations.Migration): @@ -11,9 +13,35 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('PaiementStripe', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ + migrations.CreateModel( + name='Article', + fields=[ + ('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), + ('name', models.CharField(blank=True, max_length=50, null=True)), + ('prix', models.FloatField()), + ('stock', models.SmallIntegerField(blank=True, null=True)), + ('reservation_par_user_max', models.PositiveSmallIntegerField(default=10)), + ('publish', models.BooleanField(default=False)), + ('img', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Image')), + ('categorie_article', models.CharField(choices=[('B', 'Billet'), ('P', "Pack d'objets"), ('R', 'Recharge cashless'), ('T', 'Vetement'), ('M', 'Merchandasing'), ('A', 'Adhésion')], default='B', max_length=3, verbose_name="Type d'article")), + ('id_product_stripe', models.CharField(blank=True, max_length=30, null=True)), + ('id_price_stripe', models.CharField(blank=True, max_length=30, null=True)), + ], + ), + migrations.CreateModel( + name='Billet', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(blank=True, max_length=50, null=True)), + ('prix', models.FloatField()), + ('reservation_par_user_max', models.PositiveSmallIntegerField(default=6)), + ], + ), migrations.CreateModel( name='Event', fields=[ @@ -24,6 +52,8 @@ class Migration(migrations.Migration): ('datetime', models.DateTimeField()), ('img', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)])), ('reservations', models.PositiveSmallIntegerField(default=0)), + ('articles', models.ManyToManyField(to='BaseBillet.Article')), + ('billets', models.ManyToManyField(to='BaseBillet.Billet')), ], options={ 'verbose_name': 'Evenement', @@ -45,12 +75,48 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='reservation', + name='TarifsAdhesion', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('status', models.CharField(choices=[('NAN', 'Annulée'), ('NOV', 'Email non validé'), ('VAL', 'Validée'), ('PAY', 'Payée')], default='NOV', max_length=3, verbose_name='Status de la réservation')), - ('qty', models.IntegerField()), - ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reservation', to='BaseBillet.Event')), + ('name', models.CharField(max_length=30)), + ('tarif', models.FloatField()), + ], + options={ + 'ordering': ('-tarif',), + }, + ), + migrations.CreateModel( + name='VAT', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('percent', models.FloatField(verbose_name='Taux de TVA (%)')), + ], + options={ + 'verbose_name': 'TVA', + 'verbose_name_plural': 'TVA', + }, + ), + migrations.CreateModel( + name='Reservation', + fields=[ + ('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False)), + ('status', models.CharField(choices=[('NAN', 'Annulée'), ('MNV', 'Email non validé'), ('NPA', 'Non payée'), ('VAL', 'Validée'), ('PAY', 'Payée')], default='NPA', max_length=3, verbose_name='Status de la réservation')), + ('event', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reservation', to='BaseBillet.Event')), + ('options', models.ManyToManyField(to='BaseBillet.OptionGenerale')), + ('user_commande', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='LigneArticle', + fields=[ + ('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False)), + ('qty', models.SmallIntegerField()), + ('reste', models.SmallIntegerField()), + ('datetime', models.DateTimeField(auto_now=True)), + ('article', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Article')), + ('billet', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Billet')), + ('paiement_stripe', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='PaiementStripe.Paiement_stripe')), + ('reservation', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation')), ], ), migrations.CreateModel( @@ -62,13 +128,22 @@ class Migration(migrations.Migration): ('adresse', models.CharField(max_length=250)), ('phone', models.CharField(max_length=20)), ('email', models.EmailField(max_length=254)), + ('site_web', models.URLField(blank=True, null=True)), ('twitter', models.URLField(blank=True, null=True)), ('facebook', models.URLField(blank=True, null=True)), ('instagram', models.URLField(blank=True, null=True)), - ('img', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/')), + ('adhesion_obligatoire', models.BooleanField(default=False)), + ('cadeau_adhesion', models.FloatField(default=0, help_text="Recharge cadeau a l'adhésion")), + ('carte_restaurant', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Carte du restaurant')), + ('img', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', verbose_name='Background')), ('mollie_api_key', models.CharField(blank=True, max_length=50, null=True)), - ('reservation_par_user_max', models.PositiveSmallIntegerField(default=6)), + ('stripe_api_key', models.CharField(blank=True, max_length=110, null=True)), + ('stripe_test_api_key', models.CharField(blank=True, max_length=110, null=True)), + ('stripe_mode_test', models.BooleanField(default=True)), + ('activer_billetterie', models.BooleanField(default=True)), ('jauge_max', models.PositiveSmallIntegerField(default=50)), + ('server_cashless', models.URLField(blank=True, max_length=300, null=True, verbose_name='Adresse du serveur Cashless')), + ('key_cashless', models.CharField(blank=True, max_length=41, null=True, verbose_name="Clé d'API du serveur cashless")), ('option_generale_checkbox', models.ManyToManyField(blank=True, related_name='checkbox', to='BaseBillet.OptionGenerale')), ('option_generale_radio', models.ManyToManyField(blank=True, related_name='radiobutton', to='BaseBillet.OptionGenerale')), ], @@ -76,4 +151,9 @@ class Migration(migrations.Migration): 'abstract': False, }, ), + migrations.AddField( + model_name='article', + name='vat', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.VAT', verbose_name='TVA'), + ), ] diff --git a/DjangoFiles/BaseBillet/migrations/0002_auto_20210629_1625.py b/DjangoFiles/BaseBillet/migrations/0002_auto_20210629_1625.py deleted file mode 100644 index 8251caf..0000000 --- a/DjangoFiles/BaseBillet/migrations/0002_auto_20210629_1625.py +++ /dev/null @@ -1,73 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:25 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import stdimage.models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('BaseBillet', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Article', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, max_length=50, null=True)), - ('prix', models.FloatField()), - ], - ), - migrations.CreateModel( - name='Billet', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, max_length=50, null=True)), - ('prix', models.FloatField()), - ], - ), - migrations.RemoveField( - model_name='reservation', - name='id', - ), - migrations.RemoveField( - model_name='reservation', - name='qty', - ), - migrations.AddField( - model_name='reservation', - name='user_commande', - field=models.ForeignKey(default=False, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - preserve_default=False, - ), - migrations.AddField( - model_name='reservation', - name='uuid', - field=models.UUIDField(db_index=True, default=False, primary_key=True, serialize=False, unique=True), - preserve_default=False, - ), - migrations.AlterField( - model_name='configuration', - name='img', - field=stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', verbose_name='Background'), - ), - migrations.CreateModel( - name='LigneArticle', - fields=[ - ('uuid', models.UUIDField(db_index=True, primary_key=True, serialize=False, unique=True)), - ('qty', models.SmallIntegerField()), - ('reste', models.SmallIntegerField()), - ('articles', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Article')), - ('reservation', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation')), - ], - ), - migrations.AddField( - model_name='event', - name='articles', - field=models.ManyToManyField(to='BaseBillet.Article', verbose_name='Articles et billets'), - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0006_remove_cartecashless_origine.py b/DjangoFiles/BaseBillet/migrations/0002_remove_lignearticle_reste.py similarity index 50% rename from DjangoFiles/QrcodeCashless/migrations/0006_remove_cartecashless_origine.py rename to DjangoFiles/BaseBillet/migrations/0002_remove_lignearticle_reste.py index abf2d7d..561a77d 100644 --- a/DjangoFiles/QrcodeCashless/migrations/0006_remove_cartecashless_origine.py +++ b/DjangoFiles/BaseBillet/migrations/0002_remove_lignearticle_reste.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2 on 2021-09-25 10:15 +# Generated by Django 2.2 on 2021-09-27 13:59 from django.db import migrations @@ -6,12 +6,12 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('QrcodeCashless', '0005_detail_base_url'), + ('BaseBillet', '0001_initial'), ] operations = [ migrations.RemoveField( - model_name='cartecashless', - name='origine', + model_name='lignearticle', + name='reste', ), ] diff --git a/DjangoFiles/BaseBillet/migrations/0003_auto_20210629_1627.py b/DjangoFiles/BaseBillet/migrations/0003_auto_20210629_1627.py deleted file mode 100644 index 701f62f..0000000 --- a/DjangoFiles/BaseBillet/migrations/0003_auto_20210629_1627.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:27 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0002_auto_20210629_1625'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0006_delete_configuration_stripe.py b/DjangoFiles/BaseBillet/migrations/0003_delete_tarifsadhesion.py similarity index 54% rename from DjangoFiles/PaiementStripe/migrations/0006_delete_configuration_stripe.py rename to DjangoFiles/BaseBillet/migrations/0003_delete_tarifsadhesion.py index d7fb312..06e94fc 100644 --- a/DjangoFiles/PaiementStripe/migrations/0006_delete_configuration_stripe.py +++ b/DjangoFiles/BaseBillet/migrations/0003_delete_tarifsadhesion.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2 on 2021-09-24 12:11 +# Generated by Django 2.2 on 2021-09-27 14:24 from django.db import migrations @@ -6,11 +6,11 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('PaiementStripe', '0005_auto_20210924_1611'), + ('BaseBillet', '0002_remove_lignearticle_reste'), ] operations = [ migrations.DeleteModel( - name='Configuration_stripe', + name='TarifsAdhesion', ), ] diff --git a/DjangoFiles/BaseBillet/migrations/0004_auto_20210629_1627.py b/DjangoFiles/BaseBillet/migrations/0004_auto_20210629_1627.py deleted file mode 100644 index 90a1ae1..0000000 --- a/DjangoFiles/BaseBillet/migrations/0004_auto_20210629_1627.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:27 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0003_auto_20210629_1627'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0005_auto_20210629_1629.py b/DjangoFiles/BaseBillet/migrations/0005_auto_20210629_1629.py deleted file mode 100644 index 7ae9db2..0000000 --- a/DjangoFiles/BaseBillet/migrations/0005_auto_20210629_1629.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:29 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0004_auto_20210629_1627'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - migrations.AlterField( - model_name='lignearticle', - name='uuid', - field=models.UUIDField(db_index=True, primary_key=True, serialize=False), - ), - migrations.AlterField( - model_name='reservation', - name='uuid', - field=models.UUIDField(db_index=True, primary_key=True, serialize=False), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0006_auto_20210629_1629.py b/DjangoFiles/BaseBillet/migrations/0006_auto_20210629_1629.py deleted file mode 100644 index ff62be9..0000000 --- a/DjangoFiles/BaseBillet/migrations/0006_auto_20210629_1629.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:29 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0005_auto_20210629_1629'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0007_auto_20210629_1633.py b/DjangoFiles/BaseBillet/migrations/0007_auto_20210629_1633.py deleted file mode 100644 index eb75ad4..0000000 --- a/DjangoFiles/BaseBillet/migrations/0007_auto_20210629_1633.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:33 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0006_auto_20210629_1629'), - ] - - operations = [ - migrations.AddField( - model_name='reservation', - name='options', - field=models.ManyToManyField(to='BaseBillet.OptionGenerale'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0008_auto_20210629_1654.py b/DjangoFiles/BaseBillet/migrations/0008_auto_20210629_1654.py deleted file mode 100644 index e762a8e..0000000 --- a/DjangoFiles/BaseBillet/migrations/0008_auto_20210629_1654.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:54 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0007_auto_20210629_1633'), - ] - - operations = [ - migrations.AddField( - model_name='event', - name='billets', - field=models.ManyToManyField(to='BaseBillet.Billet'), - ), - migrations.AlterField( - model_name='event', - name='articles', - field=models.ManyToManyField(to='BaseBillet.Article'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0009_auto_20210629_1655.py b/DjangoFiles/BaseBillet/migrations/0009_auto_20210629_1655.py deleted file mode 100644 index 391568c..0000000 --- a/DjangoFiles/BaseBillet/migrations/0009_auto_20210629_1655.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0008_auto_20210629_1654'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='stock', - field=models.SmallIntegerField(blank=True, null=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0010_auto_20210629_1658.py b/DjangoFiles/BaseBillet/migrations/0010_auto_20210629_1658.py deleted file mode 100644 index af77bc8..0000000 --- a/DjangoFiles/BaseBillet/migrations/0010_auto_20210629_1658.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 12:58 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0009_auto_20210629_1655'), - ] - - operations = [ - migrations.AddField( - model_name='billet', - name='reservation_par_user_max', - field=models.PositiveSmallIntegerField(default=6), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0011_auto_20210629_1713.py b/DjangoFiles/BaseBillet/migrations/0011_auto_20210629_1713.py deleted file mode 100644 index f61af97..0000000 --- a/DjangoFiles/BaseBillet/migrations/0011_auto_20210629_1713.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 13:13 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0010_auto_20210629_1658'), - ] - - operations = [ - migrations.RemoveField( - model_name='configuration', - name='reservation_par_user_max', - ), - migrations.AddField( - model_name='article', - name='reservation_par_user_max', - field=models.PositiveSmallIntegerField(default=10), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0012_auto_20210629_1729.py b/DjangoFiles/BaseBillet/migrations/0012_auto_20210629_1729.py deleted file mode 100644 index 53ae0db..0000000 --- a/DjangoFiles/BaseBillet/migrations/0012_auto_20210629_1729.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 13:29 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0011_auto_20210629_1713'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0013_auto_20210629_1733.py b/DjangoFiles/BaseBillet/migrations/0013_auto_20210629_1733.py deleted file mode 100644 index dc30abb..0000000 --- a/DjangoFiles/BaseBillet/migrations/0013_auto_20210629_1733.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 13:33 - -from django.db import migrations, models -import django.db.models.deletion -import uuid - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0012_auto_20210629_1729'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - migrations.AlterField( - model_name='lignearticle', - name='uuid', - field=models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False), - ), - migrations.AlterField( - model_name='reservation', - name='uuid', - field=models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0014_auto_20210629_1735.py b/DjangoFiles/BaseBillet/migrations/0014_auto_20210629_1735.py deleted file mode 100644 index cc71347..0000000 --- a/DjangoFiles/BaseBillet/migrations/0014_auto_20210629_1735.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 13:35 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0013_auto_20210629_1733'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='articles', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Article', verbose_name='lignes_article'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0015_auto_20210629_1738.py b/DjangoFiles/BaseBillet/migrations/0015_auto_20210629_1738.py deleted file mode 100644 index f21a0d1..0000000 --- a/DjangoFiles/BaseBillet/migrations/0015_auto_20210629_1738.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 13:38 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0014_auto_20210629_1735'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='articles', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Article'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0016_auto_20210629_1739.py b/DjangoFiles/BaseBillet/migrations/0016_auto_20210629_1739.py deleted file mode 100644 index a12977c..0000000 --- a/DjangoFiles/BaseBillet/migrations/0016_auto_20210629_1739.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 13:39 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0015_auto_20210629_1738'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0017_auto_20210629_1809.py b/DjangoFiles/BaseBillet/migrations/0017_auto_20210629_1809.py deleted file mode 100644 index 4015195..0000000 --- a/DjangoFiles/BaseBillet/migrations/0017_auto_20210629_1809.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 14:09 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0016_auto_20210629_1739'), - ] - - operations = [ - migrations.RenameField( - model_name='lignearticle', - old_name='articles', - new_name='article', - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - migrations.AlterField( - model_name='reservation', - name='status', - field=models.CharField(choices=[('NAN', 'Annulée'), ('MNV', 'Email non validé'), ('NPA', 'Non payée'), ('VAL', 'Validée'), ('PAY', 'Payée')], default='NPA', max_length=3, verbose_name='Status de la réservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0018_auto_20210629_1811.py b/DjangoFiles/BaseBillet/migrations/0018_auto_20210629_1811.py deleted file mode 100644 index 8147f1b..0000000 --- a/DjangoFiles/BaseBillet/migrations/0018_auto_20210629_1811.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 14:11 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0017_auto_20210629_1809'), - ] - - operations = [ - migrations.AddField( - model_name='lignearticle', - name='billet', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Billet'), - ), - migrations.AlterField( - model_name='lignearticle', - name='article', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Article'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0019_auto_20210629_1811.py b/DjangoFiles/BaseBillet/migrations/0019_auto_20210629_1811.py deleted file mode 100644 index 3f5c730..0000000 --- a/DjangoFiles/BaseBillet/migrations/0019_auto_20210629_1811.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 14:11 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0018_auto_20210629_1811'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0020_auto_20210629_1820.py b/DjangoFiles/BaseBillet/migrations/0020_auto_20210629_1820.py deleted file mode 100644 index 949658d..0000000 --- a/DjangoFiles/BaseBillet/migrations/0020_auto_20210629_1820.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 14:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0019_auto_20210629_1811'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='article', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Article'), - ), - migrations.AlterField( - model_name='lignearticle', - name='billet', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Billet'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0021_auto_20210629_1948.py b/DjangoFiles/BaseBillet/migrations/0021_auto_20210629_1948.py deleted file mode 100644 index b491d44..0000000 --- a/DjangoFiles/BaseBillet/migrations/0021_auto_20210629_1948.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 15:48 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0020_auto_20210629_1820'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0022_auto_20210629_1952.py b/DjangoFiles/BaseBillet/migrations/0022_auto_20210629_1952.py deleted file mode 100644 index bdaec7a..0000000 --- a/DjangoFiles/BaseBillet/migrations/0022_auto_20210629_1952.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-06-29 15:52 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0021_auto_20210629_1948'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation', verbose_name='lignes_article'), - ), - migrations.AlterField( - model_name='reservation', - name='event', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reservation', to='BaseBillet.Event'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0023_auto_20210923_1338.py b/DjangoFiles/BaseBillet/migrations/0023_auto_20210923_1338.py deleted file mode 100644 index 01b73fa..0000000 --- a/DjangoFiles/BaseBillet/migrations/0023_auto_20210923_1338.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.2 on 2021-09-23 09:38 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('PaiementStripe', '0002_auto_20210923_1338'), - ('BaseBillet', '0022_auto_20210629_1952'), - ] - - operations = [ - migrations.AddField( - model_name='lignearticle', - name='paiement_stripe', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='PaiementStripe.Paiement_stripe'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0024_auto_20210923_1339.py b/DjangoFiles/BaseBillet/migrations/0024_auto_20210923_1339.py deleted file mode 100644 index 18c855b..0000000 --- a/DjangoFiles/BaseBillet/migrations/0024_auto_20210923_1339.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-23 09:39 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0023_auto_20210923_1338'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0025_auto_20210923_1403.py b/DjangoFiles/BaseBillet/migrations/0025_auto_20210923_1403.py deleted file mode 100644 index 177da33..0000000 --- a/DjangoFiles/BaseBillet/migrations/0025_auto_20210923_1403.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-09-23 10:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0024_auto_20210923_1339'), - ] - - operations = [ - migrations.AddField( - model_name='configuration', - name='key_cashless', - field=models.CharField(blank=True, max_length=41, null=True, verbose_name="Clé d'API du serveur cashless"), - ), - migrations.AddField( - model_name='configuration', - name='server_cashless', - field=models.URLField(blank=True, max_length=300, null=True, verbose_name='Adresse du serveur Cashless'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0026_auto_20210923_1706.py b/DjangoFiles/BaseBillet/migrations/0026_auto_20210923_1706.py deleted file mode 100644 index 28be3c0..0000000 --- a/DjangoFiles/BaseBillet/migrations/0026_auto_20210923_1706.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.2 on 2021-09-23 13:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0025_auto_20210923_1403'), - ] - - operations = [ - migrations.CreateModel( - name='VAT', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('percent', models.FloatField(verbose_name='Taux de TVA (%)')), - ], - options={ - 'verbose_name': 'TVA', - 'verbose_name_plural': 'TVA', - }, - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - migrations.AddField( - model_name='article', - name='vat', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='BaseBillet.VAT', verbose_name='TVA'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0027_auto_20210923_1728.py b/DjangoFiles/BaseBillet/migrations/0027_auto_20210923_1728.py deleted file mode 100644 index 443fcf5..0000000 --- a/DjangoFiles/BaseBillet/migrations/0027_auto_20210923_1728.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-09-23 13:28 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0026_auto_20210923_1706'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='publish', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0028_auto_20210924_1516.py b/DjangoFiles/BaseBillet/migrations/0028_auto_20210924_1516.py deleted file mode 100644 index 9594f64..0000000 --- a/DjangoFiles/BaseBillet/migrations/0028_auto_20210924_1516.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 11:16 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0027_auto_20210923_1728'), - ] - - operations = [ - migrations.AddField( - model_name='lignearticle', - name='datetime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0029_auto_20210924_1547.py b/DjangoFiles/BaseBillet/migrations/0029_auto_20210924_1547.py deleted file mode 100644 index 1f39ecd..0000000 --- a/DjangoFiles/BaseBillet/migrations/0029_auto_20210924_1547.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 11:47 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0028_auto_20210924_1516'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0030_auto_20210924_1553.py b/DjangoFiles/BaseBillet/migrations/0030_auto_20210924_1553.py deleted file mode 100644 index f92a455..0000000 --- a/DjangoFiles/BaseBillet/migrations/0030_auto_20210924_1553.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 11:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0029_auto_20210924_1547'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0031_auto_20210924_1611.py b/DjangoFiles/BaseBillet/migrations/0031_auto_20210924_1611.py deleted file mode 100644 index 6cf8a63..0000000 --- a/DjangoFiles/BaseBillet/migrations/0031_auto_20210924_1611.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 12:11 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0030_auto_20210924_1553'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0032_auto_20210924_1611.py b/DjangoFiles/BaseBillet/migrations/0032_auto_20210924_1611.py deleted file mode 100644 index 767a11f..0000000 --- a/DjangoFiles/BaseBillet/migrations/0032_auto_20210924_1611.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 12:11 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0031_auto_20210924_1611'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0033_auto_20210924_1614.py b/DjangoFiles/BaseBillet/migrations/0033_auto_20210924_1614.py deleted file mode 100644 index 784e5f3..0000000 --- a/DjangoFiles/BaseBillet/migrations/0033_auto_20210924_1614.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 12:14 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0032_auto_20210924_1611'), - ] - - operations = [ - migrations.AddField( - model_name='configuration', - name='stripe_api_key', - field=models.CharField(blank=True, max_length=110, null=True), - ), - migrations.AddField( - model_name='configuration', - name='stripe_test_api_key', - field=models.CharField(blank=True, max_length=110, null=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0034_auto_20210924_1621.py b/DjangoFiles/BaseBillet/migrations/0034_auto_20210924_1621.py deleted file mode 100644 index e7bf471..0000000 --- a/DjangoFiles/BaseBillet/migrations/0034_auto_20210924_1621.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 12:21 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0033_auto_20210924_1614'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0035_auto_20210924_1628.py b/DjangoFiles/BaseBillet/migrations/0035_auto_20210924_1628.py deleted file mode 100644 index b7e75d2..0000000 --- a/DjangoFiles/BaseBillet/migrations/0035_auto_20210924_1628.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 12:28 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0034_auto_20210924_1621'), - ] - - operations = [ - migrations.AddField( - model_name='configuration', - name='stripe_mode_test', - field=models.BooleanField(default=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0036_auto_20210925_1027.py b/DjangoFiles/BaseBillet/migrations/0036_auto_20210925_1027.py deleted file mode 100644 index a820d73..0000000 --- a/DjangoFiles/BaseBillet/migrations/0036_auto_20210925_1027.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 06:27 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0035_auto_20210924_1628'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0037_auto_20210925_1159.py b/DjangoFiles/BaseBillet/migrations/0037_auto_20210925_1159.py deleted file mode 100644 index 87c8276..0000000 --- a/DjangoFiles/BaseBillet/migrations/0037_auto_20210925_1159.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 07:59 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0036_auto_20210925_1027'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0038_auto_20210925_1208.py b/DjangoFiles/BaseBillet/migrations/0038_auto_20210925_1208.py deleted file mode 100644 index 2594d00..0000000 --- a/DjangoFiles/BaseBillet/migrations/0038_auto_20210925_1208.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 08:08 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0037_auto_20210925_1159'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0039_auto_20210925_1224.py b/DjangoFiles/BaseBillet/migrations/0039_auto_20210925_1224.py deleted file mode 100644 index 6df1a08..0000000 --- a/DjangoFiles/BaseBillet/migrations/0039_auto_20210925_1224.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 08:24 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0038_auto_20210925_1208'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0040_auto_20210925_1310.py b/DjangoFiles/BaseBillet/migrations/0040_auto_20210925_1310.py deleted file mode 100644 index 7851ec6..0000000 --- a/DjangoFiles/BaseBillet/migrations/0040_auto_20210925_1310.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 09:10 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0039_auto_20210925_1224'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0041_auto_20210925_1415.py b/DjangoFiles/BaseBillet/migrations/0041_auto_20210925_1415.py deleted file mode 100644 index 227930b..0000000 --- a/DjangoFiles/BaseBillet/migrations/0041_auto_20210925_1415.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 10:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0040_auto_20210925_1310'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0042_auto_20210925_1417.py b/DjangoFiles/BaseBillet/migrations/0042_auto_20210925_1417.py deleted file mode 100644 index 2e49ff2..0000000 --- a/DjangoFiles/BaseBillet/migrations/0042_auto_20210925_1417.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 10:17 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0041_auto_20210925_1415'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0043_auto_20210925_1444.py b/DjangoFiles/BaseBillet/migrations/0043_auto_20210925_1444.py deleted file mode 100644 index f88ac39..0000000 --- a/DjangoFiles/BaseBillet/migrations/0043_auto_20210925_1444.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 10:44 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0042_auto_20210925_1417'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0044_auto_20210925_1507.py b/DjangoFiles/BaseBillet/migrations/0044_auto_20210925_1507.py deleted file mode 100644 index 6367c40..0000000 --- a/DjangoFiles/BaseBillet/migrations/0044_auto_20210925_1507.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 11:07 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0043_auto_20210925_1444'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0045_auto_20210925_1755.py b/DjangoFiles/BaseBillet/migrations/0045_auto_20210925_1755.py deleted file mode 100644 index f2d7338..0000000 --- a/DjangoFiles/BaseBillet/migrations/0045_auto_20210925_1755.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 13:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0044_auto_20210925_1507'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0046_auto_20210926_1119.py b/DjangoFiles/BaseBillet/migrations/0046_auto_20210926_1119.py deleted file mode 100644 index e0abf8e..0000000 --- a/DjangoFiles/BaseBillet/migrations/0046_auto_20210926_1119.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-26 07:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0045_auto_20210925_1755'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0047_auto_20210926_1359.py b/DjangoFiles/BaseBillet/migrations/0047_auto_20210926_1359.py deleted file mode 100644 index c210f3a..0000000 --- a/DjangoFiles/BaseBillet/migrations/0047_auto_20210926_1359.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2 on 2021-09-26 09:59 - -from django.db import migrations, models -import django.db.models.deletion -import stdimage.models -import stdimage.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0046_auto_20210926_1119'), - ] - - operations = [ - migrations.AddField( - model_name='configuration', - name='carte_restaurant', - field=stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Background'), - ), - migrations.AddField( - model_name='configuration', - name='site_web', - field=models.URLField(blank=True, null=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0048_auto_20210926_1531.py b/DjangoFiles/BaseBillet/migrations/0048_auto_20210926_1531.py deleted file mode 100644 index 6a5f6b2..0000000 --- a/DjangoFiles/BaseBillet/migrations/0048_auto_20210926_1531.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2 on 2021-09-26 11:31 - -from django.db import migrations, models -import django.db.models.deletion -import stdimage.models -import stdimage.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0047_auto_20210926_1359'), - ] - - operations = [ - migrations.AddField( - model_name='configuration', - name='activer_billetterie', - field=models.BooleanField(default=True), - ), - migrations.AlterField( - model_name='configuration', - name='carte_restaurant', - field=stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Carte du restaurant'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0049_auto_20210927_1047.py b/DjangoFiles/BaseBillet/migrations/0049_auto_20210927_1047.py deleted file mode 100644 index d095e18..0000000 --- a/DjangoFiles/BaseBillet/migrations/0049_auto_20210927_1047.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 06:47 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0048_auto_20210926_1531'), - ] - - operations = [ - migrations.CreateModel( - name='TarifsAdhesion', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ('tarif', models.FloatField()), - ], - ), - migrations.AddField( - model_name='configuration', - name='adhesion_obligatoire', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0050_auto_20210927_1132.py b/DjangoFiles/BaseBillet/migrations/0050_auto_20210927_1132.py deleted file mode 100644 index 117b224..0000000 --- a/DjangoFiles/BaseBillet/migrations/0050_auto_20210927_1132.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 07:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0049_auto_20210927_1047'), - ] - - operations = [ - migrations.AlterModelOptions( - name='tarifsadhesion', - options={'ordering': ('-tarif',)}, - ), - migrations.AddField( - model_name='configuration', - name='cadeau_adhesion', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0051_auto_20210927_1334.py b/DjangoFiles/BaseBillet/migrations/0051_auto_20210927_1334.py deleted file mode 100644 index 01bc884..0000000 --- a/DjangoFiles/BaseBillet/migrations/0051_auto_20210927_1334.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 09:34 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0050_auto_20210927_1132'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='categorie_article', - field=models.CharField(choices=[('B', 'Billet'), ('P', "Pack d'objets"), ('R', 'Recharge cashless'), ('T', 'Vetement'), ('M', 'Merchandasing')], default='B', max_length=3, verbose_name='Status de la réservation'), - ), - migrations.AlterField( - model_name='configuration', - name='cadeau_adhesion', - field=models.FloatField(default=0, help_text="Recharge cadeau a l'adhésion"), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0052_auto_20210927_1335.py b/DjangoFiles/BaseBillet/migrations/0052_auto_20210927_1335.py deleted file mode 100644 index 047feff..0000000 --- a/DjangoFiles/BaseBillet/migrations/0052_auto_20210927_1335.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 09:35 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0051_auto_20210927_1334'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='id_stripe', - field=models.CharField(blank=True, max_length=30, null=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0053_auto_20210927_1348.py b/DjangoFiles/BaseBillet/migrations/0053_auto_20210927_1348.py deleted file mode 100644 index 4a55c18..0000000 --- a/DjangoFiles/BaseBillet/migrations/0053_auto_20210927_1348.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 09:48 - -from django.db import migrations, models -import django.db.models.deletion -import stdimage.models -import stdimage.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0052_auto_20210927_1335'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='img', - field=stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Image'), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0054_auto_20210927_1350.py b/DjangoFiles/BaseBillet/migrations/0054_auto_20210927_1350.py deleted file mode 100644 index 172a7c6..0000000 --- a/DjangoFiles/BaseBillet/migrations/0054_auto_20210927_1350.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 09:50 - -from django.db import migrations, models -import django.db.models.deletion -import uuid - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0053_auto_20210927_1348'), - ] - - operations = [ - migrations.RemoveField( - model_name='article', - name='id', - ), - migrations.AddField( - model_name='article', - name='uuid', - field=models.UUIDField(db_index=True, default=uuid.uuid4, primary_key=True, serialize=False), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0055_auto_20210927_1407.py b/DjangoFiles/BaseBillet/migrations/0055_auto_20210927_1407.py deleted file mode 100644 index 0111fbd..0000000 --- a/DjangoFiles/BaseBillet/migrations/0055_auto_20210927_1407.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 10:07 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0054_auto_20210927_1350'), - ] - - operations = [ - migrations.RenameField( - model_name='article', - old_name='id_stripe', - new_name='id_price_stripe', - ), - migrations.AlterField( - model_name='article', - name='categorie_article', - field=models.CharField(choices=[('B', 'Billet'), ('P', "Pack d'objets"), ('R', 'Recharge cashless'), ('T', 'Vetement'), ('M', 'Merchandasing'), ('A', 'Adhésion')], default='B', max_length=3, verbose_name="Type d'article"), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0056_auto_20210927_1407.py b/DjangoFiles/BaseBillet/migrations/0056_auto_20210927_1407.py deleted file mode 100644 index 57436eb..0000000 --- a/DjangoFiles/BaseBillet/migrations/0056_auto_20210927_1407.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 10:07 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0055_auto_20210927_1407'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='id_product_stripe', - field=models.CharField(blank=True, max_length=30, null=True), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0057_auto_20210927_1543.py b/DjangoFiles/BaseBillet/migrations/0057_auto_20210927_1543.py deleted file mode 100644 index 9552541..0000000 --- a/DjangoFiles/BaseBillet/migrations/0057_auto_20210927_1543.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 11:43 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0056_auto_20210927_1407'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0058_auto_20210927_1634.py b/DjangoFiles/BaseBillet/migrations/0058_auto_20210927_1634.py deleted file mode 100644 index df38ad4..0000000 --- a/DjangoFiles/BaseBillet/migrations/0058_auto_20210927_1634.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 12:34 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0057_auto_20210927_1543'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0059_auto_20210927_1634.py b/DjangoFiles/BaseBillet/migrations/0059_auto_20210927_1634.py deleted file mode 100644 index 5e524db..0000000 --- a/DjangoFiles/BaseBillet/migrations/0059_auto_20210927_1634.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 12:34 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0058_auto_20210927_1634'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0060_auto_20210927_1718.py b/DjangoFiles/BaseBillet/migrations/0060_auto_20210927_1718.py deleted file mode 100644 index 1341e67..0000000 --- a/DjangoFiles/BaseBillet/migrations/0060_auto_20210927_1718.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 13:18 - -from django.db import migrations, models -import django.db.models.deletion -import uuid - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0059_auto_20210927_1634'), - ] - - operations = [ - migrations.AlterField( - model_name='article', - name='uuid', - field=models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False), - ), - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/migrations/0061_auto_20210927_1718.py b/DjangoFiles/BaseBillet/migrations/0061_auto_20210927_1718.py deleted file mode 100644 index f88b6c3..0000000 --- a/DjangoFiles/BaseBillet/migrations/0061_auto_20210927_1718.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-27 13:18 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('BaseBillet', '0060_auto_20210927_1718'), - ] - - operations = [ - migrations.AlterField( - model_name='lignearticle', - name='reservation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='BaseBillet.Reservation'), - ), - ] diff --git a/DjangoFiles/BaseBillet/models.py b/DjangoFiles/BaseBillet/models.py index cfc8344..3157b27 100644 --- a/DjangoFiles/BaseBillet/models.py +++ b/DjangoFiles/BaseBillet/models.py @@ -40,16 +40,6 @@ def poids_option_generale(sender, instance: OptionGenerale, created, **kwargs): instance.save() -class TarifsAdhesion(models.Model): - name = models.CharField(max_length=30) - tarif = models.FloatField() - - class Meta: - ordering = ('-tarif',) - - def __str__(self): - return f"{self.name} {self.tarif}" - class Configuration(SingletonModel): organisation = models.CharField(max_length=50) @@ -157,7 +147,7 @@ class VAT(models.Model): class Article(models.Model): - uuid = models.UUIDField(primary_key=True, db_index=True, default=uuid.uuid4, editable=False) + uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False, unique=True, db_index=True) name = models.CharField(max_length=50, blank=True, null=True) @@ -362,12 +352,5 @@ class LigneArticle(models.Model): article = models.ForeignKey(Article, on_delete=models.CASCADE, blank=True, null=True) billet = models.ForeignKey(Billet, on_delete=models.CASCADE, blank=True, null=True) qty = models.SmallIntegerField() - reste = models.SmallIntegerField() paiement_stripe = models.ForeignKey(Paiement_stripe, on_delete=models.PROTECT, blank=True, null=True) datetime = models.DateTimeField(auto_now=True) - # def __str__(self): - # if self.reservation : - # if self.article : - # return f"{self.reservation.user_commande.email} {self.qty} {self.article}" - # if self.billet : - # return f"{self.reservation.user_commande.email} {self.qty} {self.billet}" diff --git a/DjangoFiles/Customers/migrations/0001_initial.py b/DjangoFiles/Customers/migrations/0001_initial.py index a191149..9182951 100644 --- a/DjangoFiles/Customers/migrations/0001_initial.py +++ b/DjangoFiles/Customers/migrations/0001_initial.py @@ -1,7 +1,8 @@ -# Generated by Django 2.2 on 2021-06-23 09:09 +# Generated by Django 2.2 on 2021-09-27 13:39 from django.db import migrations, models import django.db.models.deletion +import django.utils.timezone import django_tenants.postgresql_backend.base @@ -18,9 +19,9 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('schema_name', models.CharField(db_index=True, max_length=63, unique=True, validators=[django_tenants.postgresql_backend.base._check_schema_name])), - ('name', models.CharField(max_length=100)), - ('paid_until', models.DateField()), - ('on_trial', models.BooleanField()), + ('name', models.CharField(db_index=True, max_length=100, unique=True)), + ('paid_until', models.DateField(default=django.utils.timezone.now)), + ('on_trial', models.BooleanField(default=True)), ('created_on', models.DateField(auto_now_add=True)), ], options={ diff --git a/DjangoFiles/Customers/migrations/0002_create_tenant_public.py b/DjangoFiles/Customers/migrations/0002_create_tenant_public.py deleted file mode 100644 index 0984c1a..0000000 --- a/DjangoFiles/Customers/migrations/0002_create_tenant_public.py +++ /dev/null @@ -1,46 +0,0 @@ -# Generated by Django 2.2.13 on 2021-06-08 10:08 -import os -from django.db import migrations - - -def create_premier_tenant(apps, schema_editor): - # We can't import the Person model directly as it may be a newer - # version than this migration expects. We use the historical version. - Client = apps.get_model('Customers', 'Client') - Domain = apps.get_model('Customers', 'Domain') - DNS = os.getenv('DOMAIN') - - tenant_public = Client.objects.get_or_create(schema_name='public', - name='Tibillet Public', - paid_until='2200-12-05', - on_trial=False)[0] - - # Add one or more domains for the tenant - domaine_seul = Domain.objects.get_or_create(domain=DNS, - tenant=tenant_public, - is_primary=True, - ) - - domaine_www = Domain.objects.get_or_create(domain=f'www.{DNS}', - tenant=tenant_public, - is_primary=False, - ) - - return tenant_public, domaine_seul[0], domaine_www[0] - - -def reverse(apps, schema_editor): - tenant_public, domaine_seul, domaine_www = create_premier_tenant(apps, schema_editor) - tenant_public.delete() - domaine_seul.delete() - domaine_www.delete() - - -class Migration(migrations.Migration): - dependencies = [ - ('Customers', '0001_initial'), - ] - - operations = [ - migrations.RunPython(create_premier_tenant, reverse), - ] diff --git a/DjangoFiles/Customers/migrations/0003_auto_20210623_1351.py b/DjangoFiles/Customers/migrations/0003_auto_20210623_1351.py deleted file mode 100644 index a2b981b..0000000 --- a/DjangoFiles/Customers/migrations/0003_auto_20210623_1351.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2 on 2021-06-23 09:51 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('Customers', '0002_create_tenant_public'), - ] - - operations = [ - migrations.AlterField( - model_name='client', - name='name', - field=models.CharField(db_index=True, max_length=100, unique=True), - ), - migrations.AlterField( - model_name='client', - name='on_trial', - field=models.BooleanField(default=True), - ), - migrations.AlterField( - model_name='client', - name='paid_until', - field=models.DateField(default=django.utils.timezone.now), - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0001_initial.py b/DjangoFiles/PaiementStripe/migrations/0001_initial.py index 79d660b..1bd383d 100644 --- a/DjangoFiles/PaiementStripe/migrations/0001_initial.py +++ b/DjangoFiles/PaiementStripe/migrations/0001_initial.py @@ -1,6 +1,9 @@ -# Generated by Django 2.2 on 2021-09-23 08:55 +# Generated by Django 2.2 on 2021-09-27 13:39 +from django.conf import settings +import django.contrib.postgres.fields.jsonb from django.db import migrations, models +import django.db.models.deletion import uuid @@ -9,6 +12,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -16,10 +20,13 @@ class Migration(migrations.Migration): name='Paiement_stripe', fields=[ ('uuid', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)), - ('id_stripe', models.CharField(blank=True, max_length=20, null=True)), + ('detail', models.CharField(blank=True, max_length=50, null=True)), + ('id_stripe', models.CharField(blank=True, max_length=80, null=True)), + ('metadata_stripe', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), ('order_date', models.DateTimeField(auto_now=True, verbose_name='Date')), - ('status', models.CharField(choices=[('O', 'Envoyée a Stripe'), ('W', 'En attente de paiement'), ('P', 'Payée'), ('V', 'Payée et validée'), ('C', 'Annulée')], default='O', max_length=1, verbose_name='Statut de la commande')), - ('email_billet', models.CharField(blank=True, max_length=30, verbose_name='Email de récéption des billets')), + ('status', models.CharField(choices=[('N', 'Lien de paiement non crée'), ('O', 'Envoyée a Stripe'), ('W', 'En attente de paiement'), ('E', 'Expiré'), ('P', 'Payée'), ('V', 'Payée et validée'), ('C', 'Annulée')], default='N', max_length=1, verbose_name='Statut de la commande')), + ('total', models.FloatField(default=0)), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/DjangoFiles/PaiementStripe/migrations/0002_auto_20210923_1338.py b/DjangoFiles/PaiementStripe/migrations/0002_auto_20210923_1338.py deleted file mode 100644 index 62aa5f1..0000000 --- a/DjangoFiles/PaiementStripe/migrations/0002_auto_20210923_1338.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2 on 2021-09-23 09:38 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('PaiementStripe', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='paiement_stripe', - name='status', - field=models.CharField(choices=[('N', 'Lien de paiement non crée'), ('O', 'Envoyée a Stripe'), ('W', 'En attente de paiement'), ('P', 'Payée'), ('V', 'Payée et validée'), ('C', 'Annulée')], default='N', max_length=1, verbose_name='Statut de la commande'), - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0003_auto_20210924_1547.py b/DjangoFiles/PaiementStripe/migrations/0003_auto_20210924_1547.py deleted file mode 100644 index d28ca8c..0000000 --- a/DjangoFiles/PaiementStripe/migrations/0003_auto_20210924_1547.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 11:47 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('PaiementStripe', '0002_auto_20210923_1338'), - ] - - operations = [ - migrations.AddField( - model_name='paiement_stripe', - name='detail', - field=models.CharField(blank=True, max_length=50, null=True), - ), - migrations.AddField( - model_name='paiement_stripe', - name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0004_paiement_stripe_total.py b/DjangoFiles/PaiementStripe/migrations/0004_paiement_stripe_total.py deleted file mode 100644 index b76ec91..0000000 --- a/DjangoFiles/PaiementStripe/migrations/0004_paiement_stripe_total.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 11:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('PaiementStripe', '0003_auto_20210924_1547'), - ] - - operations = [ - migrations.AddField( - model_name='paiement_stripe', - name='total', - field=models.FloatField(default=0), - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0005_auto_20210924_1611.py b/DjangoFiles/PaiementStripe/migrations/0005_auto_20210924_1611.py deleted file mode 100644 index 3f66476..0000000 --- a/DjangoFiles/PaiementStripe/migrations/0005_auto_20210924_1611.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.2 on 2021-09-24 12:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('PaiementStripe', '0004_paiement_stripe_total'), - ] - - operations = [ - migrations.CreateModel( - name='Configuration_stripe', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('test_api_key', models.CharField(blank=True, max_length=110, null=True)), - ('api_key', models.CharField(blank=True, max_length=110, null=True)), - ], - ), - migrations.RemoveField( - model_name='paiement_stripe', - name='email_billet', - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0007_auto_20210925_1027.py b/DjangoFiles/PaiementStripe/migrations/0007_auto_20210925_1027.py deleted file mode 100644 index 1b760ac..0000000 --- a/DjangoFiles/PaiementStripe/migrations/0007_auto_20210925_1027.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 06:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('PaiementStripe', '0006_delete_configuration_stripe'), - ] - - operations = [ - migrations.AlterField( - model_name='paiement_stripe', - name='id_stripe', - field=models.CharField(blank=True, max_length=80, null=True), - ), - migrations.AlterField( - model_name='paiement_stripe', - name='status', - field=models.CharField(choices=[('N', 'Lien de paiement non crée'), ('O', 'Envoyée a Stripe'), ('W', 'En attente de paiement'), ('E', 'Expiré'), ('P', 'Payée'), ('V', 'Payée et validée'), ('C', 'Annulée')], default='N', max_length=1, verbose_name='Statut de la commande'), - ), - ] diff --git a/DjangoFiles/PaiementStripe/migrations/0008_paiement_stripe_metadata_stripe.py b/DjangoFiles/PaiementStripe/migrations/0008_paiement_stripe_metadata_stripe.py deleted file mode 100644 index 183756e..0000000 --- a/DjangoFiles/PaiementStripe/migrations/0008_paiement_stripe_metadata_stripe.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-26 07:19 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('PaiementStripe', '0007_auto_20210925_1027'), - ] - - operations = [ - migrations.AddField( - model_name='paiement_stripe', - name='metadata_stripe', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - ] diff --git a/DjangoFiles/PaiementStripe/models.py b/DjangoFiles/PaiementStripe/models.py index a1b1630..d992593 100644 --- a/DjangoFiles/PaiementStripe/models.py +++ b/DjangoFiles/PaiementStripe/models.py @@ -3,8 +3,9 @@ from django.contrib.postgres.fields import JSONField import uuid # Create your models here. from TiBillet import settings - -# class Configuration_stripe(models.Model): +from django.db.models.signals import post_save, pre_save +from django.dispatch import receiver +# from QrcodeCashless.views import postPaimentRecharge class Paiement_stripe(models.Model): @@ -38,5 +39,13 @@ class Paiement_stripe(models.Model): def __str__(self): return f"{self.detail} - {self.status}" - - +''' RECEIVER PRESAVE DANS LE VIEW QRCODECASHELESS +@receiver(pre_save, sender=Paiement_stripe) +def changement_paid_to_valid(sender, instance: Paiement_stripe, update_fields=None, **kwargs): + try: + old_instance = Paiement_stripe.objects.get(pk=instance.pk) + if old_instance.status != Paiement_stripe.PAID : + print(f"on passe de {old_instance.status} à {instance.status}") + if instance.status == Paiement_stripe.PAID: + on lance la recharge vers le serveur cashless +''' diff --git a/DjangoFiles/PaiementStripe/views.py b/DjangoFiles/PaiementStripe/views.py index e93c6a1..c4c192b 100644 --- a/DjangoFiles/PaiementStripe/views.py +++ b/DjangoFiles/PaiementStripe/views.py @@ -1,6 +1,7 @@ import json from datetime import datetime +from django.contrib import messages from django.contrib.auth import get_user_model from django.db import connection from django.http import HttpResponse, Http404, HttpResponseRedirect @@ -31,13 +32,14 @@ class creation_checkout_stripe(): ) -> None: self.absolute_domain = absolute_domain - self.configuration = Configuration.get_solo() + self.liste_ligne_article = liste_ligne_article self.email_paiement = email_paiement + self.metadata = metadata + + self.configuration = Configuration.get_solo() self.user = self._user_paiement() self.detail = self._detail() self.total = self._total() - self.liste_ligne_article = liste_ligne_article - self.metadata = metadata self.metadata_json = json.dumps(self.metadata) self.paiement_stripe_db = self._paiement_stripe_db() self.stripe_api_key = self._stripe_api_key() @@ -64,7 +66,7 @@ class creation_checkout_stripe(): total = 0 for ligne in self.liste_ligne_article: ligne: LigneArticle - total += ligne.qty * ligne.article.prix + total += float(ligne.qty) * float(ligne.article.prix) return total def _detail(self): @@ -100,20 +102,23 @@ class creation_checkout_stripe(): line_items.append( { "price": f"{ligne.article.get_id_price_stripe()}", - "quantity": ligne.qty, + "quantity": int(ligne.qty), } ) + return line_items def _checkout_session(self): + + checkout_session = stripe.checkout.Session.create( - customer_email=f'{self.user.email}', - line_items=self.line_items, - payment_method_types=['card'], - mode='payment', - metadata=self.metadata, success_url=f'{self.absolute_domain}/stripe/return/{self.paiement_stripe_db.uuid}', cancel_url=f'{self.absolute_domain}/stripe/return/{self.paiement_stripe_db.uuid}', - client_reference_id=f"{self.user.uuid_user}", + payment_method_types=["card"], + customer_email=f'{self.user.email}', + line_items=self.line_items, + mode='payment', + metadata=self.metadata, + client_reference_id=f"{self.user.uuid}", ) print(checkout_session.id) @@ -146,6 +151,7 @@ class retour_stripe(View): else: stripe.api_key = configuration.stripe_api_key + print(paiement_stripe.status) if paiement_stripe.status != Paiement_stripe.VALID: checkout_session = stripe.checkout.Session.retrieve(paiement_stripe.id_stripe) @@ -156,9 +162,6 @@ class retour_stripe(View): paiement_stripe.save() elif checkout_session.payment_status == "paid": - paiement_stripe.status = Paiement_stripe.PAID - paiement_stripe.save() - # on vérifie si les infos sont cohérente avec la db : Never Trust Input :) metadata_stripe_json = checkout_session.metadata metadata_stripe = json.loads(str(metadata_stripe_json)) @@ -177,25 +180,26 @@ class retour_stripe(View): f"metadata ne correspondent pas : {metadata_stripe} {metadata_db}") raise Http404 - # on check si il y a un rechargement de carte cashless dans la commande - if metadata_db.get('recharge_carte_uuid'): - logger.info( - f'{timezone.now()} retour stripe pour rechargement carte : {metadata_db.get("recharge_carte_uuid")}') - print( - f'{timezone.now()} retour stripe pour rechargement carte : {metadata_db.get("recharge_carte_uuid")}') - - print('gerer la recharge sur le serveur cashless') - # return postPaimentRecharge(paiement_stripe, request) - - - + paiement_stripe.status = Paiement_stripe.PAID + paiement_stripe.save() + # le .save() lance le process pre_save dans le view QrcodeCashless, qui peut modifier son status + paiement_stripe.refresh_from_db() + if paiement_stripe.status == Paiement_stripe.VALID : + messages.success(request, f"Paiement validé. Merci !") + return HttpResponseRedirect(f"/qr/{metadata_db.get('recharge_carte_uuid')}#success") else: paiement_stripe.status = Paiement_stripe.CANCELED paiement_stripe.save() - return HttpResponse(f'Le paiement annulé.') - return HttpResponse(f'Paiement validé') + if paiement_stripe.status == Paiement_stripe.VALID: + metadata_db_json = paiement_stripe.metadata_stripe + metadata_db = json.loads(metadata_db_json) + if metadata_db.get('recharge_carte_uuid'): + return HttpResponseRedirect(f"/qr/{metadata_db.get('recharge_carte_uuid')}#historique") + else : + return HttpResponse('Un problème de validation de paiement a été detecté. Merci de contacter un responsable.') + # return HttpResponseRedirect("/") ''' diff --git a/DjangoFiles/QrcodeCashless/migrations/0001_initial.py b/DjangoFiles/QrcodeCashless/migrations/0001_initial.py index 4f9ba7a..fb2aca7 100644 --- a/DjangoFiles/QrcodeCashless/migrations/0001_initial.py +++ b/DjangoFiles/QrcodeCashless/migrations/0001_initial.py @@ -1,7 +1,9 @@ -# Generated by Django 2.2 on 2021-09-23 09:39 +# Generated by Django 2.2 on 2021-09-27 13:39 from django.db import migrations, models import django.db.models.deletion +import stdimage.models +import stdimage.validators class Migration(migrations.Migration): @@ -9,18 +11,29 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('Customers', '0003_auto_20210623_1351'), + ('Customers', '0001_initial'), ] operations = [ + migrations.CreateModel( + name='Detail', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('img', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Recto de la carte')), + ('img_url', models.URLField(blank=True, null=True)), + ('base_url', models.CharField(blank=True, max_length=60, null=True)), + ('generation', models.SmallIntegerField()), + ('origine', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='Customers.Client')), + ], + ), migrations.CreateModel( name='CarteCashless', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('tag_id', models.CharField(db_index=True, max_length=8, unique=True)), - ('uuid_qrcode', models.UUIDField(blank=True, null=True, verbose_name='Uuid')), - ('number', models.CharField(blank=True, db_index=True, max_length=8, null=True, unique=True)), - ('origine', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='Customers.Client')), + ('uuid', models.UUIDField(blank=True, null=True, verbose_name='Uuid')), + ('number', models.CharField(db_index=True, max_length=8, unique=True)), + ('detail', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='QrcodeCashless.Detail')), ], ), ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0002_auto_20210925_1159.py b/DjangoFiles/QrcodeCashless/migrations/0002_auto_20210925_1159.py deleted file mode 100644 index f98ef2d..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0002_auto_20210925_1159.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 07:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('QrcodeCashless', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='cartecashless', - old_name='uuid_qrcode', - new_name='uuid', - ), - migrations.AlterField( - model_name='cartecashless', - name='number', - field=models.CharField(db_index=True, default=0, max_length=8, unique=True), - preserve_default=False, - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0003_auto_20210925_1208.py b/DjangoFiles/QrcodeCashless/migrations/0003_auto_20210925_1208.py deleted file mode 100644 index 03a990e..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0003_auto_20210925_1208.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 08:08 - -from django.db import migrations, models -import django.db.models.deletion -import stdimage.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('QrcodeCashless', '0002_auto_20210925_1159'), - ] - - operations = [ - migrations.CreateModel( - name='Detail', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('img', stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', verbose_name='Recto de la carte')), - ], - ), - migrations.AddField( - model_name='cartecashless', - name='detail', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='QrcodeCashless.Detail'), - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0004_auto_20210925_1224.py b/DjangoFiles/QrcodeCashless/migrations/0004_auto_20210925_1224.py deleted file mode 100644 index c12424d..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0004_auto_20210925_1224.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 08:24 - -from django.db import migrations -import stdimage.models -import stdimage.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('QrcodeCashless', '0003_auto_20210925_1208'), - ] - - operations = [ - migrations.AlterField( - model_name='detail', - name='img', - field=stdimage.models.StdImageField(blank=True, null=True, upload_to='images/', validators=[stdimage.validators.MaxSizeValidator(1920, 1920)], verbose_name='Recto de la carte'), - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0005_detail_base_url.py b/DjangoFiles/QrcodeCashless/migrations/0005_detail_base_url.py deleted file mode 100644 index a783fb1..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0005_detail_base_url.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 09:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('QrcodeCashless', '0004_auto_20210925_1224'), - ] - - operations = [ - migrations.AddField( - model_name='detail', - name='base_url', - field=models.CharField(blank=True, max_length=60, null=True), - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0007_detail_origine.py b/DjangoFiles/QrcodeCashless/migrations/0007_detail_origine.py deleted file mode 100644 index adbd4af..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0007_detail_origine.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 10:17 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('Customers', '0003_auto_20210623_1351'), - ('QrcodeCashless', '0006_remove_cartecashless_origine'), - ] - - operations = [ - migrations.AddField( - model_name='detail', - name='origine', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='Customers.Client'), - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0008_detail_img_url.py b/DjangoFiles/QrcodeCashless/migrations/0008_detail_img_url.py deleted file mode 100644 index 559f50f..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0008_detail_img_url.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 10:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('QrcodeCashless', '0007_detail_origine'), - ] - - operations = [ - migrations.AddField( - model_name='detail', - name='img_url', - field=models.URLField(blank=True, null=True), - ), - ] diff --git a/DjangoFiles/QrcodeCashless/migrations/0009_detail_generation.py b/DjangoFiles/QrcodeCashless/migrations/0009_detail_generation.py deleted file mode 100644 index 67d7872..0000000 --- a/DjangoFiles/QrcodeCashless/migrations/0009_detail_generation.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2 on 2021-09-25 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('QrcodeCashless', '0008_detail_img_url'), - ] - - operations = [ - migrations.AddField( - model_name='detail', - name='generation', - field=models.SmallIntegerField(default=1), - preserve_default=False, - ), - ] diff --git a/DjangoFiles/QrcodeCashless/templates/RechargementWebUuid.html b/DjangoFiles/QrcodeCashless/templates/RechargementWebUuid.html deleted file mode 100644 index ff22c6c..0000000 --- a/DjangoFiles/QrcodeCashless/templates/RechargementWebUuid.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - Rechargement Online - - - - - - - - - - - {# #} - - {# #} - - -
-{% if url_image_carte %} -
- Product -
-{% endif %} -
-

Rechargement Cashless {{ domain.capitalize }}

-{% if liste_assets %} -

Disponible sur votre carte : - {% for asset in liste_assets %} -

{{ asset }}

- {% endfor %} -

-{% else %} -

Votre carte est vide.

-{% endif %} - - -
- {% csrf_token %} - - -
- - - {% if email %} - - {% else %} - - {% endif %} - - - - - -
- -
- -
-
- - - diff --git a/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html b/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html index 6d4170a..a58e5e6 100644 --- a/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html +++ b/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html @@ -16,8 +16,7 @@ -< class="is-preload"> - +
@@ -38,12 +37,15 @@