mirror of
https://github.com/pretix/pretix.git
synced 2026-05-08 15:44:02 +00:00
Supporting invoice-on-demand instead of autogeneration
This commit is contained in:
@@ -113,9 +113,28 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% elif request.event.settings.invoice_generate == 'user' %}
|
||||
<div class="col-xs-12 {% if request.event.settings.invoice_address_asked %}col-md-6{% endif %}">
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">
|
||||
{% trans "Invoices" %}
|
||||
</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-inline helper-display-inline" method="post"
|
||||
action="{% eventurl event "presale:event.order.geninvoice" order=order.code secret=order.secret %}">
|
||||
{% csrf_token %}
|
||||
<button class="btn btn-default">
|
||||
{% trans "Request invoice" %}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if request.event.settings.invoice_address_asked %}
|
||||
<div class="col-xs-12 {% if invoices %}col-md-6{% endif %}">
|
||||
<div class="col-xs-12 {% if invoices or request.event.settings.invoice_generate == 'user' %}col-md-6{% endif %}">
|
||||
<div class="panel panel-primary">
|
||||
<div class="panel-heading">
|
||||
{% if order.can_modify_answers %}
|
||||
|
||||
@@ -20,6 +20,9 @@ event_patterns = [
|
||||
name='event.checkout'),
|
||||
url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/$', pretix.presale.views.order.OrderDetails.as_view(),
|
||||
name='event.order'),
|
||||
url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/invoice$',
|
||||
pretix.presale.views.order.OrderInvoiceCreate.as_view(),
|
||||
name='event.order.geninvoice'),
|
||||
url(r'^order/(?P<order>[^/]+)/(?P<secret>[A-Za-z0-9]+)/cancel$',
|
||||
pretix.presale.views.order.OrderCancel.as_view(),
|
||||
name='event.order.cancel'),
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
from datetime import timedelta
|
||||
|
||||
from django.contrib import messages
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.http import Http404
|
||||
from django.shortcuts import redirect
|
||||
@@ -13,7 +14,7 @@ from pretix.base.models import (
|
||||
CachedFile, CachedTicket, Invoice, Order, OrderPosition,
|
||||
)
|
||||
from pretix.base.models.orders import InvoiceAddress
|
||||
from pretix.base.services.invoices import invoice_pdf
|
||||
from pretix.base.services.invoices import generate_invoice, invoice_pdf
|
||||
from pretix.base.services.orders import OrderError, cancel_order
|
||||
from pretix.base.services.tickets import generate
|
||||
from pretix.base.signals import (
|
||||
@@ -145,6 +146,26 @@ class OrderPay(EventViewMixin, OrderDetailMixin, TemplateView):
|
||||
})
|
||||
|
||||
|
||||
class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View):
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
self.request = request
|
||||
if not self.order:
|
||||
raise Http404(_('Unknown order code or not authorized to access this order.'))
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
if self.request.event.settings.get('invoice_generate') != 'user':
|
||||
messages.error(self.request, _('You cannot generate an invoice for this order.'))
|
||||
elif self.order.invoices.exists():
|
||||
messages.error(self.request, _('An invoice for this order already exists.'))
|
||||
else:
|
||||
generate_invoice(self.order)
|
||||
self.order.log_action('pretix.event.order.invoice.generate', user=self.request.user)
|
||||
messages.success(self.request, _('The invoice has been generated.'))
|
||||
return redirect(self.get_order_url())
|
||||
|
||||
|
||||
class OrderPayDo(EventViewMixin, OrderDetailMixin, TemplateView):
|
||||
template_name = "pretixpresale/event/order_pay_confirm.html"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user