Hide "Generate invoice" button if no payment method is selected

This commit is contained in:
Raphael Michel
2019-12-06 19:46:13 +01:00
parent afec39ce57
commit 12b9d23efb
3 changed files with 34 additions and 7 deletions

View File

@@ -182,13 +182,19 @@
</h3> </h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<form class="form-inline helper-display-inline" method="post" {% if generate_invoice_requires == "payment" %}
action="{% eventurl event "presale:event.order.geninvoice" order=order.code secret=order.secret %}"> <div class="alert alert-info">
{% csrf_token %} {% trans "You need to select a payment method above before you can request an invoice." %}
<button class="btn btn-default"> </div>
{% trans "Request invoice" %} {% else %}
</button> <form class="form-inline helper-display-inline" method="post"
</form> 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>
{% endif %}
</div> </div>
</div> </div>
</div> </div>

View File

@@ -187,6 +187,11 @@ class OrderDetails(EventViewMixin, OrderDetailMixin, CartMixin, TicketPageMixin,
) )
) )
ctx['can_generate_invoice'] = invoice_qualified(self.order) and can_generate_invoice ctx['can_generate_invoice'] = invoice_qualified(self.order) and can_generate_invoice
if ctx['can_generate_invoice']:
if not self.order.payments.exclude(
state__in=[OrderPayment.PAYMENT_STATE_CANCELED, OrderPayment.PAYMENT_STATE_FAILED]
).exists() and self.order.status == Order.STATUS_PENDING:
ctx['generate_invoice_requires'] = 'payment'
ctx['url'] = build_absolute_uri( ctx['url'] = build_absolute_uri(
self.request.event, 'presale:event.order', kwargs={ self.request.event, 'presale:event.order', kwargs={
'order': self.order.code, 'order': self.order.code,
@@ -603,6 +608,10 @@ class OrderInvoiceCreate(EventViewMixin, OrderDetailMixin, View):
self.request.event.settings.get('invoice_generate') == 'paid' self.request.event.settings.get('invoice_generate') == 'paid'
and self.order.status == Order.STATUS_PAID and self.order.status == Order.STATUS_PAID
) )
) and not (
not self.order.payments.exclude(
state__in=[OrderPayment.PAYMENT_STATE_CANCELED, OrderPayment.PAYMENT_STATE_FAILED]
).exists() and self.order.status == Order.STATUS_PENDING
) )
) )
if not can_generate_invoice or not invoice_qualified(self.order): if not can_generate_invoice or not invoice_qualified(self.order):

View File

@@ -446,8 +446,20 @@ class OrdersTest(BaseOrdersTest):
{}) {})
assert 404 == response.status_code assert 404 == response.status_code
def test_invoice_create_require_payment(self):
self.event.settings.set('invoice_generate', 'user')
response = self.client.post(
'/%s/%s/order/%s/%s/invoice' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{}, follow=True)
assert 'alert-danger' in response.rendered_content
with scopes_disabled():
assert not self.order.invoices.exists()
def test_invoice_create_ok(self): def test_invoice_create_ok(self):
self.event.settings.set('invoice_generate', 'user') self.event.settings.set('invoice_generate', 'user')
with scopes_disabled():
self.order.payments.create(provider='banktransfer', state=OrderPayment.PAYMENT_STATE_CONFIRMED,
amount=self.order.total)
response = self.client.post( response = self.client.post(
'/%s/%s/order/%s/%s/invoice' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), '/%s/%s/order/%s/%s/invoice' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{}, follow=True) {}, follow=True)