From b3ef1d753809bd925bab96144954bd34d149bd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 17 Aug 2018 11:59:28 +0200 Subject: [PATCH] Add the ticket to the order admin. --- src/shop/admin.py | 3 ++- src/tickets/admin.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/shop/admin.py b/src/shop/admin.py index b4550f4c..9eddafdf 100644 --- a/src/shop/admin.py +++ b/src/shop/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin +from tickets.admin import ShopTicketInline from .models import ( CoinifyAPICallback, CoinifyAPIInvoice, @@ -156,7 +157,7 @@ class OrderAdmin(admin.ModelAdmin): exclude = ['products'] - inlines = [ProductInline] + inlines = [ProductInline, ShopTicketInline] actions = ['mark_order_as_paid', 'mark_order_as_refunded'] diff --git a/src/tickets/admin.py b/src/tickets/admin.py index e3ada8e7..031eb926 100644 --- a/src/tickets/admin.py +++ b/src/tickets/admin.py @@ -82,3 +82,7 @@ class ShopTicketAdmin(BaseTicketAdmin): ] search_fields = ['uuid', 'order__id', 'order__user__email', 'name', 'email'] + + +class ShopTicketInline(admin.TabularInline): + model = ShopTicket