forked from CGM_Public/pretix_original
Fix settings import
This commit is contained in:
@@ -22,11 +22,10 @@
|
|||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
from django.utils import translation
|
from django.utils import translation
|
||||||
from django.utils.formats import get_format
|
from django.utils.formats import get_format
|
||||||
|
|
||||||
from pretix import settings
|
|
||||||
|
|
||||||
date_conversion_to_moment = {
|
date_conversion_to_moment = {
|
||||||
'%a': 'ddd',
|
'%a': 'ddd',
|
||||||
'%A': 'dddd',
|
'%A': 'dddd',
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ from collections import OrderedDict
|
|||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.http import HttpRequest
|
from django.http import HttpRequest
|
||||||
from django.template.loader import get_template
|
from django.template.loader import get_template
|
||||||
@@ -45,7 +46,6 @@ from paypalcheckoutsdk.orders import (
|
|||||||
from paypalcheckoutsdk.payments import CapturesRefundRequest, RefundsGetRequest
|
from paypalcheckoutsdk.payments import CapturesRefundRequest, RefundsGetRequest
|
||||||
from paypalhttp import HttpError
|
from paypalhttp import HttpError
|
||||||
|
|
||||||
from pretix import settings
|
|
||||||
from pretix.base.decimal import round_decimal
|
from pretix.base.decimal import round_decimal
|
||||||
from pretix.base.forms.questions import guess_country
|
from pretix.base.forms.questions import guess_country
|
||||||
from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota
|
from pretix.base.models import Event, Order, OrderPayment, OrderRefund, Quota
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import json
|
|||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
|
from django.conf import settings
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.http import HttpRequest, HttpResponse
|
from django.http import HttpRequest, HttpResponse
|
||||||
from django.template.loader import get_template
|
from django.template.loader import get_template
|
||||||
@@ -30,7 +31,6 @@ from django.urls import resolve
|
|||||||
from django.utils.crypto import get_random_string
|
from django.utils.crypto import get_random_string
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from pretix import settings
|
|
||||||
from pretix.base.forms import SecretKeySettingsField
|
from pretix.base.forms import SecretKeySettingsField
|
||||||
from pretix.base.middleware import _merge_csp, _parse_csp, _render_csp
|
from pretix.base.middleware import _merge_csp, _parse_csp, _render_csp
|
||||||
from pretix.base.settings import settings_hierarkey
|
from pretix.base.settings import settings_hierarkey
|
||||||
|
|||||||
Reference in New Issue
Block a user