diff --git a/SpitiGlykou/__pycache__/settings.cpython-311.pyc b/SpitiGlykou/__pycache__/settings.cpython-311.pyc index 1854072..34981be 100644 Binary files a/SpitiGlykou/__pycache__/settings.cpython-311.pyc and b/SpitiGlykou/__pycache__/settings.cpython-311.pyc differ diff --git a/orders_app/__pycache__/views.cpython-311.pyc b/orders_app/__pycache__/views.cpython-311.pyc index ec68190..c54f981 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/views.py b/orders_app/views.py index 3137da5..9ae92af 100644 --- a/orders_app/views.py +++ b/orders_app/views.py @@ -32,7 +32,7 @@ class ExportView(View): response['Content-Disposition'] = 'attachment; filename="orders.csv"' #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) order_data = Order.objects.filter(order_date__gte=last_month).order_by('id').reverse() @@ -305,7 +305,11 @@ class DashboardPageView(LoginRequiredMixin, TemplateView): else: context["DB_Objects"] = Order.objects.filter(store_id=7).filter(order_date__gte=time_delta).order_by('id').reverse() else: - context["DB_Objects"] = Order.objects.filter(order_date__gte=time_delta).order_by('id').reverse() + if all_orders: + context["DB_Objects"] = Order.objects.order_by('id').reverse() + else: + context["DB_Objects"] = Order.objects.filter(order_date__gte=time_delta).order_by('id').reverse() + context["active_page"] = 'dashboard' return context