diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc index b8062916..eed29c08 100644 Binary files a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc differ diff --git a/osinaweb/customercore/custom_context.py b/osinaweb/customercore/custom_context.py index 40f93bc7..d6863e10 100644 --- a/osinaweb/customercore/custom_context.py +++ b/osinaweb/customercore/custom_context.py @@ -21,9 +21,7 @@ def utilities(request): orders_without_completed_status = orders_with_invoice.exclude(orderstatus__status='Completed') customer_open_invoices_count = orders_without_completed_status.count() - customer_open_tickets = Ticket.objects.filter( - Q(status__in=['Open', 'Working On']) & Q(customer=request.user.customerprofile) - ).order_by('-id') + customer_open_tickets = Ticket.objects.filter(customer=request.user.customerprofile).exclude(ticketstatus__status='Closed').order_by('-id') customer_open_tickets_count = customer_open_tickets.count() for ticket in customer_open_tickets: diff --git a/osinaweb/customercore/templates/listing_pages/customer-tickets.html b/osinaweb/customercore/templates/listing_pages/customer-tickets.html index f50f23ba..59de8095 100644 --- a/osinaweb/customercore/templates/listing_pages/customer-tickets.html +++ b/osinaweb/customercore/templates/listing_pages/customer-tickets.html @@ -65,10 +65,10 @@ {% for ticket in open_tickets %} - + -

{{ticket.title }}

+

{{ticket.title }}

@@ -104,8 +104,6 @@ - -