From cb3e086c3a8093172f63cb4c76918c08e13d5749 Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 30 May 2024 16:42:25 +0300 Subject: [PATCH] new --- .../custom_context.cpython-310.pyc | Bin 1446 -> 1423 bytes osinaweb/customercore/custom_context.py | 4 +--- .../listing_pages/customer-tickets.html | 20 ++++++++++++------ .../user_profile_pages/user-profile.html | 2 +- osinaweb/db.sqlite3 | Bin 1359872 -> 1368064 bytes .../osinacore/templates/customer_index.html | 15 ++++++++++--- osinaweb/osinacore/templates/index.html | 1 + osinaweb/static/dist/output.css | 5 +++++ 8 files changed, 34 insertions(+), 13 deletions(-) diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc index b8062916c0a7028166fc6be6b44c993e03b87f0a..eed29c08c2b0cc0eb18b027f01b34f2957dda503 100644 GIT binary patch delta 251 zcmXAjF-yZh9L4W{mxOqiYn$S(bdhXs?&>$tAqWym{}nuilIC>j|8NqgAmMOxNEU~# zegQ{6LqAPJ`j*H0!F#+P^{MnqYsq>oT>j8C`U9foYnE;-H^KzO3`3}4y=ngQw?j4| z9@StZN>nwp2__vlPP~mf<^=I;c0Y3xwNoUGHgeb))zI^)OYCUaO$N$wT#I(xvFeo+ zPA-^JB~srjCS^`QoCJjwVfr23uneYt3*}h`>$v~Bi>{tm)e+wjEp!*JvkDS|oki04 z0(N3yDfk9HguRU#Gu_NEGt9ks65i7DIO#BZ-9LM&ygTr#hf%O9P*KG+QA9!s*{XV< z-8QUn<(lLRl%j;f{dbim-4b?53ymke77S`^oR%1>agWSLhRcBwnyZ20ecP~vP7jS+ z4Eu$?MWXae+W0NWZ?urX4lyE)b(f2Rbgn_8rdn9qmf@pyK*sBJ1L^iBn_iqI*ZgRi zoyW;yYnqJVnCHbwahXR^+_B8*p4Ah4gRuTaV`Z%4&sX#iU{ZguP1nW^z+W5j$D#EX GYySX*5J~v} 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 @@ - -