CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-02-04 02:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1067 -- Allow to manually create partial payments

Browse Source
This commit is contained in:
Raphael Michel
2018-12-02 18:32:16 +01:00
parent b1cebdbd99
commit b93e7fcb60
4 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretix/control/forms/orders.py
View File

@@ -49,7 +49,7 @@ class ExtendForm(I18nModelForm):
return data
class MarkPaidForm(forms.Form):
class ConfirmPaymentForm(forms.Form):
force = forms.BooleanField(
label=_('Overbook quota and ignore late payment'),
help_text=_('If you check this box, this operation will be performed even if it leads to an overbooked quota '
@@ -75,6 +75,20 @@ class MarkPaidForm(forms.Form):
del self.fields['force']
class MarkPaidForm(ConfirmPaymentForm):
amount = forms.DecimalField(
required=True,
max_digits=10, decimal_places=2,
localize=True,
label=_('Payment amount'),
)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
change_decimal_field(self.fields['amount'], self.instance.event.currency)
self.fields['amount'].initial = max(0, self.instance.pending_sum)
class ExporterForm(forms.Form):
def clean(self):
data = super().clean()

10
src/pretix/control/templates/pretixcontrol/order/pay.html
View File

@@ -18,17 +18,21 @@
<form method="post" class="form-horizontal" href="">
{% csrf_token %}
<p>{% blocktrans trimmed %}
Do you really want to mark this order as paid?
Do you really want to create a manual payment for this order?
{% endblocktrans %}</p>
<input type="hidden" name="status" value="p" />
{% bootstrap_form form layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
{% bootstrap_form_errors form %}
{% bootstrap_field form.amount layout='horizontal' %}
{% if form.force %}
{% bootstrap_field form.force layout='horizontal' horizontal_label_class='sr-only' horizontal_field_class='col-md-12' %}
{% endif %}
<div class="form-group submit-group">
<a class="btn btn-default btn-lg"
href="{% url "control:event.order" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}">
{% trans "Cancel" %}
</a>
<button class="btn btn-primary btn-save btn-lg" type="submit">
{% trans "Mark as paid" %}
{% trans "Create payment" %}
</button>
<div class="clearfix"></div>
</div>

10
src/pretix/control/views/orders.py
View File

@@ -55,8 +55,8 @@ from pretix.base.views.mixins import OrderQuestionsViewMixin
from pretix.base.views.tasks import AsyncAction
from pretix.control.forms.filter import EventOrderFilterForm, RefundFilterForm
from pretix.control.forms.orders import (
CommentForm, ExporterForm, ExtendForm, MarkPaidForm, OrderContactForm,
OrderLocaleForm, OrderMailForm, OrderPositionAddForm,
CommentForm, ConfirmPaymentForm, ExporterForm, ExtendForm, MarkPaidForm,
OrderContactForm, OrderLocaleForm, OrderMailForm, OrderPositionAddForm,
OrderPositionChangeForm, OrderRefundForm, OtherOperationsForm,
)
from pretix.control.permissions import EventPermissionRequiredMixin
@@ -404,7 +404,7 @@ class OrderPaymentConfirm(OrderView):
@cached_property
def mark_paid_form(self):
return MarkPaidForm(
return ConfirmPaymentForm(
instance=self.order,
data=self.request.POST if self.request.method == "POST" else None,
)
@@ -675,7 +675,7 @@ class OrderTransition(OrderView):
def post(self, *args, **kwargs):
to = self.request.POST.get('status', '')
if self.order.status in (Order.STATUS_PENDING, Order.STATUS_EXPIRED) and to == 'p' and self.mark_paid_form.is_valid():
ps = max(0, self.order.pending_sum)
ps = self.mark_paid_form.cleaned_data['amount']
try:
p = self.order.payments.get(
state__in=(OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED),
@@ -718,7 +718,7 @@ class OrderTransition(OrderView):
messages.warning(self.request, _('The order has been marked as paid, but we were unable to send a '
'confirmation mail.'))
else:
messages.success(self.request, _('The order has been marked as paid.'))
messages.success(self.request, _('The payment has been created successfully.'))
elif self.order.cancel_allowed() and to == 'c':
cancel_order(self.order, user=self.request.user, send_mail=self.request.POST.get("send_email") == "on")
messages.success(self.request, _('The order has been canceled.'))

13
src/tests/control/test_orders.py
View File

@@ -193,6 +193,7 @@ def test_order_transition_to_paid_in_time_success(client, env):
q.items.add(env[3])
client.login(email='dummy@dummy.dummy', password='dummy')
client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'amount': str(env[2].pending_sum),
'status': 'p'
})
o = Order.objects.get(id=env[2].id)
@@ -208,7 +209,8 @@ def test_order_transition_to_paid_expired_quota_left(client, env):
q.items.add(env[3])
client.login(email='dummy@dummy.dummy', password='dummy')
res = client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p'
'status': 'p',
'amount': str(o.pending_sum),
})
o = Order.objects.get(id=env[2].id)
assert res.status_code < 400
@@ -279,6 +281,7 @@ def test_order_transition(client, env, process):
client.login(email='dummy@dummy.dummy', password='dummy')
client.get('/control/event/dummy/dummy/orders/FOO/transition?status=' + process[1])
client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'amount': str(o.pending_sum),
'status': process[1]
})
o = Order.objects.get(id=env[2].id)
@@ -562,7 +565,8 @@ def test_order_mark_paid_overdue_quota_blocked_by_waiting_list(client, env):
client.login(email='dummy@dummy.dummy', password='dummy')
response = client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p'
'status': 'p',
'amount': str(o.pending_sum),
}, follow=True)
assert 'alert-success' in response.rendered_content
o = Order.objects.get(id=env[2].id)
@@ -580,6 +584,7 @@ def test_order_mark_paid_blocked(client, env):
client.login(email='dummy@dummy.dummy', password='dummy')
response = client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'amount': str(o.pending_sum),
'status': 'p'
}, follow=True)
assert 'alert-danger' in response.rendered_content
@@ -588,7 +593,7 @@ def test_order_mark_paid_blocked(client, env):
@pytest.mark.django_db
def test_order_mark_paid_overpaid_exired(client, env):
def test_order_mark_paid_overpaid_epxired(client, env):
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_EXPIRED
o.expires = now() - timedelta(days=5)
@@ -601,6 +606,7 @@ def test_order_mark_paid_overpaid_exired(client, env):
client.login(email='dummy@dummy.dummy', password='dummy')
response = client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p',
'amount': '0.00',
'force': 'on'
}, follow=True)
assert 'alert-success' in response.rendered_content
@@ -622,6 +628,7 @@ def test_order_mark_paid_forced(client, env):
client.login(email='dummy@dummy.dummy', password='dummy')
response = client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p',
'amount': str(o.pending_sum),
'force': 'on'
}, follow=True)
assert 'alert-success' in response.rendered_content