mirror of
https://github.com/pretix/pretix.git
synced 2026-05-04 15:04:03 +00:00
API: Remove deprecated fields on order resource
This commit is contained in:
@@ -140,15 +140,12 @@ class OrderSerializer(I18nAwareModelSerializer):
|
||||
positions = OrderPositionSerializer(many=True)
|
||||
fees = OrderFeeSerializer(many=True)
|
||||
downloads = OrderDownloadsField(source='*')
|
||||
payment_fee = PaymentFeeLegacyField(source='*', attribute='value') # TODO: Remove in 1.9
|
||||
payment_fee_tax_rate = PaymentFeeLegacyField(source='*', attribute='tax_rate') # TODO: Remove in 1.9
|
||||
payment_fee_tax_value = PaymentFeeLegacyField(source='*', attribute='tax_value') # TODO: Remove in 1.9
|
||||
|
||||
class Meta:
|
||||
model = Order
|
||||
fields = ('code', 'status', 'secret', 'email', 'locale', 'datetime', 'expires', 'payment_date',
|
||||
'payment_provider', 'fees', 'total', 'comment', 'invoice_address', 'positions', 'downloads',
|
||||
'payment_fee', 'payment_fee_tax_rate', 'payment_fee_tax_value', 'checkin_attention')
|
||||
'checkin_attention')
|
||||
|
||||
|
||||
class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import copy
|
||||
import datetime
|
||||
from decimal import Decimal
|
||||
from distutils.version import LooseVersion
|
||||
from unittest import mock
|
||||
|
||||
import pytest
|
||||
@@ -10,7 +9,6 @@ from django.utils.timezone import now
|
||||
from django_countries.fields import Country
|
||||
from pytz import UTC
|
||||
|
||||
from pretix import __version__
|
||||
from pretix.base.models import InvoiceAddress, Order, OrderPosition
|
||||
from pretix.base.models.orders import OrderFee
|
||||
from pretix.base.services.invoices import (
|
||||
@@ -119,9 +117,6 @@ TEST_ORDER_RES = {
|
||||
}
|
||||
],
|
||||
"payment_provider": "banktransfer",
|
||||
"payment_fee": "0.25",
|
||||
"payment_fee_tax_rate": "19.00",
|
||||
"payment_fee_tax_value": "0.05",
|
||||
"total": "23.00",
|
||||
"comment": "",
|
||||
"checkin_attention": False,
|
||||
@@ -144,10 +139,6 @@ TEST_ORDER_RES = {
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
@pytest.mark.xfail(
|
||||
LooseVersion(__version__) >= LooseVersion("1.9.0.dev0"),
|
||||
reason="Deprecated attributes payment_fee_* should be removed by now",
|
||||
)
|
||||
def test_order_list(token_client, organizer, event, order, item, taxrule, question):
|
||||
res = dict(TEST_ORDER_RES)
|
||||
res["positions"][0]["id"] = order.positions.first().pk
|
||||
|
||||
Reference in New Issue
Block a user