CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Do not break invoices if order has no locale

Browse Source
This commit is contained in:
Raphael Michel
2018-09-27 17:15:49 +02:00
parent 0369deb72d
commit 96bc64c456
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/api/serializers/order.py
View File

@@ -514,6 +514,8 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
if any(errs): if any(errs):
raise ValidationError({'positions': errs}) raise ValidationError({'positions': errs})
if validated_data.get('locale', None) is None:
validated_data['locale'] = self.context['event'].settings.locale
order = Order(event=self.context['event'], **validated_data) order = Order(event=self.context['event'], **validated_data)
order.set_expires(subevents=[p.get('subevent') for p in positions_data]) order.set_expires(subevents=[p.get('subevent') for p in positions_data])
order.total = sum([p['price'] for p in positions_data]) + sum([f['value'] for f in fees_data], Decimal('0.00')) order.total = sum([p['price'] for p in positions_data]) + sum([f['value'] for f in fees_data], Decimal('0.00'))

4
src/pretix/base/services/invoices.py
View File

@@ -200,10 +200,10 @@ def regenerate_invoice(invoice: Invoice):
def generate_invoice(order: Order, trigger_pdf=True): def generate_invoice(order: Order, trigger_pdf=True):
locale = order.event.settings.get('invoice_language') locale = order.event.settings.get('invoice_language', order.event.settings.locale)
if locale: if locale:
if locale == '__user__': if locale == '__user__':
locale = order.locale locale = order.locale or order.event.settings.locale
invoice = Invoice( invoice = Invoice(
order=order, order=order,