@lodashventure/medusa-booking-for-pickup 1.4.19 → 1.4.22

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

@@ -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,5 +1,5 @@
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
-import { defineWidgetConfig, defineRouteConfig, useSdk } from "@medusajs/admin-sdk";
+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";
@@ -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");
@@ -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", {

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

@@ -10,8 +10,45 @@ const GET = async (req, res) => {
     const customer_id = req.auth_context.actor_id;
     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",
@@ -21,53 +58,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) {
@@ -78,4 +91,4 @@ const GET = async (req, res) => {
     }
 };
 exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL2N1c3RvbWVycy9tZS9waWNrdXAtaGlzdG9yeS9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFJQSxxREFBc0U7QUFFdEU7OztHQUdHO0FBQ0ksTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUN0QixHQUErQixFQUMvQixHQUFtQixFQUNuQixFQUFFO0lBQ0YsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUM7SUFDOUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFakUsSUFBSSxDQUFDO1FBQ0gsOERBQThEO1FBQzlELE1BQU0sTUFBTSxHQUFHLE1BQU0sS0FBSyxDQUFDLEtBQUssQ0FBQztZQUMvQixNQUFNLEVBQUUsYUFBYTtZQUNyQixNQUFNLEVBQUU7Z0JBQ04sSUFBSTtnQkFDSixpQkFBaUI7Z0JBQ2pCLFVBQVU7Z0JBQ1YsWUFBWTtnQkFDWixZQUFZO2FBQ2I7WUFDRCxPQUFPLEVBQUU7Z0JBQ1AsS0FBSyxFQUFFO29CQUNMLFdBQVcsRUFBRSxXQUFXO2lCQUN6QjthQUNGO1lBQ0QsVUFBVSxFQUFFO2dCQUNWLEtBQUssRUFBRTtvQkFDTCxVQUFVLEVBQUUsTUFBTTtpQkFDbkI7YUFDRjtTQUNGLENBQUMsQ0FBQztRQUVILDRCQUE0QjtRQUM1QixNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUV0QyxJQUFJLFdBQVcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDM0Isb0NBQW9DO1lBQ3BDLE1BQU0sUUFBUSxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFPLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7WUFFM0UsSUFBSSxRQUFRLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUN4QixNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7b0JBQy9CLE1BQU0sRUFBRSxPQUFPO29CQUNmLE1BQU0sRUFBRTt3QkFDTixJQUFJO3dCQUNKLFlBQVk7d0JBQ1osUUFBUTt3QkFDUixZQUFZO3dCQUNaLE9BQU87d0JBQ1AsZUFBZTt3QkFDZixTQUFTO3dCQUNULG9CQUFvQjtxQkFDckI7b0JBQ0QsT0FBTyxFQUFFO3dCQUNQLEVBQUUsRUFBRSxRQUFRO3FCQUNiO2lCQUNGLENBQUMsQ0FBQztnQkFFSCw2QkFBNkI7Z0JBQzdCLE1BQU0sUUFBUSxHQUFHLElBQUksR0FBRyxDQUN0QixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQ25ELENBQUM7Z0JBRUYsTUFBTSxlQUFlLEdBQUcsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQVcsRUFBRSxFQUFFLENBQUMsQ0FBQztvQkFDeEQsR0FBRyxNQUFNO29CQUNULEtBQUssRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxJQUFJO2lCQUM3QyxDQUFDLENBQUMsQ0FBQztnQkFFSixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO29CQUMxQixjQUFjLEVBQUUsZUFBZTtvQkFDL0IsS0FBSyxFQUFFLGVBQWUsQ0FBQyxNQUFNO2lCQUM5QixDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDMUIsY0FBYyxFQUFFLEVBQUU7WUFDbEIsS0FBSyxFQUFFLENBQUM7U0FDVCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBQUMsT0FBTyxLQUFVLEVBQUUsQ0FBQztRQUNwQixPQUFPLENBQUMsS0FBSyxDQUFDLGdDQUFnQyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQ3ZELE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDMUIsS0FBSyxFQUFFLEtBQUssQ0FBQyxPQUFPLElBQUksZ0NBQWdDO1NBQ3pELENBQUMsQ0FBQztJQUNMLENBQUM7QUFDSCxDQUFDLENBQUM7QUFsRlcsUUFBQSxHQUFHLE9Ba0ZkIn0=
+//# 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.19",
+  "version": "1.4.22",
   "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",