@lodashventure/medusa-booking-for-pickup 1.5.11 → 1.5.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -738,6 +738,20 @@ const DEFAULT_SCHEDULE = {
|
|
|
738
738
|
},
|
|
739
739
|
sunday: { enabled: false, timeSlots: [] }
|
|
740
740
|
};
|
|
741
|
+
const dedupeTimeSlots = (slots) => {
|
|
742
|
+
const seen = /* @__PURE__ */ new Set();
|
|
743
|
+
return slots.filter((slot) => {
|
|
744
|
+
if (!(slot == null ? void 0 : slot.start) || !(slot == null ? void 0 : slot.end)) {
|
|
745
|
+
return false;
|
|
746
|
+
}
|
|
747
|
+
const key = `${slot.start}-${slot.end}`;
|
|
748
|
+
if (seen.has(key)) {
|
|
749
|
+
return false;
|
|
750
|
+
}
|
|
751
|
+
seen.add(key);
|
|
752
|
+
return true;
|
|
753
|
+
});
|
|
754
|
+
};
|
|
741
755
|
function ShippingOptionDetails() {
|
|
742
756
|
const shippingOptionId = usePickupRouteId();
|
|
743
757
|
const routerNavigate = useOptionalNavigate();
|
|
@@ -763,17 +777,17 @@ function ShippingOptionDetails() {
|
|
|
763
777
|
}
|
|
764
778
|
return [];
|
|
765
779
|
};
|
|
766
|
-
const
|
|
780
|
+
const allAvailabilities = [
|
|
767
781
|
...normalizeInput(data.shipping_option.pickup_availabilities),
|
|
768
782
|
...normalizeInput(data.shipping_option.pickupAvailability)
|
|
769
783
|
];
|
|
770
|
-
|
|
784
|
+
allAvailabilities.filter(Boolean).map((availability) => {
|
|
771
785
|
if (!(availability == null ? void 0 : availability.day_of_week)) {
|
|
772
|
-
return;
|
|
786
|
+
return null;
|
|
773
787
|
}
|
|
774
788
|
const dayKey = availability.day_of_week.toLowerCase();
|
|
775
789
|
if (!_schedule[dayKey]) {
|
|
776
|
-
return;
|
|
790
|
+
return null;
|
|
777
791
|
}
|
|
778
792
|
const timeSlots = _schedule[dayKey].timeSlots;
|
|
779
793
|
timeSlots.push({
|
|
@@ -784,6 +798,11 @@ function ShippingOptionDetails() {
|
|
|
784
798
|
enabled: Boolean(availability.enable),
|
|
785
799
|
timeSlots
|
|
786
800
|
};
|
|
801
|
+
return availability;
|
|
802
|
+
}).filter(Boolean);
|
|
803
|
+
Object.keys(_schedule).forEach((day) => {
|
|
804
|
+
const uniqueSlots = dedupeTimeSlots(_schedule[day].timeSlots);
|
|
805
|
+
_schedule[day].timeSlots = uniqueSlots;
|
|
787
806
|
});
|
|
788
807
|
setSchedule({ ..._schedule });
|
|
789
808
|
}, [data]);
|
|
@@ -830,14 +849,17 @@ function ShippingOptionDetails() {
|
|
|
830
849
|
"Content-Type": "application/json"
|
|
831
850
|
},
|
|
832
851
|
body: {
|
|
833
|
-
schedules: Object.entries(schedule).filter(([_, daySchedule]) => daySchedule.enabled).map(([day, { enabled, timeSlots }]) =>
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
852
|
+
schedules: Object.entries(schedule).filter(([_, daySchedule]) => daySchedule.enabled).map(([day, { enabled, timeSlots }]) => {
|
|
853
|
+
const uniqueTimeSlots = dedupeTimeSlots(timeSlots);
|
|
854
|
+
return {
|
|
855
|
+
day_of_week: day,
|
|
856
|
+
enable: enabled,
|
|
857
|
+
timeSlots: uniqueTimeSlots.map((slot) => ({
|
|
858
|
+
start: slot.start,
|
|
859
|
+
end: slot.end
|
|
860
|
+
}))
|
|
861
|
+
};
|
|
862
|
+
}).filter((schedule2) => schedule2.timeSlots.length > 0)
|
|
841
863
|
}
|
|
842
864
|
});
|
|
843
865
|
refetch();
|
|
@@ -737,6 +737,20 @@ const DEFAULT_SCHEDULE = {
|
|
|
737
737
|
},
|
|
738
738
|
sunday: { enabled: false, timeSlots: [] }
|
|
739
739
|
};
|
|
740
|
+
const dedupeTimeSlots = (slots) => {
|
|
741
|
+
const seen = /* @__PURE__ */ new Set();
|
|
742
|
+
return slots.filter((slot) => {
|
|
743
|
+
if (!(slot == null ? void 0 : slot.start) || !(slot == null ? void 0 : slot.end)) {
|
|
744
|
+
return false;
|
|
745
|
+
}
|
|
746
|
+
const key = `${slot.start}-${slot.end}`;
|
|
747
|
+
if (seen.has(key)) {
|
|
748
|
+
return false;
|
|
749
|
+
}
|
|
750
|
+
seen.add(key);
|
|
751
|
+
return true;
|
|
752
|
+
});
|
|
753
|
+
};
|
|
740
754
|
function ShippingOptionDetails() {
|
|
741
755
|
const shippingOptionId = usePickupRouteId();
|
|
742
756
|
const routerNavigate = useOptionalNavigate();
|
|
@@ -762,17 +776,17 @@ function ShippingOptionDetails() {
|
|
|
762
776
|
}
|
|
763
777
|
return [];
|
|
764
778
|
};
|
|
765
|
-
const
|
|
779
|
+
const allAvailabilities = [
|
|
766
780
|
...normalizeInput(data.shipping_option.pickup_availabilities),
|
|
767
781
|
...normalizeInput(data.shipping_option.pickupAvailability)
|
|
768
782
|
];
|
|
769
|
-
|
|
783
|
+
allAvailabilities.filter(Boolean).map((availability) => {
|
|
770
784
|
if (!(availability == null ? void 0 : availability.day_of_week)) {
|
|
771
|
-
return;
|
|
785
|
+
return null;
|
|
772
786
|
}
|
|
773
787
|
const dayKey = availability.day_of_week.toLowerCase();
|
|
774
788
|
if (!_schedule[dayKey]) {
|
|
775
|
-
return;
|
|
789
|
+
return null;
|
|
776
790
|
}
|
|
777
791
|
const timeSlots = _schedule[dayKey].timeSlots;
|
|
778
792
|
timeSlots.push({
|
|
@@ -783,6 +797,11 @@ function ShippingOptionDetails() {
|
|
|
783
797
|
enabled: Boolean(availability.enable),
|
|
784
798
|
timeSlots
|
|
785
799
|
};
|
|
800
|
+
return availability;
|
|
801
|
+
}).filter(Boolean);
|
|
802
|
+
Object.keys(_schedule).forEach((day) => {
|
|
803
|
+
const uniqueSlots = dedupeTimeSlots(_schedule[day].timeSlots);
|
|
804
|
+
_schedule[day].timeSlots = uniqueSlots;
|
|
786
805
|
});
|
|
787
806
|
setSchedule({ ..._schedule });
|
|
788
807
|
}, [data]);
|
|
@@ -829,14 +848,17 @@ function ShippingOptionDetails() {
|
|
|
829
848
|
"Content-Type": "application/json"
|
|
830
849
|
},
|
|
831
850
|
body: {
|
|
832
|
-
schedules: Object.entries(schedule).filter(([_, daySchedule]) => daySchedule.enabled).map(([day, { enabled, timeSlots }]) =>
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
836
|
-
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
851
|
+
schedules: Object.entries(schedule).filter(([_, daySchedule]) => daySchedule.enabled).map(([day, { enabled, timeSlots }]) => {
|
|
852
|
+
const uniqueTimeSlots = dedupeTimeSlots(timeSlots);
|
|
853
|
+
return {
|
|
854
|
+
day_of_week: day,
|
|
855
|
+
enable: enabled,
|
|
856
|
+
timeSlots: uniqueTimeSlots.map((slot) => ({
|
|
857
|
+
start: slot.start,
|
|
858
|
+
end: slot.end
|
|
859
|
+
}))
|
|
860
|
+
};
|
|
861
|
+
}).filter((schedule2) => schedule2.timeSlots.length > 0)
|
|
840
862
|
}
|
|
841
863
|
});
|
|
842
864
|
refetch();
|
|
@@ -5,6 +5,91 @@ const framework_1 = require("@medusajs/framework");
|
|
|
5
5
|
const utils_1 = require("@medusajs/framework/utils");
|
|
6
6
|
const pickup_datetime_1 = require("../../../../modules/pickup-datetime");
|
|
7
7
|
const build_shipping_option_link_1 = require("../../../../workflows/pickup-availablity/utils/build-shipping-option-link");
|
|
8
|
+
const dedupeTimeSlots = (slots = []) => {
|
|
9
|
+
const seen = new Set();
|
|
10
|
+
const sanitized = [];
|
|
11
|
+
slots.forEach((slot) => {
|
|
12
|
+
if (!slot?.start || !slot?.end) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
const key = `${slot.start}-${slot.end}`;
|
|
16
|
+
if (seen.has(key)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
seen.add(key);
|
|
20
|
+
sanitized.push({
|
|
21
|
+
start: slot.start,
|
|
22
|
+
end: slot.end,
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
return sanitized;
|
|
26
|
+
};
|
|
27
|
+
const toTimeString = (value) => {
|
|
28
|
+
if (!value) {
|
|
29
|
+
return "";
|
|
30
|
+
}
|
|
31
|
+
const date = new Date(value);
|
|
32
|
+
if (!Number.isNaN(date.getTime())) {
|
|
33
|
+
return `${date.getHours().toString().padStart(2, "0")}:${date
|
|
34
|
+
.getMinutes()
|
|
35
|
+
.toString()
|
|
36
|
+
.padStart(2, "0")}`;
|
|
37
|
+
}
|
|
38
|
+
const match = `${value}`.match(/(\d{1,2}):(\d{2})/);
|
|
39
|
+
if (match) {
|
|
40
|
+
return `${match[1].padStart(2, "0")}:${match[2]}`;
|
|
41
|
+
}
|
|
42
|
+
return value.toString();
|
|
43
|
+
};
|
|
44
|
+
const dedupeAvailabilities = (availabilities = []) => {
|
|
45
|
+
const seen = new Set();
|
|
46
|
+
return availabilities.filter((availability) => {
|
|
47
|
+
if (!availability) {
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
const key = [
|
|
51
|
+
availability.day_of_week,
|
|
52
|
+
toTimeString(availability.timeStart),
|
|
53
|
+
toTimeString(availability.timeEnd),
|
|
54
|
+
]
|
|
55
|
+
.filter(Boolean)
|
|
56
|
+
.join("-");
|
|
57
|
+
if (!key) {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
if (seen.has(key)) {
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
seen.add(key);
|
|
64
|
+
return true;
|
|
65
|
+
});
|
|
66
|
+
};
|
|
67
|
+
const normalizeSchedulesByDay = (schedules = []) => {
|
|
68
|
+
const grouped = new Map();
|
|
69
|
+
schedules.forEach((schedule) => {
|
|
70
|
+
if (!schedule?.day_of_week) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const existing = grouped.get(schedule.day_of_week) ?? {
|
|
74
|
+
enable: false,
|
|
75
|
+
timeSlots: [],
|
|
76
|
+
};
|
|
77
|
+
existing.enable = existing.enable || Boolean(schedule.enable);
|
|
78
|
+
existing.timeSlots = [
|
|
79
|
+
...existing.timeSlots,
|
|
80
|
+
...(Array.isArray(schedule.timeSlots) ? schedule.timeSlots : []),
|
|
81
|
+
];
|
|
82
|
+
grouped.set(schedule.day_of_week, existing);
|
|
83
|
+
});
|
|
84
|
+
return Array.from(grouped.entries()).map(([day, config]) => {
|
|
85
|
+
const normalized = {
|
|
86
|
+
day_of_week: day,
|
|
87
|
+
enable: config.enable,
|
|
88
|
+
timeSlots: dedupeTimeSlots(config.timeSlots),
|
|
89
|
+
};
|
|
90
|
+
return normalized;
|
|
91
|
+
});
|
|
92
|
+
};
|
|
8
93
|
const POST = async (req, res) => {
|
|
9
94
|
const { id: shipping_option_id } = req.params;
|
|
10
95
|
const input = req.body;
|
|
@@ -18,7 +103,8 @@ const POST = async (req, res) => {
|
|
|
18
103
|
await link.dismiss(existingAvailabilities.map((availability) => (0, build_shipping_option_link_1.buildShippingOptionPickupLink)(shipping_option_id, availability.id)));
|
|
19
104
|
await pickupDatetimeService.deletePickupAvailabilities(existingAvailabilities.map((availability) => availability.id));
|
|
20
105
|
}
|
|
21
|
-
const
|
|
106
|
+
const schedules = normalizeSchedulesByDay(input.schedules ?? []);
|
|
107
|
+
const availabilities = schedules
|
|
22
108
|
.filter((schedule) => schedule.enable)
|
|
23
109
|
.flatMap((schedule) => schedule.timeSlots.map((slot) => {
|
|
24
110
|
const [startHour, startMinute] = slot.start.split(":").map(Number);
|
|
@@ -66,11 +152,12 @@ const GET = async (req, res) => {
|
|
|
66
152
|
const availabilities = await pickupDatetimeService.listPickupAvailabilities({
|
|
67
153
|
shipping_option_id,
|
|
68
154
|
});
|
|
155
|
+
const dedupedAvailabilities = dedupeAvailabilities(availabilities);
|
|
69
156
|
res.status(200).json({
|
|
70
157
|
shipping_option: {
|
|
71
158
|
...shippingOption,
|
|
72
|
-
pickup_availabilities:
|
|
73
|
-
pickupAvailability:
|
|
159
|
+
pickup_availabilities: dedupedAvailabilities,
|
|
160
|
+
pickupAvailability: dedupedAvailabilities,
|
|
74
161
|
},
|
|
75
162
|
});
|
|
76
163
|
}
|
|
@@ -79,4 +166,4 @@ const GET = async (req, res) => {
|
|
|
79
166
|
}
|
|
80
167
|
};
|
|
81
168
|
exports.GET = GET;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
169
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../../../../src/api/admin/pickup-date/[id]/route.ts"],"names":[],"mappings":"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"}
|