diff --git a/orders_app/__pycache__/admin.cpython-311.pyc b/orders_app/__pycache__/admin.cpython-311.pyc index 0571703..63dc2c8 100644 Binary files a/orders_app/__pycache__/admin.cpython-311.pyc and b/orders_app/__pycache__/admin.cpython-311.pyc differ diff --git a/orders_app/__pycache__/views.cpython-311.pyc b/orders_app/__pycache__/views.cpython-311.pyc index c54f981..b2287d3 100644 Binary files a/orders_app/__pycache__/views.cpython-311.pyc and b/orders_app/__pycache__/views.cpython-311.pyc differ diff --git a/orders_app/admin.py b/orders_app/admin.py index e3bbaea..0ca47d9 100644 --- a/orders_app/admin.py +++ b/orders_app/admin.py @@ -40,10 +40,10 @@ class OrderAdmin(admin.ModelAdmin): return "\n".join([str(p) for p in obj.order_products.all()]) def get_customer_name(self, obj): - return obj.customer.name + return obj.customer_name def get_customer_telephone(self, obj): - return obj.customer.telephone + return obj.customer_telephone get_customer_name.admin_order_field = 'customer_name' # Allows column order sorting get_customer_name.short_description = 'Customer Name' # Renames column head diff --git a/orders_app/views.py b/orders_app/views.py index 9ae92af..160fc9c 100644 --- a/orders_app/views.py +++ b/orders_app/views.py @@ -80,8 +80,8 @@ class ExportView(View): writer.writerow([order.id, timezone.localtime(order.order_date).strftime("%d/%m/%Y %H:%M"), order.delivery_date.strftime("%d/%m/%Y"), order.store, prod.product.name, prod.amount, prod_specs, - prod.info, order.customer.name, order.customer.telephone, - order.customer.email, order.customer.social_media, + prod.info, order.customer_name, order.customer_telephone, + order.customer_email, order.customer_social_media, order.order_info]) return response