@lodashventure/medusa-booking-for-pickup 1.4.18 → 1.4.20

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

@@ -1,9 +1,9 @@
 "use strict";
 const jsxRuntime = require("react/jsx-runtime");
-const react = require("react");
-const lucideReact = require("lucide-react");
 const adminSdk = require("@medusajs/admin-sdk");
 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");
@@ -69,38 +69,38 @@ const CustomerPickupHistoryWidget = ({ data }) => {
       canceled: "ยกเลิก",
       processing: "กำลังดำเนินการ"
     };
-    return /* @__PURE__ */ jsxRuntime.jsx(Badge, { color: statusColors[status] || "grey", size: "small", children: statusLabels[status] || status });
+    return /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: statusColors[status] || "grey", size: "small", children: statusLabels[status] || status });
   };
   if (loading) {
-    return /* @__PURE__ */ jsxRuntime.jsxs(Container, { className: "divide-y p-0", children: [
+    return /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "divide-y p-0", children: [
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsxRuntime.jsx(Heading, { level: "h2", children: "ประวัติการจองรับสินค้า" })
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", children: "ประวัติการจองรับสินค้า" })
       ] }) }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(Text, { className: "text-ui-fg-subtle", children: "กำลังโหลด..." }) })
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-subtle", children: "กำลังโหลด..." }) })
     ] });
   }
   if (error) {
-    return /* @__PURE__ */ jsxRuntime.jsxs(Container, { className: "divide-y p-0", children: [
+    return /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "divide-y p-0", children: [
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsxRuntime.jsx(Heading, { level: "h2", children: "ประวัติการจองรับสินค้า" })
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", children: "ประวัติการจองรับสินค้า" })
       ] }) }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(Text, { className: "text-red-500", children: error }) })
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-red-500", children: error }) })
     ] });
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs(Container, { className: "divide-y p-0", children: [
+  return /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "divide-y p-0", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between px-6 py-4", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsxRuntime.jsx(Heading, { level: "h2", children: "ประวัติการจองรับสินค้า" }),
-        pickupHistory.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(Badge, { size: "small", children: pickupHistory.length })
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", children: "ประวัติการจองรับสินค้า" }),
+        pickupHistory.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { size: "small", children: pickupHistory.length })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(Button, { size: "small", variant: "transparent", onClick: fetchPickupHistory, children: "รีเฟรช" })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "transparent", onClick: fetchPickupHistory, children: "รีเฟรช" })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-6 py-4", children: pickupHistory.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-center justify-center py-8 text-center", children: [
       /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Package, { className: "text-ui-fg-muted mb-4", size: 48 }),
-      /* @__PURE__ */ jsxRuntime.jsx(Text, { className: "text-ui-fg-subtle", children: "ยังไม่มีประวัติการจองรับสินค้า" })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-subtle", children: "ยังไม่มีประวัติการจองรับสินค้า" })
     ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-4", children: pickupHistory.map((pickup) => {
       var _a;
       return /* @__PURE__ */ jsxRuntime.jsxs(
@@ -112,22 +112,22 @@ const CustomerPickupHistoryWidget = ({ data }) => {
               /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
                 /* @__PURE__ */ jsxRuntime.jsx(lucideReact.ShoppingBag, { className: "text-ui-fg-subtle", size: 20 }),
                 /* @__PURE__ */ jsxRuntime.jsx("div", { children: pickup.order ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsxs(Text, { weight: "plus", size: "small", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { weight: "plus", size: "small", children: [
                     "คำสั่งซื้อ #",
                     pickup.order.display_id
                   ] }),
-                  /* @__PURE__ */ jsxRuntime.jsxs(Text, { size: "xsmall", className: "text-ui-fg-subtle", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "xsmall", className: "text-ui-fg-subtle", children: [
                     ((_a = pickup.order.items) == null ? void 0 : _a.length) || 0,
                     " รายการ"
                   ] })
-                ] }) : /* @__PURE__ */ jsxRuntime.jsxs(Text, { weight: "plus", size: "small", children: [
+                ] }) : /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { weight: "plus", size: "small", children: [
                   "คำสั่งซื้อ ",
                   pickup.order_id
                 ] }) })
               ] }),
               /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-end gap-1", children: [
                 pickup.order && getStatusBadge(pickup.order.status),
-                pickup.order && /* @__PURE__ */ jsxRuntime.jsx(Text, { weight: "plus", size: "small", children: formatCurrency(
+                pickup.order && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", size: "small", children: formatCurrency(
                   pickup.order.total,
                   pickup.order.currency_code
                 ) })
@@ -149,7 +149,7 @@ const CustomerPickupHistoryWidget = ({ data }) => {
                 ] })
               ] })
             ] }),
-            pickup.order && pickup.order.shipping_methods && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-2 pt-2 border-t", children: /* @__PURE__ */ jsxRuntime.jsx(Text, { size: "xsmall", className: "text-ui-fg-subtle", children: pickup.order.shipping_methods.map((sm) => sm.name).join(", ") }) })
+            pickup.order && pickup.order.shipping_methods && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-2 pt-2 border-t", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "xsmall", className: "text-ui-fg-subtle", children: pickup.order.shipping_methods.map((sm) => sm.name).join(", ") }) })
           ]
         },
         pickup.id
@@ -157,7 +157,7 @@ const CustomerPickupHistoryWidget = ({ data }) => {
     }) }) })
   ] });
 };
-defineWidgetConfig({
+adminSdk.defineWidgetConfig({
   zone: "customer.details.after"
 });
 const OrderPickupBookingWidget = ({ data }) => {
@@ -460,7 +460,7 @@ const usePickupAvailable = (id) => {
     setError(null);
     try {
       const option = await sdk.admin.shippingOption.retrieve(id, {
-        fields: "*.*,pickup_availabilities.*"
+        fields: "*.*,pickupAvailability.*,pickup_availabilities.*"
       });
       if (option.shipping_option.service_zone.fulfillment_set.type !== "pickup") {
         throw new Error("shipping option is not pickup");
@@ -629,22 +629,46 @@ const DEFAULT_SCHEDULE = {
 function ShippingOptionDetails() {
   const { id } = reactRouterDom.useParams();
   const navigate = reactRouterDom.useNavigate();
-  const sdk2 = adminSdk.useSdk();
   const [schedule, setSchedule] = react.useState(
     structuredClone(DEFAULT_SCHEDULE)
   );
   const { data, refetch, error } = usePickupAvailable(id);
   react.useEffect(() => {
-    if (!data) return;
+    if (!(data == null ? void 0 : data.shipping_option)) {
+      return;
+    }
     const _schedule = structuredClone(DEFAULT_SCHEDULE);
-    data.shipping_option.pickup_availabilities.forEach((availability) => {
-      const timeSlots = _schedule[availability.day_of_week].timeSlots;
+    const normalizeInput = (input) => {
+      if (!input) {
+        return [];
+      }
+      if (Array.isArray(input)) {
+        return input;
+      }
+      if (typeof input === "object") {
+        return Object.values(input);
+      }
+      return [];
+    };
+    const normalized = [
+      ...normalizeInput(data.shipping_option.pickup_availabilities),
+      ...normalizeInput(data.shipping_option.pickupAvailability)
+    ];
+    normalized.forEach((availability) => {
+      if (!(availability == null ? void 0 : availability.day_of_week)) {
+        return;
+      }
+      const dayKey = availability.day_of_week.toLowerCase();
+      if (!_schedule[dayKey]) {
+        return;
+      }
+      const timeSlots = _schedule[dayKey].timeSlots;
       timeSlots.push({
         start: dateToString(availability.timeStart),
         end: dateToString(availability.timeEnd)
       });
-      _schedule[availability.day_of_week] = {
-        enabled: availability.enable,
+      _schedule[dayKey] = {
+        enabled: Boolean(availability.enable),
         timeSlots
       };
     });
@@ -679,12 +703,12 @@ function ShippingOptionDetails() {
       return;
     }
     try {
-      await sdk2.client.fetch(`/admin/pickup-date/${id}`, {
+      await sdk.client.fetch(`/admin/pickup-date/${id}`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({
+        body: {
           schedules: Object.entries(schedule).filter(([_, daySchedule]) => daySchedule.enabled).map(([day, { enabled, timeSlots }]) => ({
             day_of_week: day,
             enable: enabled,
@@ -693,7 +717,7 @@ function ShippingOptionDetails() {
               end: slot.end
             }))
           }))
-        })
+        }
       });
       refetch();
       ui.toast.success("Availability updated", {

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

@@ -1,8 +1,8 @@
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
+import { defineWidgetConfig, defineRouteConfig } from "@medusajs/admin-sdk";
+import { Container, Heading, Text, Badge, Button, toast, createDataTableColumnHelper, useDataTable, DataTable, Select, clx, Switch, IconButton } from "@medusajs/ui";
 import { useState, useEffect, useMemo, useCallback } from "react";
 import { Calendar, Package, ShoppingBag, Clock, MapPin, RefreshCw, ArrowLeft, Trash2 } from "lucide-react";
-import { defineWidgetConfig as defineWidgetConfig$1, defineRouteConfig, useSdk } from "@medusajs/admin-sdk";
-import { Container as Container$1, Heading as Heading$1, Text as Text$1, Badge as Badge$1, Button as Button$1, toast, createDataTableColumnHelper, useDataTable, DataTable, Select, clx, Switch, IconButton } from "@medusajs/ui";
 import { StackPerspective, Plus } from "@medusajs/icons";
 import { useNavigate, useParams, Navigate } from "react-router-dom";
 import Medusa from "@medusajs/js-sdk";
@@ -232,46 +232,46 @@ const OrderPickupBookingWidget = ({ data }) => {
     return { label: "รอรับสินค้า", color: "blue" };
   };
   if (loading) {
-    return /* @__PURE__ */ jsxs(Container$1, { className: "divide-y p-0", children: [
+    return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", children: [
       /* @__PURE__ */ jsx("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsx(Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsx(Heading$1, { level: "h2", children: "การจองรับสินค้า" })
+        /* @__PURE__ */ jsx(Heading, { level: "h2", children: "การจองรับสินค้า" })
       ] }) }),
-      /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text$1, { className: "text-ui-fg-subtle", children: "กำลังโหลด..." }) })
+      /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-subtle", children: "กำลังโหลด..." }) })
     ] });
   }
   if (error) {
-    return /* @__PURE__ */ jsxs(Container$1, { className: "divide-y p-0", children: [
+    return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", children: [
       /* @__PURE__ */ jsx("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsx(Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsx(Heading$1, { level: "h2", children: "การจองรับสินค้า" })
+        /* @__PURE__ */ jsx(Heading, { level: "h2", children: "การจองรับสินค้า" })
       ] }) }),
-      /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text$1, { className: "text-red-500", children: error }) })
+      /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-red-500", children: error }) })
     ] });
   }
   if (!pickupBooking) {
-    return /* @__PURE__ */ jsxs(Container$1, { className: "divide-y p-0", children: [
+    return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", children: [
       /* @__PURE__ */ jsx("div", { className: "flex items-center justify-between px-6 py-4", children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsx(Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsx(Heading$1, { level: "h2", children: "การจองรับสินค้า" })
+        /* @__PURE__ */ jsx(Heading, { level: "h2", children: "การจองรับสินค้า" })
       ] }) }),
       /* @__PURE__ */ jsx("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col items-center justify-center py-8 text-center", children: [
         /* @__PURE__ */ jsx(MapPin, { className: "text-ui-fg-muted mb-4", size: 48 }),
-        /* @__PURE__ */ jsx(Text$1, { className: "text-ui-fg-subtle", children: "คำสั่งซื้อนี้ไม่ได้จองรับสินค้าที่สาขา" }),
-        /* @__PURE__ */ jsx(Text$1, { size: "xsmall", className: "text-ui-fg-muted mt-2", children: "คำสั่งซื้อนี้อาจเป็นการจัดส่งแบบปกติ" })
+        /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-subtle", children: "คำสั่งซื้อนี้ไม่ได้จองรับสินค้าที่สาขา" }),
+        /* @__PURE__ */ jsx(Text, { size: "xsmall", className: "text-ui-fg-muted mt-2", children: "คำสั่งซื้อนี้อาจเป็นการจัดส่งแบบปกติ" })
       ] }) })
     ] });
   }
   const status = getPickupStatus();
-  return /* @__PURE__ */ jsxs(Container$1, { className: "divide-y p-0", children: [
+  return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between px-6 py-4", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsx(Calendar, { className: "text-ui-fg-subtle" }),
-        /* @__PURE__ */ jsx(Heading$1, { level: "h2", children: "การจองรับสินค้าที่สาขา" }),
-        /* @__PURE__ */ jsx(Badge$1, { color: status.color, size: "small", children: status.label })
+        /* @__PURE__ */ jsx(Heading, { level: "h2", children: "การจองรับสินค้าที่สาขา" }),
+        /* @__PURE__ */ jsx(Badge, { color: status.color, size: "small", children: status.label })
       ] }),
       /* @__PURE__ */ jsx(
-        Button$1,
+        Button,
         {
           size: "small",
           variant: "transparent",
@@ -288,25 +288,25 @@ const OrderPickupBookingWidget = ({ data }) => {
         /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1", children: [
           /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 text-ui-fg-subtle", children: [
             /* @__PURE__ */ jsx(Calendar, { size: 16 }),
-            /* @__PURE__ */ jsx(Text$1, { size: "xsmall", weight: "plus", children: "วันที่รับสินค้า" })
+            /* @__PURE__ */ jsx(Text, { size: "xsmall", weight: "plus", children: "วันที่รับสินค้า" })
           ] }),
-          /* @__PURE__ */ jsx(Text$1, { weight: "plus", children: formatDate(pickupBooking.pickup_datetime) })
+          /* @__PURE__ */ jsx(Text, { weight: "plus", children: formatDate(pickupBooking.pickup_datetime) })
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1", children: [
           /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 text-ui-fg-subtle", children: [
             /* @__PURE__ */ jsx(Clock, { size: 16 }),
-            /* @__PURE__ */ jsx(Text$1, { size: "xsmall", weight: "plus", children: "เวลารับสินค้า" })
+            /* @__PURE__ */ jsx(Text, { size: "xsmall", weight: "plus", children: "เวลารับสินค้า" })
           ] }),
-          /* @__PURE__ */ jsx(Text$1, { weight: "plus", children: formatTime(pickupBooking.pickup_datetime) })
+          /* @__PURE__ */ jsx(Text, { weight: "plus", children: formatTime(pickupBooking.pickup_datetime) })
         ] })
       ] }),
       pickupBooking.shipping_option && /* @__PURE__ */ jsx("div", { className: "rounded-lg border p-4 bg-ui-bg-subtle", children: /* @__PURE__ */ jsxs("div", { className: "flex items-start gap-2 mb-2", children: [
         /* @__PURE__ */ jsx(MapPin, { className: "text-ui-fg-muted mt-1", size: 16 }),
         /* @__PURE__ */ jsxs("div", { className: "flex-1", children: [
-          /* @__PURE__ */ jsx(Text$1, { weight: "plus", size: "small", className: "mb-1", children: pickupBooking.shipping_option.name }),
+          /* @__PURE__ */ jsx(Text, { weight: "plus", size: "small", className: "mb-1", children: pickupBooking.shipping_option.name }),
           ((_b = (_a = pickupBooking.shipping_option.service_zone) == null ? void 0 : _a.fulfillment_set) == null ? void 0 : _b.location) && /* @__PURE__ */ jsxs(Fragment, { children: [
-            /* @__PURE__ */ jsx(Text$1, { size: "small", className: "text-ui-fg-subtle", children: pickupBooking.shipping_option.service_zone.fulfillment_set.location.name }),
-            pickupBooking.shipping_option.service_zone.fulfillment_set.location.address && /* @__PURE__ */ jsxs(Text$1, { size: "xsmall", className: "text-ui-fg-muted mt-1", children: [
+            /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: pickupBooking.shipping_option.service_zone.fulfillment_set.location.name }),
+            pickupBooking.shipping_option.service_zone.fulfillment_set.location.address && /* @__PURE__ */ jsxs(Text, { size: "xsmall", className: "text-ui-fg-muted mt-1", children: [
               pickupBooking.shipping_option.service_zone.fulfillment_set.location.address.address_1,
               pickupBooking.shipping_option.service_zone.fulfillment_set.location.address.address_2 && `, ${pickupBooking.shipping_option.service_zone.fulfillment_set.location.address.address_2}`,
               /* @__PURE__ */ jsx("br", {}),
@@ -321,22 +321,22 @@ const OrderPickupBookingWidget = ({ data }) => {
       ] }) }),
       /* @__PURE__ */ jsx("div", { className: "pt-4 border-t", children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
         /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1", children: [
-          /* @__PURE__ */ jsx(Text$1, { size: "xsmall", className: "text-ui-fg-subtle", children: "จองเมื่อ" }),
-          /* @__PURE__ */ jsx(Text$1, { size: "small", children: formatDateTime(pickupBooking.created_at) })
+          /* @__PURE__ */ jsx(Text, { size: "xsmall", className: "text-ui-fg-subtle", children: "จองเมื่อ" }),
+          /* @__PURE__ */ jsx(Text, { size: "small", children: formatDateTime(pickupBooking.created_at) })
         ] }),
         /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1", children: [
-          /* @__PURE__ */ jsx(Text$1, { size: "xsmall", className: "text-ui-fg-subtle", children: "อัปเดตล่าสุด" }),
-          /* @__PURE__ */ jsx(Text$1, { size: "small", children: formatDateTime(pickupBooking.updated_at) })
+          /* @__PURE__ */ jsx(Text, { size: "xsmall", className: "text-ui-fg-subtle", children: "อัปเดตล่าสุด" }),
+          /* @__PURE__ */ jsx(Text, { size: "small", children: formatDateTime(pickupBooking.updated_at) })
         ] })
       ] }) }),
-      /* @__PURE__ */ jsx("div", { className: "pt-4 border-t", children: /* @__PURE__ */ jsxs(Text$1, { size: "xsmall", className: "text-ui-fg-muted", children: [
+      /* @__PURE__ */ jsx("div", { className: "pt-4 border-t", children: /* @__PURE__ */ jsxs(Text, { size: "xsmall", className: "text-ui-fg-muted", children: [
         "Booking ID: ",
         pickupBooking.id
       ] }) })
     ] }) })
   ] });
 };
-defineWidgetConfig$1({
+defineWidgetConfig({
   zone: "order.details.after"
 });
 const sdk = new Medusa({
@@ -431,8 +431,8 @@ const ShippingOptionList = () => {
       navigate(`/pickup-shipping/${row.id}`);
     }
   });
-  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(Container$1, { className: "flex flex-col p-0 overflow-hidden", children: /* @__PURE__ */ jsxs(DataTable, { instance: table, children: [
-    /* @__PURE__ */ jsx(DataTable.Toolbar, { className: "flex flex-col items-start justify-between gap-2 md:flex-row md:items-center", children: /* @__PURE__ */ jsx(Heading$1, { children: "Pickup Shipping Options" }) }),
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(Container, { className: "flex flex-col p-0 overflow-hidden", children: /* @__PURE__ */ jsxs(DataTable, { instance: table, children: [
+    /* @__PURE__ */ jsx(DataTable.Toolbar, { className: "flex flex-col items-start justify-between gap-2 md:flex-row md:items-center", children: /* @__PURE__ */ jsx(Heading, { children: "Pickup Shipping Options" }) }),
     /* @__PURE__ */ jsx(DataTable.Table, {})
   ] }) }) });
 };
@@ -457,7 +457,7 @@ const usePickupAvailable = (id) => {
     setError(null);
     try {
       const option = await sdk.admin.shippingOption.retrieve(id, {
-        fields: "*.*,pickup_availabilities.*"
+        fields: "*.*,pickupAvailability.*,pickup_availabilities.*"
       });
       if (option.shipping_option.service_zone.fulfillment_set.type !== "pickup") {
         throw new Error("shipping option is not pickup");
@@ -567,10 +567,10 @@ function TimeTable({
     });
   };
   if (timeSlots.length === 0) return null;
-  return /* @__PURE__ */ jsxs(Container$1, { className: "p-4 overflow-x-auto", children: [
-    /* @__PURE__ */ jsx(Heading$1, { className: "text-xl font-bold mb-4", children: "Pickup Hours Schedule" }),
+  return /* @__PURE__ */ jsxs(Container, { className: "p-4 overflow-x-auto", children: [
+    /* @__PURE__ */ jsx(Heading, { className: "text-xl font-bold mb-4", children: "Pickup Hours Schedule" }),
     /* @__PURE__ */ jsxs("div", { className: "min-w-full flex", children: [
-      /* @__PURE__ */ jsx("div", { className: "ml-2 mt-7 flex flex-col items-end", children: timeSlots.map((timeSlot) => /* @__PURE__ */ jsx(Text$1, { className: "h-8", children: timeSlot }, timeSlot)) }),
+      /* @__PURE__ */ jsx("div", { className: "ml-2 mt-7 flex flex-col items-end", children: timeSlots.map((timeSlot) => /* @__PURE__ */ jsx(Text, { className: "h-8", children: timeSlot }, timeSlot)) }),
       /* @__PURE__ */ jsxs("table", { className: "ml-2 w-full border-collapse", children: [
         /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsx("tr", { children: days.map((day) => /* @__PURE__ */ jsx(
           "th",
@@ -626,22 +626,46 @@ const DEFAULT_SCHEDULE = {
 function ShippingOptionDetails() {
   const { id } = useParams();
   const navigate = useNavigate();
-  const sdk2 = useSdk();
   const [schedule, setSchedule] = useState(
     structuredClone(DEFAULT_SCHEDULE)
   );
   const { data, refetch, error } = usePickupAvailable(id);
   useEffect(() => {
-    if (!data) return;
+    if (!(data == null ? void 0 : data.shipping_option)) {
+      return;
+    }
     const _schedule = structuredClone(DEFAULT_SCHEDULE);
-    data.shipping_option.pickup_availabilities.forEach((availability) => {
-      const timeSlots = _schedule[availability.day_of_week].timeSlots;
+    const normalizeInput = (input) => {
+      if (!input) {
+        return [];
+      }
+      if (Array.isArray(input)) {
+        return input;
+      }
+      if (typeof input === "object") {
+        return Object.values(input);
+      }
+      return [];
+    };
+    const normalized = [
+      ...normalizeInput(data.shipping_option.pickup_availabilities),
+      ...normalizeInput(data.shipping_option.pickupAvailability)
+    ];
+    normalized.forEach((availability) => {
+      if (!(availability == null ? void 0 : availability.day_of_week)) {
+        return;
+      }
+      const dayKey = availability.day_of_week.toLowerCase();
+      if (!_schedule[dayKey]) {
+        return;
+      }
+      const timeSlots = _schedule[dayKey].timeSlots;
       timeSlots.push({
         start: dateToString(availability.timeStart),
         end: dateToString(availability.timeEnd)
       });
-      _schedule[availability.day_of_week] = {
-        enabled: availability.enable,
+      _schedule[dayKey] = {
+        enabled: Boolean(availability.enable),
         timeSlots
       };
     });
@@ -676,12 +700,12 @@ function ShippingOptionDetails() {
       return;
     }
     try {
-      await sdk2.client.fetch(`/admin/pickup-date/${id}`, {
+      await sdk.client.fetch(`/admin/pickup-date/${id}`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({
+        body: {
           schedules: Object.entries(schedule).filter(([_, daySchedule]) => daySchedule.enabled).map(([day, { enabled, timeSlots }]) => ({
             day_of_week: day,
             enable: enabled,
@@ -690,7 +714,7 @@ function ShippingOptionDetails() {
               end: slot.end
             }))
           }))
-        })
+        }
       });
       refetch();
       toast.success("Availability updated", {
@@ -760,22 +784,22 @@ function ShippingOptionDetails() {
     return /* @__PURE__ */ jsx(Navigate, { to: "/pickup-shipping" });
   }
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsxs(Container$1, { className: "p-4 ", children: [
+    /* @__PURE__ */ jsxs(Container, { className: "p-4 ", children: [
       /* @__PURE__ */ jsxs(
-        Button$1,
+        Button,
         {
           onClick: () => navigate("/pickup-shipping"),
           variant: "transparent",
           className: "p-0 mb-4",
           children: [
             /* @__PURE__ */ jsx(ArrowLeft, { size: 20 }),
-            /* @__PURE__ */ jsx(Text$1, { className: "ml-2", children: "Back" })
+            /* @__PURE__ */ jsx(Text, { className: "ml-2", children: "Back" })
           ]
         }
       ),
       /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-4 mb-4", children: [
-        /* @__PURE__ */ jsx(Heading$1, { className: "text-xl font-bold", children: "Pickup Hours" }),
-        /* @__PURE__ */ jsx(Button$1, { onClick: handleUpdateSchedules, children: "Save" })
+        /* @__PURE__ */ jsx(Heading, { className: "text-xl font-bold", children: "Pickup Hours" }),
+        /* @__PURE__ */ jsx(Button, { onClick: handleUpdateSchedules, children: "Save" })
       ] }),
       /* @__PURE__ */ jsx("div", { className: "space-y-4", children: Object.entries(schedule).map(([day, { enabled, timeSlots }]) => /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
         /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-4 mb-2 h-8", children: [
@@ -787,7 +811,7 @@ function ShippingOptionDetails() {
             },
             `switch-${day}`
           ),
-          /* @__PURE__ */ jsx(Text$1, { className: "capitalize", children: day }),
+          /* @__PURE__ */ jsx(Text, { className: "capitalize", children: day }),
           enabled && /* @__PURE__ */ jsx(
             IconButton,
             {
@@ -812,7 +836,7 @@ function ShippingOptionDetails() {
                   maxTime: slot.end
                 }
               ),
-              /* @__PURE__ */ jsx(Text$1, { className: "text-gray-400", children: "-" }),
+              /* @__PURE__ */ jsx(Text, { className: "text-gray-400", children: "-" }),
               /* @__PURE__ */ jsx(
                 TimeSelect,
                 {

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

@@ -6,8 +6,45 @@ const GET = async (req, res) => {
     const { id: customer_id } = req.params;
     const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
     try {
-        // Query pickup dates for orders associated with this customer
-        const result = await query.graph({
+        // Fetch customer orders first because pickup_date doesn't expose the customer relationship.
+        const ordersResult = (await query.graph({
+            entity: "order",
+            fields: [
+                "id",
+                "display_id",
+                "status",
+                "created_at",
+                "total",
+                "currency_code",
+                "items.id",
+                "shipping_methods.name",
+            ],
+            filters: {
+                customer_id,
+            },
+            pagination: {
+                order: {
+                    created_at: "DESC",
+                },
+            },
+        }));
+        const orders = ordersResult.data || [];
+        if (!orders.length) {
+            return res.status(200).json({
+                pickup_history: [],
+                count: 0,
+            });
+        }
+        const orderIds = Array.from(new Set(orders
+            .map((order) => order.id)
+            .filter((id) => typeof id === "string" && id.length > 0)));
+        if (!orderIds.length) {
+            return res.status(200).json({
+                pickup_history: [],
+                count: 0,
+            });
+        }
+        const pickupResult = (await query.graph({
             entity: "pickup_date",
             fields: [
                 "id",
@@ -17,53 +54,29 @@ const GET = async (req, res) => {
                 "updated_at",
             ],
             filters: {
-                order: {
-                    customer_id: customer_id,
-                },
+                order_id: orderIds,
             },
             pagination: {
                 order: {
-                    created_at: "DESC",
+                    pickup_datetime: "DESC",
                 },
             },
-        });
-        // Enrich with order details
-        const pickupDates = result.data || [];
-        if (pickupDates.length > 0) {
-            // Get order details for each pickup
-            const orderIds = pickupDates.map((pd) => pd.order_id).filter(Boolean);
-            if (orderIds.length > 0) {
-                const orders = await query.graph({
-                    entity: "order",
-                    fields: [
-                        "id",
-                        "display_id",
-                        "status",
-                        "created_at",
-                        "total",
-                        "currency_code",
-                        "items.*",
-                        "shipping_methods.*",
-                    ],
-                    filters: {
-                        id: orderIds,
-                    },
-                });
-                // Map orders to pickup dates
-                const orderMap = new Map(orders.data.map((order) => [order.id, order]));
-                const enrichedPickups = pickupDates.map((pickup) => ({
-                    ...pickup,
-                    order: orderMap.get(pickup.order_id) || null,
-                }));
-                return res.status(200).json({
-                    pickup_history: enrichedPickups,
-                    count: enrichedPickups.length,
-                });
-            }
+        }));
+        const pickupDates = pickupResult.data || [];
+        if (!pickupDates.length) {
+            return res.status(200).json({
+                pickup_history: [],
+                count: 0,
+            });
         }
+        const orderMap = new Map(orders.map((order) => [order.id, order]));
+        const enrichedPickups = pickupDates.map((pickup) => ({
+            ...pickup,
+            order: pickup.order_id ? orderMap.get(pickup.order_id) ?? null : null,
+        }));
         return res.status(200).json({
-            pickup_history: [],
-            count: 0,
+            pickup_history: enrichedPickups,
+            count: enrichedPickups.length,
         });
     }
     catch (error) {
@@ -74,4 +87,4 @@ const GET = async (req, res) => {
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2N1c3RvbWVycy9baWRdL3BpY2t1cC1oaXN0b3J5L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFzRTtBQUUvRCxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQUUsR0FBa0IsRUFBRSxHQUFtQixFQUFFLEVBQUU7SUFDbkUsTUFBTSxFQUFFLEVBQUUsRUFBRSxXQUFXLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFDO0lBQ3ZDLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRWpFLElBQUksQ0FBQztRQUNILDhEQUE4RDtRQUM5RCxNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7WUFDL0IsTUFBTSxFQUFFLGFBQWE7WUFDckIsTUFBTSxFQUFFO2dCQUNOLElBQUk7Z0JBQ0osaUJBQWlCO2dCQUNqQixVQUFVO2dCQUNWLFlBQVk7Z0JBQ1osWUFBWTthQUNiO1lBQ0QsT0FBTyxFQUFFO2dCQUNQLEtBQUssRUFBRTtvQkFDTCxXQUFXLEVBQUUsV0FBVztpQkFDekI7YUFDRjtZQUNELFVBQVUsRUFBRTtnQkFDVixLQUFLLEVBQUU7b0JBQ0wsVUFBVSxFQUFFLE1BQU07aUJBQ25CO2FBQ0Y7U0FDRixDQUFDLENBQUM7UUFFSCw0QkFBNEI7UUFDNUIsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7UUFFdEMsSUFBSSxXQUFXLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQzNCLG9DQUFvQztZQUNwQyxNQUFNLFFBQVEsR0FBRyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBTyxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBRTNFLElBQUksUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDeEIsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDO29CQUMvQixNQUFNLEVBQUUsT0FBTztvQkFDZixNQUFNLEVBQUU7d0JBQ04sSUFBSTt3QkFDSixZQUFZO3dCQUNaLFFBQVE7d0JBQ1IsWUFBWTt3QkFDWixPQUFPO3dCQUNQLGVBQWU7d0JBQ2YsU0FBUzt3QkFDVCxvQkFBb0I7cUJBQ3JCO29CQUNELE9BQU8sRUFBRTt3QkFDUCxFQUFFLEVBQUUsUUFBUTtxQkFDYjtpQkFDRixDQUFDLENBQUM7Z0JBRUgsNkJBQTZCO2dCQUM3QixNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FDdEIsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFVLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUNuRCxDQUFDO2dCQUVGLE1BQU0sZUFBZSxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7b0JBQ3hELEdBQUcsTUFBTTtvQkFDVCxLQUFLLEVBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksSUFBSTtpQkFDN0MsQ0FBQyxDQUFDLENBQUM7Z0JBRUosT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztvQkFDMUIsY0FBYyxFQUFFLGVBQWU7b0JBQy9CLEtBQUssRUFBRSxlQUFlLENBQUMsTUFBTTtpQkFDOUIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztRQUNILENBQUM7UUFFRCxPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQzFCLGNBQWMsRUFBRSxFQUFFO1lBQ2xCLEtBQUssRUFBRSxDQUFDO1NBQ1QsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUFDLE9BQU8sS0FBVSxFQUFFLENBQUM7UUFDcEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxnQ0FBZ0MsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN2RCxPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQzFCLEtBQUssRUFBRSxLQUFLLENBQUMsT0FBTyxJQUFJLGdDQUFnQztTQUN6RCxDQUFDLENBQUM7SUFDTCxDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBL0VXLFFBQUEsR0FBRyxPQStFZCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2N1c3RvbWVycy9baWRdL3BpY2t1cC1oaXN0b3J5L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFzRTtBQXlCL0QsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sRUFBRSxFQUFFLEVBQUUsV0FBVyxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUN2QyxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUVqRSxJQUFJLENBQUM7UUFDSCw0RkFBNEY7UUFDNUYsTUFBTSxZQUFZLEdBQUcsQ0FBQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7WUFDdEMsTUFBTSxFQUFFLE9BQU87WUFDZixNQUFNLEVBQUU7Z0JBQ04sSUFBSTtnQkFDSixZQUFZO2dCQUNaLFFBQVE7Z0JBQ1IsWUFBWTtnQkFDWixPQUFPO2dCQUNQLGVBQWU7Z0JBQ2YsVUFBVTtnQkFDVix1QkFBdUI7YUFDeEI7WUFDRCxPQUFPLEVBQUU7Z0JBQ1AsV0FBVzthQUNaO1lBQ0QsVUFBVSxFQUFFO2dCQUNWLEtBQUssRUFBRTtvQkFDTCxVQUFVLEVBQUUsTUFBTTtpQkFDbkI7YUFDRjtTQUNGLENBQUMsQ0FBNEIsQ0FBQztRQUUvQixNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUV2QyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ25CLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQzFCLGNBQWMsRUFBRSxFQUFFO2dCQUNsQixLQUFLLEVBQUUsQ0FBQzthQUNULENB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

package/.medusa/server/src/api/store/customers/me/pickup-history/route.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GET = void 0;
+const utils_1 = require("@medusajs/framework/utils");
+/**
+ * GET /store/customers/me/pickup-history
+ * Returns pickup history for the authenticated customer
+ */
+const GET = async (req, res) => {
+    const customer_id = req.auth_context.actor_id;
+    const query = req.scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+    try {
+        // Fetch customer orders first because pickup_date doesn't expose the customer relationship.
+        const ordersResult = (await query.graph({
+            entity: "order",
+            fields: [
+                "id",
+                "display_id",
+                "status",
+                "created_at",
+                "total",
+                "currency_code",
+                "items.id",
+                "shipping_methods.name",
+            ],
+            filters: {
+                customer_id,
+            },
+            pagination: {
+                order: {
+                    created_at: "DESC",
+                },
+            },
+        }));
+        const orders = ordersResult.data || [];
+        if (!orders.length) {
+            return res.status(200).json({
+                pickup_history: [],
+                count: 0,
+            });
+        }
+        const orderIds = Array.from(new Set(orders
+            .map((order) => order.id)
+            .filter((id) => typeof id === "string" && id.length > 0)));
+        if (!orderIds.length) {
+            return res.status(200).json({
+                pickup_history: [],
+                count: 0,
+            });
+        }
+        const pickupResult = (await query.graph({
+            entity: "pickup_date",
+            fields: [
+                "id",
+                "pickup_datetime",
+                "order_id",
+                "created_at",
+                "updated_at",
+            ],
+            filters: {
+                order_id: orderIds,
+            },
+            pagination: {
+                order: {
+                    pickup_datetime: "DESC",
+                },
+            },
+        }));
+        const pickupDates = pickupResult.data || [];
+        if (!pickupDates.length) {
+            return res.status(200).json({
+                pickup_history: [],
+                count: 0,
+            });
+        }
+        const orderMap = new Map(orders.map((order) => [order.id, order]));
+        const enrichedPickups = pickupDates.map((pickup) => ({
+            ...pickup,
+            order: pickup.order_id ? orderMap.get(pickup.order_id) ?? null : null,
+        }));
+        return res.status(200).json({
+            pickup_history: enrichedPickups,
+            count: enrichedPickups.length,
+        });
+    }
+    catch (error) {
+        console.error("Error fetching pickup history:", error);
+        return res.status(500).json({
+            error: error.message || "Failed to fetch pickup history",
+        });
+    }
+};
+exports.GET = GET;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2N1c3RvbWVycy9tZS9waWNrdXAtaGlzdG9yeS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFJQSxxREFBc0U7QUF5QnRFOzs7R0FHRztBQUNJLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFDdEIsR0FBK0IsRUFDL0IsR0FBbUIsRUFDbkIsRUFBRTtJQUNGLE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDO0lBQzlDLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRWpFLElBQUksQ0FBQztRQUNILDRGQUE0RjtRQUM1RixNQUFNLFlBQVksR0FBRyxDQUFDLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztZQUN0QyxNQUFNLEVBQUUsT0FBTztZQUNmLE1BQU0sRUFBRTtnQkFDTixJQUFJO2dCQUNKLFlBQVk7Z0JBQ1osUUFBUTtnQkFDUixZQUFZO2dCQUNaLE9BQU87Z0JBQ1AsZUFBZTtnQkFDZixVQUFVO2dCQUNWLHVCQUF1QjthQUN4QjtZQUNELE9BQU8sRUFBRTtnQkFDUCxXQUFXO2FBQ1o7WUFDRCxVQUFVLEVBQUU7Z0JBQ1YsS0FBSyxFQUFFO29CQUNMLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjthQUNGO1NBQ0YsQ0FBQyxDQUE0QixDQUFDO1FBRS9CLE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1FBRXZDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDbkIsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztnQkFDMUIsY0FBYyxFQUFFLEVBQUU7Z0JBQ2xCLEtBQUssRUFBRSxDQUFDO2FBQ1Qs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

package/.medusa/server/src/links/shipping-option-pickup-availability.js

@@ -7,10 +7,9 @@ const utils_1 = require("@medusajs/framework/utils");
 const fulfillment_1 = __importDefault(require("@medusajs/medusa/fulfillment"));
 const pickup_datetime_1 = __importDefault(require("../modules/pickup-datetime"));
 exports.default = (0, utils_1.defineLink)({
-    linkable: fulfillment_1.default.linkable.shippingOption,
-    field: "shipping_option_id",
+    linkable: pickup_datetime_1.default.linkable.pickupAvailability,
+    foreignKey: "shipping_option_id",
 }, {
-    linkable: pickup_datetime_1.default.linkable.pickupAvailability.id,
-    isList: true,
+    linkable: fulfillment_1.default.linkable.shippingOption,
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctb3B0aW9uLXBpY2t1cC1hdmFpbGFiaWxpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGlua3Mvc2hpcHBpbmctb3B0aW9uLXBpY2t1cC1hdmFpbGFiaWxpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxREFBdUQ7QUFDdkQsK0VBQTZEO0FBQzdELGlGQUE4RDtBQUU5RCxrQkFBZSxJQUFBLGtCQUFVLEVBQ3ZCO0lBQ0UsUUFBUSxFQUFFLHFCQUFpQixDQUFDLFFBQVEsQ0FBQyxjQUFjO0lBQ25ELEtBQUssRUFBRSxvQkFBb0I7Q0FDNUIsRUFDRDtJQUNFLFFBQVEsRUFBRSx5QkFBb0IsQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQUMsRUFBRTtJQUM3RCxNQUFNLEVBQUUsSUFBSTtDQUNiLENBQ0YsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctb3B0aW9uLXBpY2t1cC1hdmFpbGFiaWxpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGlua3Mvc2hpcHBpbmctb3B0aW9uLXBpY2t1cC1hdmFpbGFiaWxpdHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxxREFBdUQ7QUFDdkQsK0VBQTZEO0FBQzdELGlGQUE4RDtBQUU5RCxrQkFBZSxJQUFBLGtCQUFVLEVBQ3ZCO0lBQ0UsUUFBUSxFQUFFLHlCQUFvQixDQUFDLFFBQVEsQ0FBQyxrQkFBa0I7SUFDMUQsVUFBVSxFQUFFLG9CQUFvQjtDQUNqQyxFQUNEO0lBQ0UsUUFBUSxFQUFFLHFCQUFpQixDQUFDLFFBQVEsQ0FBQyxjQUFjO0NBQ3BELENBQ0YsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodashventure/medusa-booking-for-pickup",
-  "version": "1.4.18",
+  "version": "1.4.20",
   "description": "A starter for Medusa plugins.",
   "author": "Medusa (https://medusajs.com)",
   "license": "MIT",
@@ -44,6 +44,7 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-router-dom": "^6.22.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.2",
     "vite": "^5.2.11",