fixed display of archived products

counter/models.py

@@ -690,8 +690,10 @@ class Counter(models.Model):
         Prices will be annotated
         """
 
-        products = self.products.select_related("product_type").prefetch_related(
-            "buying_groups"
+        products = (
+            self.products.filter(archived=False)
+            .select_related("product_type")
+            .prefetch_related("buying_groups")
         )
 
         # Only include age appropriate products

sas/static/bundled/sas/user/pictures-index.ts

@@ -7,7 +7,6 @@ import {
 
 interface PagePictureConfig {
   userId: number;
-  lastPhotoDate?: string;
 }
 
 interface Album {
@@ -21,28 +20,11 @@ document.addEventListener("alpine:init", () => {
     loading: true,
     albums: [] as Album[],
 
-    async fetchPictures(): Promise<PictureSchema[]> {
-      const localStorageKey = `user${config.userId}Pictures`;
-      const localStorageDateKey = `user${config.userId}PicturesDate`;
-      const lastCachedDate = localStorage.getItem(localStorageDateKey);
-      if (
-        config.lastPhotoDate !== undefined &&
-        lastCachedDate !== undefined &&
-        lastCachedDate >= config.lastPhotoDate
-      ) {
-        return JSON.parse(localStorage.getItem(localStorageKey));
-      }
+    async init() {
       const pictures = await paginated(picturesFetchPictures, {
         // biome-ignore lint/style/useNamingConvention: from python api
         query: { users_identified: [config.userId] },
       } as PicturesFetchPicturesData);
-      localStorage.setItem(localStorageDateKey, config.lastPhotoDate);
-      localStorage.setItem(localStorageKey, JSON.stringify(pictures));
-      return pictures;
-    },
-
-    async init() {
-      const pictures = await this.fetchPictures();
       const groupedAlbums = Object.groupBy(pictures, (i: PictureSchema) => i.album.id);
       this.albums = Object.values(groupedAlbums).map((pictures: PictureSchema[]) => {
         return {

sas/templates/sas/user_pictures.jinja

@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block content %}
-  <main x-data="user_pictures({ userId: {{ object.id }}, lastPhotoDate: '{{ object.last_photo_date }}' })">
+  <main x-data="user_pictures({ userId: {{ object.id }} })">
     {% if user.id == object.id %}
       {{ download_button(_("Download all my pictures")) }}
     {% endif %}

sas/views.py

@@ -16,7 +16,6 @@ from typing import Any
 
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.db.models import OuterRef, Subquery
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
@@ -179,13 +178,6 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
     context_object_name = "profile"
     template_name = "sas/user_pictures.jinja"
     current_tab = "pictures"
-    queryset = User.objects.annotate(
-        last_photo_date=Subquery(
-            Picture.objects.filter(people__user=OuterRef("id"))
-            .order_by("-date")
-            .values("date")[:1]
-        )
-    ).all()
 
 
 # Admin views