From 64c6a35027b2bdba9ea6046372fcb03a0a0b50c2 Mon Sep 17 00:00:00 2001 From: RomainFayolle Date: Wed, 1 Nov 2023 03:34:52 -0400 Subject: [PATCH 1/2] add filter by order transaction date on orderline admin --- store/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/store/admin.py b/store/admin.py index 02e820f9..2fc55557 100644 --- a/store/admin.py +++ b/store/admin.py @@ -169,6 +169,7 @@ class OrderLineAdmin(SimpleHistoryAdmin, ExportActionModelAdmin): CouponFilter, 'quantity', OrderUserFilter, + 'order__transaction_date', ) search_fields = [ 'order__user__email', From f35fe85ecccce9058474fea39c1f94c9570de1ee Mon Sep 17 00:00:00 2001 From: RomainFayolle Date: Thu, 2 Nov 2023 06:20:14 -0400 Subject: [PATCH 2/2] fix name error on timeslot export --- store/resources.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/store/resources.py b/store/resources.py index 6b719283..30d7dbc0 100644 --- a/store/resources.py +++ b/store/resources.py @@ -100,7 +100,11 @@ class OrderLineResource(resources.ModelResource): def dehydrate_item_name(self, orderline): model = get_model_from_name(orderline.content_type.model) - return model.objects.get(id=orderline.object_id).name + try: + name = model.objects.get(id=orderline.object_id).name + except AttributeError: + name = model._meta.verbose_name.title() + return name def dehydrate_item_id(self, orderline): model = get_model_from_name(orderline.content_type.model)