CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-13 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to postpone invoice creation on order changes (#3716)

Browse Source 
* Allow to postpone invoice creation on order changes

* Add tests

* isort fix

* Fix failures

* More tests

* Update src/pretix/presale/views/order.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/base/services/orders.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/base/services/orders.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/base/services/orders.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Update src/pretix/base/models/orders.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
This commit is contained in:
Raphael Michel
2023-11-22 15:45:27 +01:00
committed by GitHub
parent 7921b67624
commit 2ef015015a
7 changed files with 318 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pretix/base/migrations/0251_order_invoice_dirty.py Normal file
View File

@@ -0,0 +1,17 @@
# Generated by Django 4.2.4 on 2023-11-13 16:45
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("pretixbase", "0250_eventmetaproperty_filter_public"),
]
operations = [
migrations.AddField(
model_name="order",
name="invoice_dirty",
field=models.BooleanField(default=False),
),
]

13
src/pretix/base/models/orders.py
View File

@@ -266,6 +266,10 @@ class Order(LockModel, LoggedModel):
default=False,
verbose_name=_('E-mail address verified')
)
invoice_dirty = models.BooleanField(
# Invoice needs to be re-issued when the order is paid again
default=False,
)
objects = ScopedManager(organizer='event__organizer')
@@ -1835,7 +1839,7 @@ class OrderPayment(models.Model):
def _mark_order_paid(self, count_waitinglist=True, send_mail=True, force=False, user=None, auth=None, mail_text='',
ignore_date=False, lock=True, payment_refund_sum=0, allow_generate_invoice=True):
from pretix.base.services.invoices import (
generate_invoice, invoice_qualified,
generate_cancellation, generate_invoice, invoice_qualified,
)
from pretix.base.services.locking import LOCK_TRUST_WINDOW
@@ -1853,9 +1857,14 @@ class OrderPayment(models.Model):
cancellations = self.order.invoices.filter(is_cancellation=True).count()
gen_invoice = (
(invoices == 0 and self.order.event.settings.get('invoice_generate') in ('True', 'paid')) or
0 < invoices <= cancellations
0 < invoices <= cancellations or
self.order.invoice_dirty
)
if gen_invoice:
if invoices:
last_i = self.order.invoices.filter(is_cancellation=False).last()
if not last_i.canceled:
generate_cancellation(last_i)
invoice = generate_invoice(
self.order,
trigger_pdf=not send_mail or not self.order.event.settings.invoice_email_attachment

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

@@ -395,6 +395,10 @@ def generate_invoice(order: Order, trigger_pdf=True):
if order.status == Order.STATUS_CANCELED:
generate_cancellation(invoice, trigger_pdf)
if order.invoice_dirty:
order.invoice_dirty = False
order.save(update_fields=['invoice_dirty'])
return invoice

36
src/pretix/base/services/orders.py
View File

@@ -2619,14 +2619,34 @@ class OrderChangeManager:
def _reissue_invoice(self):
i = self.order.invoices.filter(is_cancellation=False).last()
if self.reissue_invoice and self._invoice_dirty:
if i and not i.refered.exists():
self._invoices.append(generate_cancellation(i))
if invoice_qualified(self.order) and \
(i or
self.event.settings.invoice_generate == 'True' or (
self.open_payment is not None and self.event.settings.invoice_generate == 'paid' and
self.open_payment.payment_provider.requires_invoice_immediately)):
self._invoices.append(generate_invoice(self.order))
order_now_qualified = invoice_qualified(self.order)
invoice_should_be_generated = (
self.event.settings.invoice_generate == "True" or (
self.event.settings.invoice_generate == "paid" and
self.open_payment is not None and
self.open_payment.payment_provider.requires_invoice_immediately
) or (
self.event.settings.invoice_generate == "paid" and
self.order.status == Order.STATUS_PAID
) or (
# Backwards-compatible behaviour
self.event.settings.invoice_generate not in ("True", "paid") and
i and
not i.canceled
)
)
if order_now_qualified:
if invoice_should_be_generated:
if i and not i.canceled:
self._invoices.append(generate_cancellation(i))
self._invoices.append(generate_invoice(self.order))
else:
self.order.invoice_dirty = True
self.order.save(update_fields=["invoice_dirty"])
else:
if i and not i.canceled:
self._invoices.append(generate_cancellation(i))
def _check_complete_cancel(self):
current = self.order.positions.count()

6
src/pretix/presale/views/order.py
View File

@@ -487,9 +487,13 @@ class OrderPaymentConfirm(EventViewMixin, OrderDetailMixin, TemplateView):
def post(self, request, *args, **kwargs):
try:
if not self.order.invoices.exists() and invoice_qualified(self.order):
i = self.order.invoices.filter(is_cancellation=False).last()
has_active_invoice = i and not i.canceled
if (not has_active_invoice or self.order.invoice_dirty) and invoice_qualified(self.order):
if self.request.event.settings.get('invoice_generate') == 'True' or (
self.request.event.settings.get('invoice_generate') == 'paid' and self.payment.payment_provider.requires_invoice_immediately):
if has_active_invoice:
generate_cancellation(i)
i = generate_invoice(self.order)
self.order.log_action('pretix.event.order.invoice.generated', data={
'invoice': i.pk

62
src/tests/base/test_orders.py
View File

@@ -1167,6 +1167,7 @@ class OrderChangeManagerTests(TestCase):
with scope(organizer=self.o):
self.event = Event.objects.create(organizer=self.o, name='Dummy', slug='dummy', date_from=now(),
plugins='pretix.plugins.banktransfer')
self.event.settings.invoice_generate = "True"
self.order = Order.objects.create(
code='FOO', event=self.event, email='dummy@dummy.test',
status=Order.STATUS_PENDING, locale='en',
@@ -1259,6 +1260,8 @@ class OrderChangeManagerTests(TestCase):
self.event.has_subevents = True
self.event.save()
se1 = self.event.subevents.create(name="Foo", date_from=now())
self.order.positions.update(subevent=se1)
self.order.transactions.update(subevent=se1)
se2 = self.event.subevents.create(name="Bar", date_from=now())
self.op1.subevent = se1
self.op1.save()
@@ -1281,6 +1284,8 @@ class OrderChangeManagerTests(TestCase):
self.event.save()
s = self.op1.secret
se1 = self.event.subevents.create(name="Foo", date_from=now())
self.order.positions.update(subevent=se1)
self.order.transactions.update(subevent=se1)
se2 = self.event.subevents.create(name="Bar", date_from=now())
SubEventItem.objects.create(subevent=se2, item=self.ticket, price=12)
self.op1.subevent = se1
@@ -1305,6 +1310,8 @@ class OrderChangeManagerTests(TestCase):
self.event.save()
se1 = self.event.subevents.create(name="Foo", date_from=now())
se2 = self.event.subevents.create(name="Bar", date_from=now())
self.order.positions.update(subevent=se1)
self.order.transactions.update(subevent=se1)
SubEventItem.objects.create(subevent=se2, item=self.ticket, price=12)
s = self.op1.secret
self.op1.subevent = se1
@@ -1327,6 +1334,8 @@ class OrderChangeManagerTests(TestCase):
self.event.has_subevents = True
self.event.save()
se1 = self.event.subevents.create(name="Foo", date_from=now())
self.order.positions.update(subevent=se1)
self.order.transactions.update(subevent=se1)
se2 = self.event.subevents.create(name="Bar", date_from=now())
SubEventItem.objects.create(subevent=se2, item=self.ticket, price=12)
self.op1.subevent = se1
@@ -1948,6 +1957,7 @@ class OrderChangeManagerTests(TestCase):
self.event.has_subevents = True
self.event.save()
se1 = self.event.subevents.create(name="Foo", date_from=now())
self.order.positions.update(subevent=se1)
SubEventItem.objects.create(subevent=se1, item=self.ticket, price=12)
self.quota.subevent = se1
self.quota.save()
@@ -1983,6 +1993,53 @@ class OrderChangeManagerTests(TestCase):
new_inv = self.order.invoices.get(is_cancellation=False, refered__isnull=True)
assert new_inv.lines.first().tax_rate == Decimal('18.00')
@classscope(attr='o')
def test_reissue_invoice_paid_only_after_payment(self):
self.event.settings.invoice_generate = "paid"
generate_invoice(self.order)
assert self.order.invoices.count() == 1
self.ocm.add_position(self.ticket, None, Decimal('2.00'))
self.ocm.commit()
assert self.order.invoices.count() == 1
self.order.payments.create(
provider='manual', amount=self.order.total
).confirm()
assert self.order.invoices.count() == 3
@classscope(attr='o')
def test_reissue_invoice_paid_stays_paid(self):
self.event.settings.invoice_generate = "paid"
self.order.payments.create(
provider='manual', amount=self.order.total
).confirm()
self.order.refresh_from_db()
assert self.order.invoices.count() == 1
self.ocm.change_price(self.op1, Decimal('2.00'))
self.ocm.commit()
assert self.order.invoices.count() == 3
@classscope(attr='o')
def test_reissue_invoice_paid_only_directly_if_payment_requires_immediate(self):
self.event.settings.invoice_generate = "paid"
self.event.settings.payment_banktransfer_invoice_immediately = True
self.order.payments.create(
provider='banktransfer', amount=self.order.total
)
generate_invoice(self.order)
assert self.order.invoices.count() == 1
self.ocm.add_position(self.ticket, None, Decimal('2.00'))
self.ocm.commit()
assert self.order.invoices.count() == 3
@classscope(attr='o')
def test_reissue_invoice_if_disabled_but_previous_invoice_exists(self):
self.event.settings.invoice_generate = "False"
generate_invoice(self.order)
assert self.order.invoices.count() == 1
self.ocm.add_position(self.ticket, None, Decimal('2.00'))
self.ocm.commit()
assert self.order.invoices.count() == 3
@classscope(attr='o')
def test_no_new_invoice_for_free_order(self):
generate_invoice(self.order)
@@ -2122,6 +2179,7 @@ class OrderChangeManagerTests(TestCase):
@classscope(attr='o')
def test_split_simple(self):
self.event.settings.invoice_generate = "False"
old_secret = self.op2.secret
self.ocm.split(self.op2)
self.ocm.commit()
@@ -2142,6 +2200,7 @@ class OrderChangeManagerTests(TestCase):
@classscope(attr='o')
def test_split_include_addons(self):
self.event.settings.invoice_generate = "False"
self.shirt.category = self.event.categories.create(name='Add-ons', is_addon=True)
self.ticket.addons.create(addon_category=self.shirt.category)
self.ocm.add_position(self.shirt, None, Decimal('13.00'), self.op2)
@@ -2555,6 +2614,7 @@ class OrderChangeManagerTests(TestCase):
@classscope(attr='o')
def test_split_to_free_invoice(self):
self.event.settings.invoice_generate = "False"
self.event.settings.invoice_include_free = False
self.ocm.change_price(self.op2, Decimal('0.00'))
self.ocm.commit()
@@ -2771,6 +2831,8 @@ class OrderChangeManagerTests(TestCase):
self.event.save()
se1 = self.event.subevents.create(name="Foo", date_from=now())
se2 = self.event.subevents.create(name="Bar", date_from=now())
self.order.positions.update(subevent=se1)
self.order.transactions.update(subevent=se1)
self.op1.subevent = se1
self.op1.seat = self.seat_a1
self.op1.save()

191
src/tests/presale/test_order_change.py
View File

@@ -47,6 +47,7 @@ from pretix.base.models import (
)
from pretix.base.models.orders import OrderPayment
from pretix.base.reldate import RelativeDate, RelativeDateWrapper
from pretix.base.services.invoices import generate_invoice
class BaseOrdersTest(TestCase):
@@ -561,6 +562,196 @@ class OrderChangeVariationTest(BaseOrdersTest):
assert self.order.status == Order.STATUS_PENDING
assert self.order.pending_sum == Decimal('2.00')
def _change_to(self, pos, item, var):
response = self.client.get(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret)
)
assert response.status_code == 200
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), {
f'op-{pos.pk}-itemvar': f'{item.pk}-{var.pk}',
f'op-{self.ticket_pos.pk}-itemvar': f'{self.ticket.pk}',
}, follow=True)
doc = BeautifulSoup(response.content.decode(), "lxml")
form_data = extract_form_fields(doc.select('.main-box form')[0])
form_data['confirm'] = 'true'
response = self.client.post(
'/%s/%s/order/%s/%s/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), form_data, follow=True
)
self.assertRedirects(response,
'/%s/%s/order/%s/%s/' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret),
target_status_code=200)
def test_change_issue_invoice_immediately(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
self.event.settings.invoice_generate = 'True'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
generate_invoice(self.order)
self._change_to(shirt_pos, self.shirt, self.shirt_red)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_red
assert shirt_pos.price == Decimal('14.00')
self.order.refresh_from_db()
assert not self.order.invoice_dirty
assert self.order.status == Order.STATUS_PENDING
with scopes_disabled():
assert self.order.invoices.count() == 3
self.order.refresh_from_db()
assert not self.order.invoice_dirty
def test_change_issue_invoice_after_payment(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
self.event.settings.invoice_generate = 'paid'
self.event.settings.set('payment_banktransfer__enabled', True)
self.event.settings.set('payment_banktransfer_invoice_immediately', False)
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
generate_invoice(self.order)
self._change_to(shirt_pos, self.shirt, self.shirt_red)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_red
assert shirt_pos.price == Decimal('14.00')
self.order.refresh_from_db()
assert self.order.invoice_dirty
assert self.order.status == Order.STATUS_PENDING
with scopes_disabled():
assert self.order.invoices.count() == 1
self.client.post(
'/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{
'payment': 'banktransfer'
}
)
with scopes_disabled():
self.client.post(
'/%s/%s/order/%s/%s/pay/%s/confirm' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret, self.order.payments.last().pk),
{}
)
assert self.order.invoices.count() == 1
p_new = self.order.payments.last()
p_new.confirm()
assert self.order.invoices.count() == 3
self.order.refresh_from_db()
assert not self.order.invoice_dirty
def test_change_issue_invoice_before_payment(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
self.event.settings.invoice_generate = 'paid'
self.event.settings.set('payment_banktransfer__enabled', True)
self.event.settings.set('payment_banktransfer_invoice_immediately', True)
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_blue,
price=Decimal("12"),
)
generate_invoice(self.order)
self._change_to(shirt_pos, self.shirt, self.shirt_red)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_red
assert shirt_pos.price == Decimal('14.00')
self.order.refresh_from_db()
assert self.order.invoice_dirty
assert self.order.status == Order.STATUS_PENDING
with scopes_disabled():
assert self.order.invoices.count() == 1
self.client.post(
'/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret),
{
'payment': 'banktransfer'
}
)
with scopes_disabled():
self.client.post(
'/%s/%s/order/%s/%s/pay/%s/confirm' % (self.orga.slug, self.event.slug, self.order.code,
self.order.secret, self.order.payments.last().pk),
{}
)
assert self.order.invoices.count() == 3
p_new = self.order.payments.last()
p_new.confirm()
assert self.order.invoices.count() == 3
self.order.refresh_from_db()
assert not self.order.invoice_dirty
def test_change_issue_invoice_before_refund(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
self.event.settings.invoice_generate = 'paid'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_red,
price=Decimal("14"),
)
self.order.total = Decimal("37.00")
self.order.save()
p = self.order.payments.create(state="created", provider="banktransfer", amount=Decimal("37.00"))
p.confirm()
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_PAID
assert self.order.invoices.count() == 1
self._change_to(shirt_pos, self.shirt, self.shirt_blue)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_blue
assert shirt_pos.price == Decimal('12.00')
self.order.refresh_from_db()
assert not self.order.invoice_dirty
assert self.order.status == Order.STATUS_PAID
with scopes_disabled():
assert self.order.invoices.count() == 3
def test_change_issue_invoice_when_now_paid(self):
self.event.settings.change_allow_user_variation = True
self.event.settings.change_allow_user_price = 'any'
self.event.settings.invoice_generate = 'paid'
with scopes_disabled():
shirt_pos = OrderPosition.objects.create(
order=self.order,
item=self.shirt,
variation=self.shirt_red,
price=Decimal("14"),
)
self.order.total = Decimal("37.00")
self.order.save()
p = self.order.payments.create(state="created", provider="banktransfer", amount=Decimal("35.00"))
p.confirm()
self.order.refresh_from_db()
assert self.order.status == Order.STATUS_PENDING
generate_invoice(self.order)
self._change_to(shirt_pos, self.shirt, self.shirt_blue)
shirt_pos.refresh_from_db()
assert shirt_pos.variation == self.shirt_blue
assert shirt_pos.price == Decimal('12.00')
self.order.refresh_from_db()
assert not self.order.invoice_dirty
assert self.order.status == Order.STATUS_PAID
with scopes_disabled():
assert self.order.invoices.count() == 3
class OrderChangeAddonsTest(BaseOrdersTest):