From 42116c93cbcac219af1e8cd0e8d7fa49c6485d39 Mon Sep 17 00:00:00 2001 From: Jonas 12t Date: Sun, 26 Sep 2021 15:48:31 +0400 Subject: [PATCH] billetterie boolean --- DjangoFiles/Administration/admin_tenant.py | 1 + DjangoFiles/BaseBillet/models.py | 2 ++ DjangoFiles/BaseBillet/views.py | 3 +++ .../templates/html5up-dimension/index.html | 23 +++++++++++++------ DjangoFiles/QrcodeCashless/views.py | 14 +++++------ 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/DjangoFiles/Administration/admin_tenant.py b/DjangoFiles/Administration/admin_tenant.py index 8c8fe2f..38ee3f9 100644 --- a/DjangoFiles/Administration/admin_tenant.py +++ b/DjangoFiles/Administration/admin_tenant.py @@ -127,6 +127,7 @@ class ConfigurationAdmin(SingletonModelAdmin): }), ('Billetterie', { 'fields': ( + 'activer_billetterie', 'jauge_max', 'option_generale_radio', 'option_generale_checkbox', diff --git a/DjangoFiles/BaseBillet/models.py b/DjangoFiles/BaseBillet/models.py index e653717..468459c 100644 --- a/DjangoFiles/BaseBillet/models.py +++ b/DjangoFiles/BaseBillet/models.py @@ -85,6 +85,8 @@ class Configuration(SingletonModel): stripe_test_api_key = models.CharField(max_length=110, blank=True, null=True) stripe_mode_test = models.BooleanField(default=True) + activer_billetterie = models.BooleanField(default=True) + jauge_max = models.PositiveSmallIntegerField(default=50) option_generale_radio = models.ManyToManyField(OptionGenerale, diff --git a/DjangoFiles/BaseBillet/views.py b/DjangoFiles/BaseBillet/views.py index 9719d48..0dd8053 100644 --- a/DjangoFiles/BaseBillet/views.py +++ b/DjangoFiles/BaseBillet/views.py @@ -1,6 +1,7 @@ from datetime import datetime from django.contrib.auth import get_user_model +from django.http import HttpResponseRedirect from django.shortcuts import render, redirect # Create your views here. @@ -25,6 +26,8 @@ class index(APIView): def get(self, request): configuration = Configuration.get_solo() + if not configuration.activer_billetterie : + return HttpResponseRedirect('https://www.tibillet.re') events = Event.objects.filter(datetime__gt=datetime.now()) if len(events) > 0: diff --git a/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html b/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html index bf056a9..328fe7e 100644 --- a/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html +++ b/DjangoFiles/QrcodeCashless/templates/html5up-dimension/index.html @@ -22,9 +22,9 @@