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

Fixed wrong type annotations

Browse Source
This commit is contained in:
Raphael Michel
2015-09-28 23:15:24 +02:00
parent 1c89fec808
commit 16207cf2c4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/payment.py
View File

@@ -11,7 +11,6 @@ from django.template.loader import get_template
from django.utils.translation import ugettext_lazy as _
from pretix.base.models import CartPosition, Order
from pretix.base.services.orders import mark_order_paid
from pretix.base.settings import SettingsSandbox
from pretix.base.signals import register_payment_providers
from pretix.presale.views import user_cart_q
@@ -411,6 +410,7 @@ class FreeOrderProvider(BasePaymentProvider):
return _("Free of charge")
def payment_perform(self, request: HttpRequest, order: Order):
from pretix.base.services.orders import mark_order_paid
mark_order_paid(order, 'free')
@property

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

@@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _
from pretix.base.models import (
Event, EventLock, Order, OrderPosition, Quota, User,
)
from pretix.base.payment import BasePaymentProvider
from pretix.base.services.mail import mail
from pretix.base.signals import order_paid, order_placed
from pretix.helpers.urls import build_absolute_uri
@@ -119,8 +120,8 @@ def check_positions(event: Event, dt: datetime, positions: list):
raise OrderError(err)
def perform_order(event: Event, payment_provider: str, positions: list, user: User=None, email: str=None,
locale: str=None):
def perform_order(event: Event, payment_provider: BasePaymentProvider, positions: list, user: User=None,
email: str=None, locale: str=None):
error_messages = {
'busy': _('We were not able to process your request completely as the '
'server was too busy. Please try again.'),
@@ -155,8 +156,8 @@ def perform_order(event: Event, payment_provider: str, positions: list, user: Us
@transaction.atomic()
def place_order(event: Event, user: User, email: str, positions: list, dt: datetime, payment_provider: str,
locale: str=None):
def place_order(event: Event, user: User, email: str, positions: list, dt: datetime,
payment_provider: BasePaymentProvider, locale: str=None):
total = sum([c.price for c in positions])
payment_fee = payment_provider.calculate_fee(total)
total += payment_fee