@shopbite-de/storefront 1.5.2 → 1.5.3

package/app/composables/useBusinessHours.ts

@@ -22,7 +22,7 @@ export function useBusinessHours() {
   const getServiceIntervals = (date: Date): Array<ServiceInterval> => {
     if (!data.value) return [];
 
-    const dayOfWeek = date.getDay();
+    const dayOfWeek = date.getDay() === 0 ? 7 : date.getDay();
     const dayBusinessHours = data.value.filter(
       (bh) => bh.dayOfWeek === dayOfWeek,
     );
@@ -38,6 +38,7 @@ export function useBusinessHours() {
           end: setTime(date, endH, endM),
         };
       })
+      .sort((a, b) => a.start.getTime() - b.start.getTime())
       .filter((interval): interval is ServiceInterval => interval !== null);
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopbite-de/storefront",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "main": "nuxt.config.ts",
   "description": "Shopware storefront for food delivery shops",
   "keywords": [

package/test/nuxt/useBusinessHours.test.ts

@@ -18,6 +18,7 @@ mockNuxtImport("useAsyncData", () => {
 const mockBusinessHoursData = [
   { dayOfWeek: 1, openingTime: "11:30", closingTime: "14:30" },
   { dayOfWeek: 1, openingTime: "17:30", closingTime: "23:00" },
+  { dayOfWeek: 7, openingTime: "17:30", closingTime: "23:00" },
 ];
 
 mockNuxtImport("useShopwareContext", () => () => ({
@@ -55,4 +56,51 @@ describe("useBusinessHours", () => {
     isClosedHoliday.mockReturnValue(true);
     expect(isStoreOpen(openTime, isClosedHoliday)).toBe(false);
   });
+
+  it("should handle Sunday (day 7) correctly", async () => {
+    const { isStoreOpen, refresh } = useBusinessHours();
+    await refresh();
+
+    const isClosedHoliday = vi.fn().mockReturnValue(false);
+
+    // 2026-01-04 is a Sunday
+    const sundayOpenTime = new Date("2026-01-04T18:00:00");
+    expect(isStoreOpen(sundayOpenTime, isClosedHoliday)).toBe(true);
+
+    const sundayClosedTime = new Date("2026-01-04T12:00:00");
+    expect(isStoreOpen(sundayClosedTime, isClosedHoliday)).toBe(false);
+  });
+
+  it("should return correct next opening time", async () => {
+    const { getNextOpeningTime, refresh } = useBusinessHours();
+    await refresh();
+
+    const isClosedHoliday = vi.fn().mockReturnValue(false);
+
+    // Sunday at 12:00 -> should open at 17:30 today
+    const sundayNoon = ref(new Date("2026-01-04T12:00:00"));
+    expect(getNextOpeningTime(sundayNoon, isClosedHoliday)).toBe("17:30 Uhr");
+
+    // Sunday at 23:30 -> should open tomorrow (Monday) at 11:30
+    const sundayNight = ref(new Date("2026-01-04T23:30:00"));
+    expect(getNextOpeningTime(sundayNight, isClosedHoliday)).toBe(
+      "morgen um 11:30 Uhr",
+    );
+  });
+
+  it("should sort intervals correctly", async () => {
+    const { getServiceIntervals, refresh } = useBusinessHours();
+    await refresh();
+
+    // Monday
+    const monday = new Date("2023-10-23T10:00:00");
+    const intervals = getServiceIntervals(monday);
+
+    expect(intervals).toHaveLength(2);
+    expect(intervals[0].start.getHours()).toBe(11);
+    expect(intervals[1].start.getHours()).toBe(17);
+    expect(intervals[0].start.getTime()).toBeLessThan(
+      intervals[1].start.getTime(),
+    );
+  });
 });