argideli/OrdersApp
1
0
Fork 0
Code Pull Requests Wiki Activity

fix all orders

Browse Source
This commit is contained in:
Argiris Deligiannidis 2023-08-10 13:44:43 +00:00
parent 89fe2569f6
commit 1478768bfb
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SpitiGlykou/__pycache__/settings.cpython-311.pyc
View File

Binary file not shown.

BIN
orders_app/__pycache__/views.cpython-311.pyc
View File

Binary file not shown.

6
orders_app/views.py
View File

@ -32,7 +32,7 @@ class ExportView(View):
response['Content-Disposition'] = 'attachment; filename="orders.csv"' response['Content-Disposition'] = 'attachment; filename="orders.csv"'
#order_data = Order.objects.all() #order_data = Order.objects.all()
items = Item.objects.filter(my_date__gte=time_delta).order_by('id').reverse() #items = Item.objects.filter(my_date__gte=time_delta).order_by('id').reverse()
last_month = datetime.today() - timedelta(days=30) last_month = datetime.today() - timedelta(days=30)
order_data = Order.objects.filter(order_date__gte=last_month).order_by('id').reverse() order_data = Order.objects.filter(order_date__gte=last_month).order_by('id').reverse()
@ -304,8 +304,12 @@ class DashboardPageView(LoginRequiredMixin, TemplateView):
context["DB_Objects"] = Order.objects.filter(store_id=7).order_by('id').reverse() context["DB_Objects"] = Order.objects.filter(store_id=7).order_by('id').reverse()
else: else:
context["DB_Objects"] = Order.objects.filter(store_id=7).filter(order_date__gte=time_delta).order_by('id').reverse() context["DB_Objects"] = Order.objects.filter(store_id=7).filter(order_date__gte=time_delta).order_by('id').reverse()
else:
if all_orders:
context["DB_Objects"] = Order.objects.order_by('id').reverse()
else: else:
context["DB_Objects"] = Order.objects.filter(order_date__gte=time_delta).order_by('id').reverse() context["DB_Objects"] = Order.objects.filter(order_date__gte=time_delta).order_by('id').reverse()
context["active_page"] = 'dashboard' context["active_page"] = 'dashboard'
return context return context