@lodashventure/medusa-booking-for-pickup 1.5.10 → 1.5.12

package/.medusa/server/src/admin/index.js

@@ -5,8 +5,8 @@ const ui = require("@medusajs/ui");
 const react = require("react");
 const lucideReact = require("lucide-react");
 const icons = require("@medusajs/icons");
-const reactRouterDom = require("react-router-dom");
 const Medusa = require("@medusajs/js-sdk");
+const reactRouterDom = require("react-router-dom");
 require("@medusajs/admin-shared");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const Medusa__default = /* @__PURE__ */ _interopDefault(Medusa);
@@ -398,6 +398,48 @@ const usePickupShippingOptions = () => {
     refetch: fetchOptions
   };
 };
+const useOptionalNavigate = () => {
+  try {
+    return reactRouterDom.useNavigate();
+  } catch (error) {
+    if (void 0) {
+      console.warn(
+        "[pickup-shipping] Router context unavailable; navigation will fall back to window.location.",
+        error
+      );
+    }
+    return null;
+  }
+};
+const DEFAULT_PICKUP_PATH = "/app/pickup-shipping";
+const derivePickupBasePath = () => {
+  if (typeof window === "undefined") {
+    return DEFAULT_PICKUP_PATH;
+  }
+  const { pathname } = window.location;
+  const marker = "/pickup-shipping";
+  const index = pathname.indexOf(marker);
+  if (index === -1) {
+    return DEFAULT_PICKUP_PATH;
+  }
+  return pathname.slice(0, index + marker.length);
+};
+const fallbackNavigate = (target) => {
+  if (typeof window === "undefined") {
+    return;
+  }
+  window.location.assign(target);
+};
+const fallbackBack = (fallbackTarget) => {
+  if (typeof window === "undefined") {
+    return;
+  }
+  if (window.history.length > 1) {
+    window.history.back();
+    return;
+  }
+  fallbackNavigate(fallbackTarget);
+};
 const columnHelper = ui.createDataTableColumnHelper();
 const columns = [
   columnHelper.accessor("shipping_profile.name", {
@@ -414,12 +456,23 @@ const columns = [
   })
 ];
 const ShippingOptionList = () => {
-  const navigate = reactRouterDom.useNavigate();
+  const routerNavigate = useOptionalNavigate();
+  const pickupBasePath = react.useMemo(() => derivePickupBasePath(), []);
   const [pagination, setPagination] = react.useState({
     pageSize: 1e3,
     pageIndex: 0
   });
   const { data, isLoading } = usePickupShippingOptions();
+  const handleNavigate = react.useCallback(
+    (id) => {
+      if (routerNavigate) {
+        routerNavigate(`/pickup-shipping/${id}`);
+        return;
+      }
+      fallbackNavigate(`${pickupBasePath}/${id}`);
+    },
+    [routerNavigate, pickupBasePath]
+  );
   const table = ui.useDataTable({
     columns,
     data: (data == null ? void 0 : data.shipping_options) || [],
@@ -431,7 +484,7 @@ const ShippingOptionList = () => {
       onPaginationChange: setPagination
     },
     onRowClick: (_, row) => {
-      navigate(`/pickup-shipping/${row.id}`);
+      handleNavigate(row.id);
     }
   });
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "flex flex-col p-0 overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.DataTable, { instance: table, children: [
@@ -446,44 +499,103 @@ const config = adminSdk.defineRouteConfig({
   label: "Shipping Pickup",
   icon: icons.StackPerspective
 });
+const normalizeResponse = (payload) => {
+  if (payload == null ? void 0 : payload.shipping_option) {
+    return payload;
+  }
+  return {
+    shipping_option: payload
+  };
+};
 const usePickupAvailable = (id) => {
   const [data, setData] = react.useState(null);
   const [isLoading, setIsLoading] = react.useState(true);
   const [error, setError] = react.useState(null);
-  const fetchPickupAvailable = async () => {
-    if (!id) {
-      setError(new Error("id is required"));
-      setIsLoading(false);
-      return;
-    }
-    setIsLoading(true);
-    setError(null);
-    try {
-      const option = await sdk.admin.shippingOption.retrieve(id, {
-        fields: "*.*,pickupAvailability.*,pickup_availabilities.*"
-      });
-      if (option.shipping_option.service_zone.fulfillment_set.type !== "pickup") {
-        throw new Error("shipping option is not pickup");
+  const fetchPickupAvailable = react.useCallback(
+    async (shippingOptionId) => {
+      var _a, _b, _c;
+      if (!shippingOptionId || shippingOptionId === "undefined") {
+        return;
       }
-      setData(option);
-    } catch (err) {
-      setError(
-        err instanceof Error ? err : new Error("Failed to fetch pickup availability")
-      );
-    } finally {
+      setIsLoading(true);
+      setError(null);
+      try {
+        const option = await sdk.client.fetch(
+          `/admin/pickup-date/${shippingOptionId}`,
+          {
+            method: "GET"
+          }
+        );
+        const normalized = normalizeResponse(option);
+        if (((_c = (_b = (_a = normalized.shipping_option) == null ? void 0 : _a.service_zone) == null ? void 0 : _b.fulfillment_set) == null ? void 0 : _c.type) !== "pickup") {
+          throw new Error("shipping option is not pickup");
+        }
+        setData(normalized);
+      } catch (err) {
+        setError(
+          err instanceof Error ? err : new Error("Failed to fetch pickup availability")
+        );
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    []
+  );
+  react.useEffect(() => {
+    if (!id || id === "undefined") {
       setIsLoading(false);
+      return;
     }
-  };
-  react.useEffect(() => {
-    fetchPickupAvailable();
-  }, [id]);
+    fetchPickupAvailable(id);
+  }, [id, fetchPickupAvailable]);
   return {
     data,
     isLoading,
     error,
-    refetch: fetchPickupAvailable
+    refetch: () => fetchPickupAvailable(id)
   };
 };
+const PICKUP_SEGMENT = "/pickup-shipping/";
+const deriveIdFromPath = (pathname) => {
+  if (!pathname) {
+    return void 0;
+  }
+  const normalizedPath = pathname.split("?")[0] ?? "";
+  const markerIndex = normalizedPath.indexOf(PICKUP_SEGMENT);
+  if (markerIndex === -1) {
+    return void 0;
+  }
+  const startIndex = markerIndex + PICKUP_SEGMENT.length;
+  if (startIndex >= normalizedPath.length) {
+    return void 0;
+  }
+  const endIndex = normalizedPath.indexOf("/", startIndex);
+  const rawId = endIndex === -1 ? normalizedPath.slice(startIndex) : normalizedPath.slice(startIndex, endIndex);
+  return rawId ? decodeURIComponent(rawId) : void 0;
+};
+const usePickupRouteId = () => {
+  let params = {};
+  try {
+    params = reactRouterDom.useParams();
+  } catch (error) {
+    if (void 0) {
+      console.warn(
+        "[pickup-shipping] Router params unavailable; deriving id from pathname.",
+        error
+      );
+    }
+  }
+  const paramId = params == null ? void 0 : params.id;
+  return react.useMemo(() => {
+    if (paramId && paramId !== "undefined") {
+      return paramId;
+    }
+    if (typeof window === "undefined") {
+      return void 0;
+    }
+    return deriveIdFromPath(window.location.pathname);
+  }, [paramId]);
+};
 const stringToMinutes = (time, defaultValue) => {
   if (!time) return defaultValue;
   const [hours, minutes] = time.split(":");
@@ -627,12 +739,13 @@ const DEFAULT_SCHEDULE = {
   sunday: { enabled: false, timeSlots: [] }
 };
 function ShippingOptionDetails() {
-  const { id } = reactRouterDom.useParams();
-  const navigate = reactRouterDom.useNavigate();
+  const shippingOptionId = usePickupRouteId();
+  const routerNavigate = useOptionalNavigate();
+  const pickupBasePath = react.useMemo(() => derivePickupBasePath(), []);
   const [schedule, setSchedule] = react.useState(
     structuredClone(DEFAULT_SCHEDULE)
   );
-  const { data, refetch, error } = usePickupAvailable(id);
+  const { data, refetch, error } = usePickupAvailable(shippingOptionId);
   react.useEffect(() => {
     if (!(data == null ? void 0 : data.shipping_option)) {
       return;
@@ -650,10 +763,48 @@ function ShippingOptionDetails() {
       }
       return [];
     };
-    const normalized = [
+    const safeDateIdentifier = (value) => {
+      if (!value) {
+        return "";
+      }
+      const date = new Date(value);
+      if (Number.isNaN(date.getTime())) {
+        return value.toString();
+      }
+      return date.toISOString();
+    };
+    const buildIdentifier = (availability) => {
+      if (!availability) {
+        return "";
+      }
+      if (availability.id) {
+        return availability.id.toString();
+      }
+      return [
+        availability.day_of_week,
+        safeDateIdentifier(availability.timeStart),
+        safeDateIdentifier(availability.timeEnd)
+      ].filter(Boolean).join("-");
+    };
+    const allAvailabilities = [
       ...normalizeInput(data.shipping_option.pickup_availabilities),
       ...normalizeInput(data.shipping_option.pickupAvailability)
     ];
+    const seenAvailabilities = /* @__PURE__ */ new Set();
+    const normalized = allAvailabilities.filter((availability) => {
+      if (!availability) {
+        return false;
+      }
+      const identifier = buildIdentifier(availability);
+      if (!identifier) {
+        return true;
+      }
+      if (seenAvailabilities.has(identifier)) {
+        return false;
+      }
+      seenAvailabilities.add(identifier);
+      return true;
+    });
     normalized.forEach((availability) => {
       if (!(availability == null ? void 0 : availability.day_of_week)) {
         return;
@@ -684,6 +835,14 @@ function ShippingOptionDetails() {
     }));
   }, []);
   const handleUpdateSchedules = async () => {
+    if (!shippingOptionId) {
+      ui.toast.error("Missing shipping option id", {
+        description: "Please reopen this screen from the pickup shipping list.",
+        duration: 3e3,
+        dismissable: true
+      });
+      return;
+    }
     const invalidSchedules = Object.entries(schedule).filter(
       ([_, schedule2]) => {
         if (!schedule2.enabled) return false;
@@ -703,7 +862,7 @@ function ShippingOptionDetails() {
       return;
     }
     try {
-      await sdk.client.fetch(`/admin/pickup-date/${id}`, {
+      await sdk.client.fetch(`/admin/pickup-date/${shippingOptionId}`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
@@ -783,15 +942,45 @@ function ShippingOptionDetails() {
       };
     });
   }, []);
+  const handleBackNavigation = react.useCallback(() => {
+    if (routerNavigate) {
+      routerNavigate("/pickup-shipping");
+      return;
+    }
+    fallbackBack(pickupBasePath);
+  }, [routerNavigate, pickupBasePath]);
+  const handleRetry = react.useCallback(() => {
+    if (typeof window !== "undefined") {
+      window.location.reload();
+      return;
+    }
+    refetch();
+  }, [refetch]);
   if (error) {
-    return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/pickup-shipping" });
+    return /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "p-6 space-y-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(
+        ui.Button,
+        {
+          onClick: handleBackNavigation,
+          variant: "transparent",
+          className: "p-0",
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsx(lucideReact.ArrowLeft, { size: 20 }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "ml-2", children: "Back" })
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Unable to load pickup hours" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: error.message || "An unexpected error occurred while loading this shipping option." }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "secondary", onClick: handleRetry, children: "Retry" })
+    ] });
   }
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "p-4 ", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(
         ui.Button,
         {
-          onClick: () => navigate("/pickup-shipping"),
+          onClick: handleBackNavigation,
           variant: "transparent",
           className: "p-0 mb-4",
           children: [

package/.medusa/server/src/admin/index.mjs

@@ -4,8 +4,8 @@ import { Container, Heading, Text, Badge, Button, toast, createDataTableColumnHe
 import { useState, useEffect, useMemo, useCallback } from "react";
 import { Calendar, Package, ShoppingBag, Clock, MapPin, RefreshCw, ArrowLeft, Trash2 } from "lucide-react";
 import { StackPerspective, Plus } from "@medusajs/icons";
-import { useNavigate, useParams, Navigate } from "react-router-dom";
 import Medusa from "@medusajs/js-sdk";
+import { useNavigate, useParams } from "react-router-dom";
 import "@medusajs/admin-shared";
 const CustomerPickupHistoryWidget = ({ data }) => {
   const [pickupHistory, setPickupHistory] = useState([]);
@@ -395,6 +395,49 @@ const usePickupShippingOptions = () => {
     refetch: fetchOptions
   };
 };
+const useOptionalNavigate = () => {
+  var _a, _b;
+  try {
+    return useNavigate();
+  } catch (error) {
+    if ((_b = (_a = import.meta) == null ? void 0 : _a.env) == null ? void 0 : _b.DEV) {
+      console.warn(
+        "[pickup-shipping] Router context unavailable; navigation will fall back to window.location.",
+        error
+      );
+    }
+    return null;
+  }
+};
+const DEFAULT_PICKUP_PATH = "/app/pickup-shipping";
+const derivePickupBasePath = () => {
+  if (typeof window === "undefined") {
+    return DEFAULT_PICKUP_PATH;
+  }
+  const { pathname } = window.location;
+  const marker = "/pickup-shipping";
+  const index = pathname.indexOf(marker);
+  if (index === -1) {
+    return DEFAULT_PICKUP_PATH;
+  }
+  return pathname.slice(0, index + marker.length);
+};
+const fallbackNavigate = (target) => {
+  if (typeof window === "undefined") {
+    return;
+  }
+  window.location.assign(target);
+};
+const fallbackBack = (fallbackTarget) => {
+  if (typeof window === "undefined") {
+    return;
+  }
+  if (window.history.length > 1) {
+    window.history.back();
+    return;
+  }
+  fallbackNavigate(fallbackTarget);
+};
 const columnHelper = createDataTableColumnHelper();
 const columns = [
   columnHelper.accessor("shipping_profile.name", {
@@ -411,12 +454,23 @@ const columns = [
   })
 ];
 const ShippingOptionList = () => {
-  const navigate = useNavigate();
+  const routerNavigate = useOptionalNavigate();
+  const pickupBasePath = useMemo(() => derivePickupBasePath(), []);
   const [pagination, setPagination] = useState({
     pageSize: 1e3,
     pageIndex: 0
   });
   const { data, isLoading } = usePickupShippingOptions();
+  const handleNavigate = useCallback(
+    (id) => {
+      if (routerNavigate) {
+        routerNavigate(`/pickup-shipping/${id}`);
+        return;
+      }
+      fallbackNavigate(`${pickupBasePath}/${id}`);
+    },
+    [routerNavigate, pickupBasePath]
+  );
   const table = useDataTable({
     columns,
     data: (data == null ? void 0 : data.shipping_options) || [],
@@ -428,7 +482,7 @@ const ShippingOptionList = () => {
       onPaginationChange: setPagination
     },
     onRowClick: (_, row) => {
-      navigate(`/pickup-shipping/${row.id}`);
+      handleNavigate(row.id);
     }
   });
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(Container, { className: "flex flex-col p-0 overflow-hidden", children: /* @__PURE__ */ jsxs(DataTable, { instance: table, children: [
@@ -443,44 +497,104 @@ const config = defineRouteConfig({
   label: "Shipping Pickup",
   icon: StackPerspective
 });
+const normalizeResponse = (payload) => {
+  if (payload == null ? void 0 : payload.shipping_option) {
+    return payload;
+  }
+  return {
+    shipping_option: payload
+  };
+};
 const usePickupAvailable = (id) => {
   const [data, setData] = useState(null);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState(null);
-  const fetchPickupAvailable = async () => {
-    if (!id) {
-      setError(new Error("id is required"));
-      setIsLoading(false);
-      return;
-    }
-    setIsLoading(true);
-    setError(null);
-    try {
-      const option = await sdk.admin.shippingOption.retrieve(id, {
-        fields: "*.*,pickupAvailability.*,pickup_availabilities.*"
-      });
-      if (option.shipping_option.service_zone.fulfillment_set.type !== "pickup") {
-        throw new Error("shipping option is not pickup");
+  const fetchPickupAvailable = useCallback(
+    async (shippingOptionId) => {
+      var _a, _b, _c;
+      if (!shippingOptionId || shippingOptionId === "undefined") {
+        return;
       }
-      setData(option);
-    } catch (err) {
-      setError(
-        err instanceof Error ? err : new Error("Failed to fetch pickup availability")
-      );
-    } finally {
+      setIsLoading(true);
+      setError(null);
+      try {
+        const option = await sdk.client.fetch(
+          `/admin/pickup-date/${shippingOptionId}`,
+          {
+            method: "GET"
+          }
+        );
+        const normalized = normalizeResponse(option);
+        if (((_c = (_b = (_a = normalized.shipping_option) == null ? void 0 : _a.service_zone) == null ? void 0 : _b.fulfillment_set) == null ? void 0 : _c.type) !== "pickup") {
+          throw new Error("shipping option is not pickup");
+        }
+        setData(normalized);
+      } catch (err) {
+        setError(
+          err instanceof Error ? err : new Error("Failed to fetch pickup availability")
+        );
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    []
+  );
+  useEffect(() => {
+    if (!id || id === "undefined") {
       setIsLoading(false);
+      return;
     }
-  };
-  useEffect(() => {
-    fetchPickupAvailable();
-  }, [id]);
+    fetchPickupAvailable(id);
+  }, [id, fetchPickupAvailable]);
   return {
     data,
     isLoading,
     error,
-    refetch: fetchPickupAvailable
+    refetch: () => fetchPickupAvailable(id)
   };
 };
+const PICKUP_SEGMENT = "/pickup-shipping/";
+const deriveIdFromPath = (pathname) => {
+  if (!pathname) {
+    return void 0;
+  }
+  const normalizedPath = pathname.split("?")[0] ?? "";
+  const markerIndex = normalizedPath.indexOf(PICKUP_SEGMENT);
+  if (markerIndex === -1) {
+    return void 0;
+  }
+  const startIndex = markerIndex + PICKUP_SEGMENT.length;
+  if (startIndex >= normalizedPath.length) {
+    return void 0;
+  }
+  const endIndex = normalizedPath.indexOf("/", startIndex);
+  const rawId = endIndex === -1 ? normalizedPath.slice(startIndex) : normalizedPath.slice(startIndex, endIndex);
+  return rawId ? decodeURIComponent(rawId) : void 0;
+};
+const usePickupRouteId = () => {
+  var _a, _b;
+  let params = {};
+  try {
+    params = useParams();
+  } catch (error) {
+    if ((_b = (_a = import.meta) == null ? void 0 : _a.env) == null ? void 0 : _b.DEV) {
+      console.warn(
+        "[pickup-shipping] Router params unavailable; deriving id from pathname.",
+        error
+      );
+    }
+  }
+  const paramId = params == null ? void 0 : params.id;
+  return useMemo(() => {
+    if (paramId && paramId !== "undefined") {
+      return paramId;
+    }
+    if (typeof window === "undefined") {
+      return void 0;
+    }
+    return deriveIdFromPath(window.location.pathname);
+  }, [paramId]);
+};
 const stringToMinutes = (time, defaultValue) => {
   if (!time) return defaultValue;
   const [hours, minutes] = time.split(":");
@@ -624,12 +738,13 @@ const DEFAULT_SCHEDULE = {
   sunday: { enabled: false, timeSlots: [] }
 };
 function ShippingOptionDetails() {
-  const { id } = useParams();
-  const navigate = useNavigate();
+  const shippingOptionId = usePickupRouteId();
+  const routerNavigate = useOptionalNavigate();
+  const pickupBasePath = useMemo(() => derivePickupBasePath(), []);
   const [schedule, setSchedule] = useState(
     structuredClone(DEFAULT_SCHEDULE)
   );
-  const { data, refetch, error } = usePickupAvailable(id);
+  const { data, refetch, error } = usePickupAvailable(shippingOptionId);
   useEffect(() => {
     if (!(data == null ? void 0 : data.shipping_option)) {
       return;
@@ -647,10 +762,48 @@ function ShippingOptionDetails() {
       }
       return [];
     };
-    const normalized = [
+    const safeDateIdentifier = (value) => {
+      if (!value) {
+        return "";
+      }
+      const date = new Date(value);
+      if (Number.isNaN(date.getTime())) {
+        return value.toString();
+      }
+      return date.toISOString();
+    };
+    const buildIdentifier = (availability) => {
+      if (!availability) {
+        return "";
+      }
+      if (availability.id) {
+        return availability.id.toString();
+      }
+      return [
+        availability.day_of_week,
+        safeDateIdentifier(availability.timeStart),
+        safeDateIdentifier(availability.timeEnd)
+      ].filter(Boolean).join("-");
+    };
+    const allAvailabilities = [
       ...normalizeInput(data.shipping_option.pickup_availabilities),
       ...normalizeInput(data.shipping_option.pickupAvailability)
     ];
+    const seenAvailabilities = /* @__PURE__ */ new Set();
+    const normalized = allAvailabilities.filter((availability) => {
+      if (!availability) {
+        return false;
+      }
+      const identifier = buildIdentifier(availability);
+      if (!identifier) {
+        return true;
+      }
+      if (seenAvailabilities.has(identifier)) {
+        return false;
+      }
+      seenAvailabilities.add(identifier);
+      return true;
+    });
     normalized.forEach((availability) => {
       if (!(availability == null ? void 0 : availability.day_of_week)) {
         return;
@@ -681,6 +834,14 @@ function ShippingOptionDetails() {
     }));
   }, []);
   const handleUpdateSchedules = async () => {
+    if (!shippingOptionId) {
+      toast.error("Missing shipping option id", {
+        description: "Please reopen this screen from the pickup shipping list.",
+        duration: 3e3,
+        dismissable: true
+      });
+      return;
+    }
     const invalidSchedules = Object.entries(schedule).filter(
       ([_, schedule2]) => {
         if (!schedule2.enabled) return false;
@@ -700,7 +861,7 @@ function ShippingOptionDetails() {
       return;
     }
     try {
-      await sdk.client.fetch(`/admin/pickup-date/${id}`, {
+      await sdk.client.fetch(`/admin/pickup-date/${shippingOptionId}`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
@@ -780,15 +941,45 @@ function ShippingOptionDetails() {
       };
     });
   }, []);
+  const handleBackNavigation = useCallback(() => {
+    if (routerNavigate) {
+      routerNavigate("/pickup-shipping");
+      return;
+    }
+    fallbackBack(pickupBasePath);
+  }, [routerNavigate, pickupBasePath]);
+  const handleRetry = useCallback(() => {
+    if (typeof window !== "undefined") {
+      window.location.reload();
+      return;
+    }
+    refetch();
+  }, [refetch]);
   if (error) {
-    return /* @__PURE__ */ jsx(Navigate, { to: "/pickup-shipping" });
+    return /* @__PURE__ */ jsxs(Container, { className: "p-6 space-y-4", children: [
+      /* @__PURE__ */ jsxs(
+        Button,
+        {
+          onClick: handleBackNavigation,
+          variant: "transparent",
+          className: "p-0",
+          children: [
+            /* @__PURE__ */ jsx(ArrowLeft, { size: 20 }),
+            /* @__PURE__ */ jsx(Text, { className: "ml-2", children: "Back" })
+          ]
+        }
+      ),
+      /* @__PURE__ */ jsx(Heading, { children: "Unable to load pickup hours" }),
+      /* @__PURE__ */ jsx(Text, { children: error.message || "An unexpected error occurred while loading this shipping option." }),
+      /* @__PURE__ */ jsx(Button, { variant: "secondary", onClick: handleRetry, children: "Retry" })
+    ] });
   }
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs(Container, { className: "p-4 ", children: [
       /* @__PURE__ */ jsxs(
         Button,
         {
-          onClick: () => navigate("/pickup-shipping"),
+          onClick: handleBackNavigation,
           variant: "transparent",
           className: "p-0 mb-4",
           children: [

package/.medusa/server/src/api/admin/orders/[id]/pickup-booking/route.js

@@ -31,10 +31,8 @@ const GET = async (req, res) => {
             entity: "order",
             fields: [
                 "id",
-                "shipping_methods.*",
-                "shipping_methods.shipping_option.*",
-                "shipping_methods.shipping_option.service_zone.*",
-                "shipping_methods.shipping_option.service_zone.fulfillment_set.*",
+                "shipping_methods.id",
+                "shipping_methods.shipping_option_id",
             ],
             filters: {
                 id: order_id,
@@ -43,32 +41,52 @@ const GET = async (req, res) => {
         const order = orderResult.data?.[0] || null;
         // Find the pickup shipping method
         let pickupShippingOption = null;
-        if (order && order.shipping_methods && order.shipping_methods.length > 0) {
-            // Find shipping method with fulfillment_set type = "pickup"
-            const pickupMethod = order.shipping_methods.find((sm) => sm.shipping_option?.service_zone?.fulfillment_set?.type === "pickup");
-            if (pickupMethod) {
-                pickupShippingOption = pickupMethod.shipping_option;
-                // Try to fetch stock location separately if fulfillment_set has location_id
-                const fulfillmentSet = pickupShippingOption?.service_zone
-                    ?.fulfillment_set;
-                if (fulfillmentSet?.location_id) {
-                    try {
-                        const locationResult = await query.graph({
-                            entity: "stock_location",
-                            fields: ["id", "name", "address.*"],
-                            filters: {
-                                id: fulfillmentSet.location_id,
-                            },
-                        });
-                        if (locationResult.data?.[0]) {
-                            // Attach location to fulfillment_set
-                            fulfillmentSet.location = locationResult.data[0];
+        if (order && Array.isArray(order.shipping_methods)) {
+            for (const shippingMethod of order.shipping_methods) {
+                if (!shippingMethod?.shipping_option_id) {
+                    continue;
+                }
+                try {
+                    const optionResult = await query.graph({
+                        entity: "shipping_option",
+                        fields: [
+                            "id",
+                            "name",
+                            "type",
+                            "service_zone.*",
+                            "service_zone.fulfillment_set.*",
+                        ],
+                        filters: {
+                            id: shippingMethod.shipping_option_id,
+                        },
+                    });
+                    const candidate = optionResult.data?.[0];
+                    if (candidate?.service_zone?.fulfillment_set?.type &&
+                        candidate.service_zone.fulfillment_set.type === "pickup") {
+                        pickupShippingOption = candidate;
+                        const fulfillmentSet = candidate.service_zone?.fulfillment_set || null;
+                        if (fulfillmentSet?.location_id) {
+                            try {
+                                const locationResult = await query.graph({
+                                    entity: "stock_location",
+                                    fields: ["id", "name", "address.*"],
+                                    filters: {
+                                        id: fulfillmentSet.location_id,
+                                    },
+                                });
+                                if (locationResult.data?.[0]) {
+                                    fulfillmentSet.location = locationResult.data[0];
+                                }
+                            }
+                            catch (locError) {
+                                console.warn("Could not fetch location:", locError);
+                            }
                         }
+                        break;
                     }
-                    catch (locError) {
-                        // If location query fails, continue without it
-                        console.warn("Could not fetch location:", locError);
-                    }
+                }
+                catch (optionError) {
+                    console.warn(`Could not fetch shipping option ${shippingMethod.shipping_option_id}:`, optionError);
                 }
             }
         }
@@ -175,4 +193,4 @@ const PATCH = async (req, res) => {
     }
 };
 exports.PATCH = PATCH;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVycy9baWRdL3BpY2t1cC1ib29raW5nL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFzRTtBQUV0RTs7OztHQUlHO0FBQ0ksTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUNwQyxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUVqRSxJQUFJLENBQUM7UUFDSCxtQ0FBbUM7UUFDbkMsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1lBQy9CLE1BQU0sRUFBRSxhQUFhO1lBQ3JCLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxpQkFBaUIsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFlBQVksQ0FBQztZQUN6RSxPQUFPLEVBQUU7Z0JBQ1AsUUFBUSxFQUFFLFFBQVE7YUFDbkI7U0FDRixDQUFDLENBQUM7UUFFSCxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDO1FBRTVDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNoQixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUMxQixPQUFPLEVBQUUsd0NBQXdDO2dCQUNqRCxjQUFjLEVBQUUsSUFBSTthQUNyQixDQUFDLENBQUM7UUFDTCxDQUFDO1FBRUQsZ0RBQWdEO1FBQ2hELE1BQU0sV0FBVyxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztZQUNw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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVycy9baWRdL3BpY2t1cC1ib29raW5nL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFzRTtBQUV0RTs7OztHQUlHO0FBQ0ksTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUNwQyxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUVqRSxJQUFJLENBQUM7UUFDSCxtQ0FBbUM7UUFDbkMsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1lBQy9CLE1BQU0sRUFBRSxhQUFhO1lBQ3JCLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxpQkFBaUIsRUFBRSxVQUFVLEVBQUUsWUFBWSxFQUFFLFlBQVksQ0FBQztZQUN6RSxPQUFPLEVBQUU7Z0JBQ1AsUUFBUSxFQUFFLFFBQVE7YUFDbkI7U0FDRixDQUFDLENBQUM7UUFFSCxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDO1FBRTVDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNoQixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUMxQixPQUFPLEVBQUUsd0NBQXdDO2dCQUNqRCxjQUFjLEVBQUUsSUFBSTthQUNyQixDQUFDLENBQUM7UUFDTCxDQUFDO1FBRUQsZ0RBQWdEO1FBQ2hELE1BQU0sV0FBVyxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztZQUNw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

package/.medusa/server/src/api/admin/pickup-date/[id]/route.js

@@ -3,18 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = exports.POST = void 0;
 const framework_1 = require("@medusajs/framework");
 const utils_1 = require("@medusajs/framework/utils");
-const updatePickupAvailabilityWorkflow_1 = require("../../../../workflows/pickup-availablity/updatePickupAvailabilityWorkflow");
+const pickup_datetime_1 = require("../../../../modules/pickup-datetime");
+const build_shipping_option_link_1 = require("../../../../workflows/pickup-availablity/utils/build-shipping-option-link");
 const POST = async (req, res) => {
     const { id: shipping_option_id } = req.params;
     const input = req.body;
     try {
-        const updated = await updatePickupAvailabilityWorkflow_1.updatePickupAvailabilityWorkflow.run({
-            input: {
-                schedules: input.schedules,
-                shipping_option_id,
-            },
+        const pickupDatetimeService = framework_1.container.resolve(pickup_datetime_1.PICKUP_DATETIME_MODULE);
+        const link = framework_1.container.resolve(utils_1.ContainerRegistrationKeys.LINK);
+        const existingAvailabilities = await pickupDatetimeService.listPickupAvailabilities({
+            shipping_option_id,
         });
-        res.status(200).json({ availability: updated });
+        if (existingAvailabilities.length) {
+            await link.dismiss(existingAvailabilities.map((availability) => (0, build_shipping_option_link_1.buildShippingOptionPickupLink)(shipping_option_id, availability.id)));
+            await pickupDatetimeService.deletePickupAvailabilities(existingAvailabilities.map((availability) => availability.id));
+        }
+        const availabilities = input.schedules
+            .filter((schedule) => schedule.enable)
+            .flatMap((schedule) => schedule.timeSlots.map((slot) => {
+            const [startHour, startMinute] = slot.start.split(":").map(Number);
+            const [endHour, endMinute] = slot.end.split(":").map(Number);
+            const timeStart = new Date();
+            timeStart.setHours(startHour, startMinute, 0, 0);
+            const timeEnd = new Date();
+            timeEnd.setHours(endHour, endMinute, 0, 0);
+            return {
+                shipping_option_id,
+                enable: true,
+                day_of_week: schedule.day_of_week,
+                timeStart,
+                timeEnd,
+            };
+        }));
+        const created = await pickupDatetimeService.createPickupAvailabilities(availabilities);
+        if (created.length) {
+            await link.create(created.map((availability) => (0, build_shipping_option_link_1.buildShippingOptionPickupLink)(shipping_option_id, availability.id)));
+        }
+        res.status(200).json({ availability: created });
     }
     catch (error) {
         res.status(500).json({ error: error.message });
@@ -24,19 +49,34 @@ exports.POST = POST;
 const GET = async (req, res) => {
     const { id: shipping_option_id } = req.params;
     const query = framework_1.container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    const pickupDatetimeService = framework_1.container.resolve(pickup_datetime_1.PICKUP_DATETIME_MODULE);
     try {
-        const option = await query.graph({
+        const { data: [shippingOption], } = await query.graph({
             entity: "shipping_option",
-            fields: ["pickup_availabilities.*"],
+            fields: ["*", "service_zone.*", "service_zone.fulfillment_set.*"],
             filters: {
                 id: shipping_option_id,
             },
         });
-        res.status(200).json(option.data[0]);
+        if (!shippingOption) {
+            return res.status(404).json({
+                error: `Shipping option ${shipping_option_id} not found`,
+            });
+        }
+        const availabilities = await pickupDatetimeService.listPickupAvailabilities({
+            shipping_option_id,
+        });
+        res.status(200).json({
+            shipping_option: {
+                ...shippingOption,
+                pickup_availabilities: availabilities,
+                pickupAvailability: availabilities,
+            },
+        });
     }
     catch (error) {
         res.status(500).json({ error: error.message });
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3BpY2t1cC1kYXRlL1tpZF0vcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBQStFO0FBQy9FLHFEQUdtQztBQUNuQyxnSUFBNkg7QUFHdEgsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUN2QixHQUVFLEVBQ0YsR0FBbUIsRUFDbkIsRUFBRTtJQUNGLE1BQU0sRUFBRSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDO0lBQzlDLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7SUFFdkIsSUFBSSxDQUFDO1FBQ0gsTUFBTSxPQUFPLEdBQUcsTUFBTSxtRUFBZ0MsQ0FBQyxHQUFHLENBQUM7WUFDekQsS0FBSyxFQUFFO2dCQUNMLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUztnQkFDMUIsa0JBQWtCO2FBQ25CO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7QUFDSCxDQUFDLENBQUM7QUFwQlcsUUFBQSxJQUFJLFFBb0JmO0FBRUssTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDO0lBQzlDLE1BQU0sS0FBSyxHQUFHLHFCQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRWpFLElBQUksQ0FBQztRQUNILE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztZQUMvQixNQUFNLEVBQUUsaUJBQWlCO1lBQ3pCLE1BQU0sRUFBRSxDQUFDLHlCQUF5QixDQUFDO1lBQ25DLE9BQU8sRUFBRTtnQkFDUCxFQUFFLEVBQUUsa0JBQWtCO2FBQ3ZCO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDakQsQ0FBQztBQUNILENBQUMsQ0FBQztBQWhCVyxRQUFBLEdBQUcsT0FnQmQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3BpY2t1cC1kYXRlL1tpZF0vcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsbURBQStFO0FBQy9FLHFEQUFzRTtBQUV0RSx5RUFBNkU7QUFFN0UsMEhBQTBIO0FBRW5ILE1BQU0sSUFBSSxHQUFHLEtBQUssRUFDdkIsR0FFRSxFQUNGLEdBQW1CLEVBQ25CLEVBQUU7SUFDRixNQUFNLEVBQUUsRUFBRSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUM5QyxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFDO0lBRXZCLElBQUksQ0FBQztRQUNILE1BQU0scUJBQXFCLEdBQ3pCLHFCQUFTLENBQUMsT0FBTyxDQUE4Qix3Q0FBc0IsQ0FBQyxDQUFDO1FBQ3pFLE1BQU0sSUFBSSxHQUFHLHFCQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBRS9ELE1BQU0sc0JBQXNCLEdBQzFCLE1BQU0scUJBQXFCLENBQUMsd0JBQXdCLENBQUM7WUFDbkQsa0JBQWtCO1NBQ25CLENBQUMsQ0FBQztRQUVMLElBQUksc0JBQXNCLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDbEMsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUNoQixzQkFBc0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxZQUFZLEVBQUUsRUFBRSxDQUMxQyxJQUFBLDBEQUE2QixFQUFDLGtCQUFrQixFQUFFLFlBQVksQ0FBQyxFQUFFLENBQUMsQ0FDbkUsQ0FDRixDQUFDO1lBRUYsTUFBTSxxQkFBcUIsQ0FBQywwQkFBMEIsQ0FDcEQsc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBQzlELENBQUM7UUFDSixDQUFDO1FBRUQs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

package/.medusa/server/src/api/store/pickup-date/route.js

@@ -3,22 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GET = void 0;
 const framework_1 = require("@medusajs/framework");
 const utils_1 = require("@medusajs/framework/utils");
+const pickup_datetime_1 = require("../../../modules/pickup-datetime");
 const GET = async (req, res) => {
     const { id: shipping_option_id } = req.params;
     const query = framework_1.container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    const pickupDatetimeService = framework_1.container.resolve(pickup_datetime_1.PICKUP_DATETIME_MODULE);
     try {
-        const option = await query.graph({
+        const { data: [shippingOption], } = await query.graph({
             entity: "shipping_option",
-            fields: ["pickup_availabilities.*"],
+            fields: ["*", "service_zone.*", "service_zone.fulfillment_set.*"],
             filters: {
                 id: shipping_option_id,
             },
         });
-        res.status(200).json(option.data[0]);
+        if (!shippingOption) {
+            return res.status(404).json({
+                error: `Shipping option ${shipping_option_id} not found`,
+            });
+        }
+        const availabilities = await pickupDatetimeService.listPickupAvailabilities({
+            shipping_option_id,
+        });
+        res.status(200).json({
+            shipping_option: {
+                ...shippingOption,
+                pickup_availabilities: availabilities,
+                pickupAvailability: availabilities,
+            },
+        });
     }
     catch (error) {
         res.status(500).json({ error: error.message });
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3BpY2t1cC1kYXRlL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQUErRTtBQUMvRSxxREFHbUM7QUFFNUIsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxFQUFFLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDO0lBQzlDLE1BQU0sS0FBSyxHQUFHLHFCQUFTLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRWpFLElBQUksQ0FBQztRQUNILE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztZQUMvQixNQUFNLEVBQUUsaUJBQWlCO1lBQ3pCLE1BQU0sRUFBRSxDQUFDLHlCQUF5QixDQUFDO1lBQ25DLE9BQU8sRUFBRTtnQkFDUCxFQUFFLEVBQUUsa0JBQWtCO2FBQ3ZCO1NBQ0YsQ0FBQyxDQUFDO1FBQ0gsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDakQsQ0FBQztBQUNILENBQUMsQ0FBQztBQWhCVyxRQUFBLEdBQUcsT0FnQmQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL3BpY2t1cC1kYXRlL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQUErRTtBQUMvRSxxREFHbUM7QUFDbkMsc0VBQTBFO0FBR25FLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUFrQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNuRSxNQUFNLEVBQUUsRUFBRSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUM5QyxNQUFNLEtBQUssR0FBRyxxQkFBUyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNqRSxNQUFNLHFCQUFxQixHQUN6QixxQkFBUyxDQUFDLE9BQU8sQ0FBOEIsd0NBQXNCLENBQUMsQ0FBQztJQUV6RSxJQUFJLENBQUM7UUFDSCxNQUFNLEVBQ0osSUFBSSxFQUFFLENBQUMsY0FBYyxDQUFDLEdBQ3ZCLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO1lBQ3BCLE1BQU0sRUFBRSxpQkFBaUI7WUFDekIsTUFBTSxFQUFFLENBQUMsR0FBRyxFQUFFLGdCQUFnQixFQUFFLGdDQUFnQyxDQUFDO1lBQ2pFLE9BQU8sRUFBRTtnQkFDUCxFQUFFLEVBQUUsa0JBQWtCO2FBQ3ZCO1NBQ0YsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ3BCLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQzFCLEtBQUssRUFBRSxtQkFBbUIsa0JBQWtCLFlBQVk7YUFDekQsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztRQUVELE1BQU0sY0FBYyxHQUFHLE1BQU0scUJBQXFCLENBQUMsd0JBQXdCLENBQ3pFO1lBQ0Usa0JBQWtCO1NBQ25CLENBQ0YsQ0FBQztRQUVGLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ25CLGVBQWUsRUFBRTtnQkFDZixHQUFHLGNBQWM7Z0JBQ2pCLHFCQUFxQixFQUFFLGNBQWM7Z0JBQ3JDLGtCQUFrQixFQUFFLGNBQWM7YUFDbkM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7QUFDSCxDQUFDLENBQUM7QUF2Q1csUUFBQSxHQUFHLE9BdUNkIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodashventure/medusa-booking-for-pickup",
-  "version": "1.5.10",
+  "version": "1.5.12",
   "description": "A starter for Medusa plugins.",
   "author": "Medusa (https://medusajs.com)",
   "license": "MIT",

package/.medusa/server/src/modules/pickup-datetime/migrations/Migration20250515000000.js

@@ -1,186 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Migration20250515000000 = void 0;
-const migrations_1 = require("@medusajs/framework/mikro-orm/migrations");
-class Migration20250515000000 extends migrations_1.Migration {
-    async up() {
-        this.addSql(`
-      create table if not exists "product_variant_attribute" (
-        "id" text not null,
-        "product_variant_id" text not null,
-        "attribute_key" text not null,
-        "attribute_value" text not null,
-        "created_at" timestamptz not null default now(),
-        "updated_at" timestamptz not null default now(),
-        "deleted_at" timestamptz null,
-        constraint "product_variant_attribute_pkey" primary key ("id")
-      );
-    `);
-        this.addSql(`
-      CREATE INDEX IF NOT EXISTS "IDX_product_variant_attribute_deleted_at"
-      ON "product_variant_attribute" (deleted_at)
-      WHERE deleted_at IS NULL;
-    `);
-        this.addSql(`
-      CREATE INDEX IF NOT EXISTS "IDX_product_variant_attribute_product_variant_id"
-      ON "product_variant_attribute" (product_variant_id)
-      WHERE deleted_at IS NULL;
-    `);
-        this.addSql(`
-      do $$
-      begin
-        if not exists (
-          select 1
-          from information_schema.table_constraints
-          where table_name = 'product_variant_attribute'
-            and constraint_name = 'product_variant_attribute_product_variant_id_foreign'
-        ) then
-          alter table "product_variant_attribute"
-          add constraint "product_variant_attribute_product_variant_id_foreign"
-          foreign key ("product_variant_id") references "product_variant" ("id")
-          on update cascade on delete cascade;
-        end if;
-      end;
-      $$;
-    `);
-        this.addSql(`
-      do $$
-      begin
-        if to_regclass('product_variant') is not null and
-           exists (
-             select 1 from information_schema.columns
-             where table_name = 'product_variant'
-               and column_name = 'color'
-           ) then
-          insert into "product_variant_attribute"
-            ("id", "product_variant_id", "attribute_key", "attribute_value", "created_at", "updated_at")
-          select
-            concat('pvat_', substr(md5(random()::text), 1, 24)),
-            pv.id,
-            'color',
-            pv.color,
-            now(),
-            now()
-          from "product_variant" pv
-          where pv.color is not null
-            and pv.color <> ''
-            and not exists (
-              select 1
-              from "product_variant_attribute" pva
-              where pva.product_variant_id = pv.id
-                and pva.attribute_key = 'color'
-                and pva.deleted_at is null
-            );
-        end if;
-      end;
-      $$;
-    `);
-        this.addSql(`
-      do $$
-      begin
-        if to_regclass('product_variant') is not null and
-           exists (
-             select 1 from information_schema.columns
-             where table_name = 'product_variant'
-               and column_name = 'size'
-           ) then
-          insert into "product_variant_attribute"
-            ("id", "product_variant_id", "attribute_key", "attribute_value", "created_at", "updated_at")
-          select
-            concat('pvat_', substr(md5(random()::text), 1, 24)),
-            pv.id,
-            'size',
-            pv.size,
-            now(),
-            now()
-          from "product_variant" pv
-          where pv.size is not null
-            and pv.size <> ''
-            and not exists (
-              select 1
-              from "product_variant_attribute" pva
-              where pva.product_variant_id = pv.id
-                and pva.attribute_key = 'size'
-                and pva.deleted_at is null
-            );
-        end if;
-      end;
-      $$;
-    `);
-        this.addSql(`
-      do $$
-      begin
-        if to_regclass('product_variant') is not null and
-           exists (
-             select 1 from information_schema.columns
-             where table_name = 'product_variant'
-               and column_name = 'custom_attribute_1'
-           ) then
-          insert into "product_variant_attribute"
-            ("id", "product_variant_id", "attribute_key", "attribute_value", "created_at", "updated_at")
-          select
-            concat('pvat_', substr(md5(random()::text), 1, 24)),
-            pv.id,
-            trim(split_part(pv.custom_attribute_1, ':', 1)),
-            trim(regexp_replace(pv.custom_attribute_1, '^[^:]*:', '')),
-            now(),
-            now()
-          from "product_variant" pv
-          where pv.custom_attribute_1 is not null
-            and pv.custom_attribute_1 <> ''
-            and pv.custom_attribute_1 like '%:%'
-            and trim(split_part(pv.custom_attribute_1, ':', 1)) <> ''
-            and trim(regexp_replace(pv.custom_attribute_1, '^[^:]*:', '')) <> ''
-            and not exists (
-              select 1
-              from "product_variant_attribute" pva
-              where pva.product_variant_id = pv.id
-                and pva.attribute_key = trim(split_part(pv.custom_attribute_1, ':', 1))
-                and pva.deleted_at is null
-            );
-        end if;
-      end;
-      $$;
-    `);
-        this.addSql(`
-      do $$
-      begin
-        if to_regclass('product_variant') is not null and
-           exists (
-             select 1 from information_schema.columns
-             where table_name = 'product_variant'
-               and column_name = 'custom_attribute_2'
-           ) then
-          insert into "product_variant_attribute"
-            ("id", "product_variant_id", "attribute_key", "attribute_value", "created_at", "updated_at")
-          select
-            concat('pvat_', substr(md5(random()::text), 1, 24)),
-            pv.id,
-            trim(split_part(pv.custom_attribute_2, ':', 1)),
-            trim(regexp_replace(pv.custom_attribute_2, '^[^:]*:', '')),
-            now(),
-            now()
-          from "product_variant" pv
-          where pv.custom_attribute_2 is not null
-            and pv.custom_attribute_2 <> ''
-            and pv.custom_attribute_2 like '%:%'
-            and trim(split_part(pv.custom_attribute_2, ':', 1)) <> ''
-            and trim(regexp_replace(pv.custom_attribute_2, '^[^:]*:', '')) <> ''
-            and not exists (
-              select 1
-              from "product_variant_attribute" pva
-              where pva.product_variant_id = pv.id
-                and pva.attribute_key = trim(split_part(pv.custom_attribute_2, ':', 1))
-                and pva.deleted_at is null
-            );
-        end if;
-      end;
-      $$;
-    `);
-    }
-    async down() {
-        this.addSql(`drop table if exists "product_variant_attribute" cascade;`);
-    }
-}
-exports.Migration20250515000000 = Migration20250515000000;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uMjAyNTA1MTUwMDAwMDAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9waWNrdXAtZGF0ZXRpbWUvbWlncmF0aW9ucy9NaWdyYXRpb24yMDI1MDUxNTAwMDAwMC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5RUFBcUU7QUFFckUsTUFBYSx1QkFBd0IsU0FBUSxzQkFBUztJQUMzQyxLQUFLLENBQUMsRUFBRTtRQUNmLElBQUksQ0FBQyxNQUFNLENBQUM7Ozs7Ozs7Ozs7O0tBV1gsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE1BQU0sQ0FBQzs7OztLQUlYLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLENBQUM7Ozs7S0FJWCxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsTUFBTSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7O0tBZ0JYLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7S0ErQlgsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE1BQU0sQ0FBQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztLQStCWCxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsTUFBTSxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0tBa0NYLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7S0FrQ1gsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVRLEtBQUssQ0FBQyxJQUFJO1FBQ2pCLElBQUksQ0FBQyxNQUFNLENBQUMsMkRBQTJELENBQUMsQ0FBQztJQUMzRSxDQUFDO0NBQ0Y7QUEzTEQsMERBMkxDIn0=