Refactor mark_paid out of models

This commit is contained in:
Raphael Michel
2015-06-03 13:58:03 +02:00
parent 49ea85caee
commit fc907a2ec7
9 changed files with 79 additions and 203 deletions

View File

@@ -9,6 +9,7 @@ from django.shortcuts import redirect, render
from django.utils.timezone import now
from django.views.generic import TemplateView
from pretix.base.models import Order, Quota
from pretix.base.services.orders import mark_order_paid
from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.plugins.banktransfer import csvimport, mt940import
from django.utils.translation import ugettext_lazy as _
@@ -36,7 +37,7 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
some_failed = False
for order in orders:
try:
order.mark_paid(provider='banktransfer', info=json.dumps({
mark_order_paid(order, provider='banktransfer', info=json.dumps({
'reference': self.request.POST.get('reference_%s' % order.code),
'date': self.request.POST.get('date_%s' % order.code),
'payer': self.request.POST.get('payer_%s' % order.code),

View File

@@ -1,16 +1,16 @@
from collections import OrderedDict
import json
import logging
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.template.loader import get_template
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext as __
from django import forms
import paypalrestsdk
from pretix.base.models import Quota
from pretix.base.services.orders import mark_order_paid
from pretix.base.payment import BasePaymentProvider
@@ -177,7 +177,7 @@ class Paypal(BasePaymentProvider):
return
try:
order.mark_paid('paypal', json.dumps(payment.to_dict()))
mark_order_paid(order, 'paypal', json.dumps(payment.to_dict()))
messages.success(request, _('We successfully received your payment. Thank you!'))
except Quota.QuotaExceededException as e:
messages.error(request, str(e))

View File

@@ -1,16 +1,18 @@
from collections import OrderedDict
import json
import logging
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.template.loader import get_template
from django.utils.translation import ugettext_lazy as _
from django import forms
from pretix.base.models import Quota
from pretix.base.services.orders import mark_order_paid
import stripe
from pretix.base.payment import BasePaymentProvider
logger = logging.getLogger('pretix.plugins.stripe')
@@ -99,7 +101,7 @@ class Stripe(BasePaymentProvider):
else:
if charge.status == 'succeeded' and charge.paid:
try:
order.mark_paid('paypal', str(charge))
mark_order_paid(order, 'paypal', str(charge))
messages.success(request, _('We successfully received your payment. Thank you!'))
except Quota.QuotaExceededException as e:
messages.error(request, str(e))