@lodashventure/medusa-parcel-shipping 0.2.11 → 0.2.18
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.
- package/.medusa/server/src/admin/index.js +1794 -1289
- package/.medusa/server/src/admin/index.mjs +1797 -1292
- package/.medusa/server/src/api/admin/boxes/[id]/route.js +52 -0
- package/.medusa/server/src/api/admin/boxes/route.js +44 -0
- package/.medusa/server/src/api/admin/distance/route.js +75 -0
- package/.medusa/server/src/api/admin/documents/document-packing-slip-settings/route.js +65 -0
- package/.medusa/server/{api → src/api}/admin/documents/packing-slip/preview/route.js +1 -1
- package/.medusa/server/{api → src/api}/admin/documents/packing-slip/route.js +2 -2
- package/.medusa/server/src/api/admin/material-costs/[id]/route.js +51 -0
- package/.medusa/server/src/api/admin/material-costs/route.js +46 -0
- package/.medusa/server/src/api/admin/packaging-materials/[id]/route.js +50 -0
- package/.medusa/server/src/api/admin/packaging-materials/route.js +52 -0
- package/.medusa/server/src/api/admin/packing-policies/[id]/route.js +41 -0
- package/.medusa/server/src/api/admin/packing-policies/route.js +43 -0
- package/.medusa/server/src/api/admin/rates/[id]/route.js +8 -0
- package/.medusa/server/src/api/admin/rates/route.js +7 -0
- package/.medusa/server/src/api/admin/service-areas/[id]/route.js +36 -0
- package/.medusa/server/src/api/admin/service-areas/route.js +40 -0
- package/.medusa/server/src/api/admin/shipping-rates/[id]/route.js +48 -0
- package/.medusa/server/src/api/admin/shipping-rates/route.js +66 -0
- package/.medusa/server/src/api/store/distance/route.js +75 -0
- package/.medusa/server/src/api/store/quote/route.js +116 -0
- package/.medusa/server/{common → src/common}/types.js +1 -1
- package/.medusa/server/src/common/utils/distance-calculator.js +98 -0
- package/.medusa/server/src/common/utils/geocoding.js +125 -0
- package/.medusa/server/{common → src/common}/utils/osrm-client.js +1 -1
- package/.medusa/server/src/common/utils/packing.js +484 -0
- package/.medusa/server/src/index.js +38 -0
- package/.medusa/server/{links → src/links}/index.js +1 -1
- package/.medusa/server/{links → src/links}/packing-slip-order.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/index.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/models/document-invoice.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/models/document-packing-slip-settings.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/models/document-packing-slip.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/models/document-settings.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/models/index.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/service.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/generators/invoice-generator.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/generators/packing-slip-generator.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/templates/invoices/basic/basic-logo.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/templates/invoices/basic/basic.js +1 -1
- package/.medusa/server/src/modules/documents/services/templates/invoices/basic/parts/customer-info.js +69 -0
- package/.medusa/server/{modules → src/modules}/documents/services/templates/invoices/basic/parts/header-for-logo.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/templates/invoices/basic/parts/header-logo.js +1 -1
- package/.medusa/server/src/modules/documents/services/templates/invoices/basic/parts/header.js +35 -0
- package/.medusa/server/{modules → src/modules}/documents/services/templates/invoices/basic/parts/hr.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/templates/invoices/basic/parts/invoice-info.js +1 -1
- package/.medusa/server/src/modules/documents/services/templates/invoices/basic/parts/table.js +97 -0
- package/.medusa/server/{modules → src/modules}/documents/services/templates/packing-slips/basic/basic.js +1 -1
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/customer-info-small.js +69 -0
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/customer-info.js +65 -0
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/header-small.js +37 -0
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/header.js +37 -0
- package/.medusa/server/{modules → src/modules}/documents/services/templates/packing-slips/basic/parts/hr.js +1 -1
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/table-items-small.js +44 -0
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/table-items.js +44 -0
- package/.medusa/server/src/modules/documents/services/templates/packing-slips/basic/parts/table-order-info-small.js +35 -0
- package/.medusa/server/{modules → src/modules}/documents/services/templates/packing-slips/basic/parts/table-order-info.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/services/templates/packing-slips/basic/small.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/types/api.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/types/constants.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/types/dto.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/types/template-kind.js +1 -1
- package/.medusa/server/{modules → src/modules}/documents/utils/currency.js +1 -1
- package/.medusa/server/src/modules/parcel-shipping/index.js +13 -0
- package/.medusa/server/src/modules/parcel-shipping/migrations/Migration20251023000000.js +37 -0
- package/.medusa/server/src/modules/parcel-shipping/models/index.js +16 -0
- package/.medusa/server/src/modules/parcel-shipping/models/material-cost.js +24 -0
- package/.medusa/server/src/modules/parcel-shipping/models/packaging-material.js +41 -0
- package/.medusa/server/src/modules/parcel-shipping/models/packing-policy.js +37 -0
- package/.medusa/server/src/modules/parcel-shipping/models/parcel-box.js +25 -0
- package/.medusa/server/src/modules/parcel-shipping/models/service-area.js +30 -0
- package/.medusa/server/src/modules/parcel-shipping/models/shipping-rate.js +50 -0
- package/.medusa/server/src/modules/parcel-shipping/service.js +485 -0
- package/.medusa/server/{providers → src/providers}/company-truck/index.js +1 -1
- package/.medusa/server/src/providers/company-truck/models/company-truck-rate.js +23 -0
- package/.medusa/server/{providers → src/providers}/company-truck/models/index.js +3 -2
- package/.medusa/server/src/providers/company-truck/models/material-cost.js +24 -0
- package/.medusa/server/src/providers/company-truck/models/parcel-box.js +21 -0
- package/.medusa/server/src/providers/company-truck/models/service-area.js +20 -0
- package/.medusa/server/src/providers/company-truck/service.js +456 -0
- package/.medusa/server/{providers → src/providers}/company-truck/types.js +1 -1
- package/.medusa/server/src/providers/index.js +8 -0
- package/.medusa/server/src/providers/parcel-fulfillment.js +378 -0
- package/.medusa/server/{providers → src/providers}/private-carrier/index.js +1 -1
- package/.medusa/server/{providers → src/providers}/private-carrier/models/index.js +1 -1
- package/.medusa/server/src/providers/private-carrier/models/parcel-box.js +21 -0
- package/.medusa/server/src/providers/private-carrier/models/private-carrier-rate.js +23 -0
- package/.medusa/server/src/providers/private-carrier/models/service-area.js +20 -0
- package/.medusa/server/src/providers/private-carrier/service.js +392 -0
- package/.medusa/server/{providers → src/providers}/private-carrier/types.js +1 -1
- package/.medusa/server/src/types/index.js +11 -0
- package/.medusa/server/src/utils/packing.js +386 -0
- package/.medusa/server/src/workflows/assign-packing-slip.js +35 -0
- package/.medusa/server/{workflows → src/workflows}/index.js +1 -1
- package/package.json +21 -11
- package/.medusa/server/api/admin/documents/document-packing-slip-settings/route.js +0 -62
- package/.medusa/server/api/admin/parcel-boxes/[id]/route.js +0 -45
- package/.medusa/server/api/admin/parcel-boxes/route.js +0 -49
- package/.medusa/server/api/admin/shipping-config/areas/[id]/route.js +0 -42
- package/.medusa/server/api/admin/shipping-config/areas/route.js +0 -49
- package/.medusa/server/api/admin/shipping-config/rates/[id]/route.js +0 -82
- package/.medusa/server/api/admin/shipping-config/rates/route.js +0 -95
- package/.medusa/server/api/shipping/distance/route.js +0 -85
- package/.medusa/server/api/shipping/distance/utils/zodTransform.js +0 -20
- package/.medusa/server/api/store/parcel-box-selector/route.js +0 -55
- package/.medusa/server/api/webhooks/tracking/route.js +0 -48
- package/.medusa/server/common/utils/packing.js +0 -379
- package/.medusa/server/index.js +0 -28
- package/.medusa/server/modules/documents/services/templates/invoices/basic/parts/customer-info.js +0 -69
- package/.medusa/server/modules/documents/services/templates/invoices/basic/parts/header.js +0 -35
- package/.medusa/server/modules/documents/services/templates/invoices/basic/parts/table.js +0 -97
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/customer-info-small.js +0 -69
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/customer-info.js +0 -65
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/header-small.js +0 -37
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/header.js +0 -37
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/table-items-small.js +0 -44
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/table-items.js +0 -44
- package/.medusa/server/modules/documents/services/templates/packing-slips/basic/parts/table-order-info-small.js +0 -35
- package/.medusa/server/providers/company-truck/models/company-truck-rate.js +0 -23
- package/.medusa/server/providers/company-truck/models/parcel-box.js +0 -21
- package/.medusa/server/providers/company-truck/models/service-area.js +0 -20
- package/.medusa/server/providers/company-truck/service.js +0 -456
- package/.medusa/server/providers/private-carrier/models/parcel-box.js +0 -21
- package/.medusa/server/providers/private-carrier/models/private-carrier-rate.js +0 -23
- package/.medusa/server/providers/private-carrier/models/service-area.js +0 -20
- package/.medusa/server/providers/private-carrier/service.js +0 -392
- package/.medusa/server/workflows/assign-packing-slip.js +0 -31
|
@@ -0,0 +1,386 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.selectBestPacking = selectBestPacking;
|
|
4
|
+
const PADDING_PER_SIDE_CM = 2;
|
|
5
|
+
const PADDING_TOTAL = PADDING_PER_SIDE_CM * 2;
|
|
6
|
+
/**
|
|
7
|
+
* Select best packing solution from available boxes
|
|
8
|
+
* Implements bin-packing algorithm with:
|
|
9
|
+
* - 2cm padding per side per item
|
|
10
|
+
* - 6 orientations per item
|
|
11
|
+
* - Layered packing (vertical axis)
|
|
12
|
+
* - Guillotine 2D within each layer
|
|
13
|
+
* - Stacking rules (noStack, fragile, stackable_max_layers)
|
|
14
|
+
*/
|
|
15
|
+
function selectBestPacking(items, boxes) {
|
|
16
|
+
const expandedItems = expandItems(items);
|
|
17
|
+
if (!expandedItems.length) {
|
|
18
|
+
return {
|
|
19
|
+
success: false,
|
|
20
|
+
code: "invalid_items",
|
|
21
|
+
message: "No items with positive quantity were provided.",
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
const successful = [];
|
|
25
|
+
const overweight = [];
|
|
26
|
+
const nearFits = [];
|
|
27
|
+
for (const box of boxes) {
|
|
28
|
+
const evaluation = evaluateBox(box, expandedItems);
|
|
29
|
+
if (evaluation.status === "success") {
|
|
30
|
+
successful.push(evaluation.evaluation);
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
if (evaluation.evaluation) {
|
|
34
|
+
if (evaluation.status === "overweight") {
|
|
35
|
+
overweight.push(evaluation.evaluation);
|
|
36
|
+
}
|
|
37
|
+
else if (evaluation.status === "no_fit") {
|
|
38
|
+
nearFits.push(evaluation.evaluation);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (successful.length) {
|
|
43
|
+
const sorted = successful.sort(comparePacking);
|
|
44
|
+
return {
|
|
45
|
+
success: true,
|
|
46
|
+
result: sorted[0],
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
if (overweight.length) {
|
|
50
|
+
return {
|
|
51
|
+
success: false,
|
|
52
|
+
code: "no_fit_weight",
|
|
53
|
+
message: "Total weight exceeds the maximum weight limit for available boxes.",
|
|
54
|
+
alternatives: overweight.slice(0, 3).sort(comparePacking),
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
return {
|
|
58
|
+
success: false,
|
|
59
|
+
code: "no_fit",
|
|
60
|
+
message: "No configured box can fit the provided items.",
|
|
61
|
+
alternatives: nearFits.slice(0, 3).sort(comparePacking),
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
function evaluateBox(box, items) {
|
|
65
|
+
const totalActualWeight = items.reduce((acc, item) => acc + item.weight, 0);
|
|
66
|
+
const packedVolume = items.reduce((acc, item) => acc + item.volume, 0);
|
|
67
|
+
const initialMetrics = {
|
|
68
|
+
usedHeight: 0,
|
|
69
|
+
headroom: box.height_cm,
|
|
70
|
+
wasteAreaSum: box.width_cm * box.length_cm,
|
|
71
|
+
voidVolume: Math.max(box.width_cm * box.length_cm * box.height_cm - packedVolume, 0),
|
|
72
|
+
layers: 0,
|
|
73
|
+
placements: [],
|
|
74
|
+
totalWeightKg: Number(totalActualWeight.toFixed(4)),
|
|
75
|
+
};
|
|
76
|
+
if (totalActualWeight > box.max_weight_kg) {
|
|
77
|
+
return {
|
|
78
|
+
status: "overweight",
|
|
79
|
+
overBy: totalActualWeight - box.max_weight_kg,
|
|
80
|
+
evaluation: {
|
|
81
|
+
box,
|
|
82
|
+
metrics: initialMetrics,
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
const layers = [];
|
|
87
|
+
const sortedItems = items
|
|
88
|
+
.map((item) => ({ item }))
|
|
89
|
+
.sort((a, b) => b.item.volume - a.item.volume);
|
|
90
|
+
for (const { item } of sortedItems) {
|
|
91
|
+
const orientations = getOrientations(item, Boolean(item.attributes?.noStack));
|
|
92
|
+
const itemStackable = getStackableValue(item.attributes);
|
|
93
|
+
let placed = false;
|
|
94
|
+
for (const orientation of orientations) {
|
|
95
|
+
for (const layer of layers) {
|
|
96
|
+
// noStack items can only be placed on ground layer
|
|
97
|
+
if (item.attributes?.noStack && layer.index !== 0) {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
// Check if we can stack on the layer below
|
|
101
|
+
if (layer.index > 0 && !canStackOnLayer(layers[layer.index - 1])) {
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
const totalHeightIfPlaced = layers.reduce((acc, existingLayer) => acc +
|
|
105
|
+
(existingLayer === layer
|
|
106
|
+
? Math.max(existingLayer.height, orientation.height)
|
|
107
|
+
: existingLayer.height), 0);
|
|
108
|
+
if (totalHeightIfPlaced > box.height_cm + 1e-6) {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
const placement = placeInLayer(layer, orientation);
|
|
112
|
+
if (placement) {
|
|
113
|
+
placed = true;
|
|
114
|
+
layer.height = Math.max(layer.height, orientation.height);
|
|
115
|
+
layer.hasNoStack =
|
|
116
|
+
layer.hasNoStack || Boolean(item.attributes?.noStack);
|
|
117
|
+
layer.placements.push({
|
|
118
|
+
sku: item.sku,
|
|
119
|
+
orientation,
|
|
120
|
+
position: [placement.x, placement.y, layer.startHeight],
|
|
121
|
+
stackable: itemStackable,
|
|
122
|
+
stackedOnTopCount: 0,
|
|
123
|
+
});
|
|
124
|
+
if (layer.index > 0) {
|
|
125
|
+
incrementStackCount(layers[layer.index - 1]);
|
|
126
|
+
}
|
|
127
|
+
recalculateLayerHeights(layers);
|
|
128
|
+
updateWasteArea(initialMetrics, layers);
|
|
129
|
+
break;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
if (placed) {
|
|
133
|
+
break;
|
|
134
|
+
}
|
|
135
|
+
// Try creating new layer
|
|
136
|
+
const totalUsedHeight = layers.reduce((acc, layer) => acc + layer.height, 0);
|
|
137
|
+
if (totalUsedHeight + orientation.height > box.height_cm + 1e-6) {
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
if (item.attributes?.noStack && layers.length > 0) {
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
if (layers.length > 0 && !canStackOnLayer(layers[layers.length - 1])) {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
const newLayer = {
|
|
147
|
+
index: layers.length,
|
|
148
|
+
startHeight: totalUsedHeight,
|
|
149
|
+
height: orientation.height,
|
|
150
|
+
spaces: [
|
|
151
|
+
{
|
|
152
|
+
x: 0,
|
|
153
|
+
y: 0,
|
|
154
|
+
width: box.width_cm,
|
|
155
|
+
length: box.length_cm,
|
|
156
|
+
},
|
|
157
|
+
],
|
|
158
|
+
placements: [],
|
|
159
|
+
hasNoStack: Boolean(item.attributes?.noStack),
|
|
160
|
+
};
|
|
161
|
+
const placement = placeInLayer(newLayer, orientation);
|
|
162
|
+
if (!placement) {
|
|
163
|
+
continue;
|
|
164
|
+
}
|
|
165
|
+
newLayer.placements.push({
|
|
166
|
+
sku: item.sku,
|
|
167
|
+
orientation,
|
|
168
|
+
position: [placement.x, placement.y, newLayer.startHeight],
|
|
169
|
+
stackable: itemStackable,
|
|
170
|
+
stackedOnTopCount: 0,
|
|
171
|
+
});
|
|
172
|
+
if (layers.length > 0) {
|
|
173
|
+
incrementStackCount(layers[layers.length - 1]);
|
|
174
|
+
}
|
|
175
|
+
layers.push(newLayer);
|
|
176
|
+
recalculateLayerHeights(layers);
|
|
177
|
+
updateWasteArea(initialMetrics, layers);
|
|
178
|
+
placed = true;
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
if (!placed) {
|
|
182
|
+
return {
|
|
183
|
+
status: "no_fit",
|
|
184
|
+
slackScore: calculateSlackScore(box, items),
|
|
185
|
+
evaluation: {
|
|
186
|
+
box,
|
|
187
|
+
metrics: initialMetrics,
|
|
188
|
+
},
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
initialMetrics.layers = layers.length;
|
|
193
|
+
initialMetrics.usedHeight = layers.reduce((acc, layer) => acc + layer.height, 0);
|
|
194
|
+
initialMetrics.headroom = Number(Math.max(box.height_cm - initialMetrics.usedHeight, 0).toFixed(2));
|
|
195
|
+
initialMetrics.placements = layers.flatMap((layer, layerIdx) => layer.placements.map((placement) => ({
|
|
196
|
+
sku: placement.sku,
|
|
197
|
+
orientation: [
|
|
198
|
+
Number(placement.orientation.width.toFixed(2)),
|
|
199
|
+
Number(placement.orientation.length.toFixed(2)),
|
|
200
|
+
Number(placement.orientation.height.toFixed(2)),
|
|
201
|
+
],
|
|
202
|
+
position: placement.position,
|
|
203
|
+
layerIndex: layerIdx,
|
|
204
|
+
})));
|
|
205
|
+
initialMetrics.wasteAreaSum = layers.reduce((acc, layer) => acc +
|
|
206
|
+
layer.spaces.reduce((spaceAcc, space) => {
|
|
207
|
+
return spaceAcc + space.width * space.length;
|
|
208
|
+
}, 0), 0);
|
|
209
|
+
return {
|
|
210
|
+
status: "success",
|
|
211
|
+
evaluation: {
|
|
212
|
+
box,
|
|
213
|
+
metrics: initialMetrics,
|
|
214
|
+
},
|
|
215
|
+
};
|
|
216
|
+
}
|
|
217
|
+
function expandItems(items) {
|
|
218
|
+
const expanded = [];
|
|
219
|
+
for (const item of items) {
|
|
220
|
+
const qty = Math.max(0, Math.floor(item.quantity));
|
|
221
|
+
if (!qty) {
|
|
222
|
+
continue;
|
|
223
|
+
}
|
|
224
|
+
const paddedWidth = item.width + PADDING_TOTAL;
|
|
225
|
+
const paddedLength = item.length + PADDING_TOTAL;
|
|
226
|
+
const paddedHeight = item.height + PADDING_TOTAL;
|
|
227
|
+
const volume = paddedWidth * paddedLength * paddedHeight;
|
|
228
|
+
for (let i = 0; i < qty; i++) {
|
|
229
|
+
expanded.push({
|
|
230
|
+
sku: item.sku,
|
|
231
|
+
baseWidth: item.width,
|
|
232
|
+
baseLength: item.length,
|
|
233
|
+
baseHeight: item.height,
|
|
234
|
+
width: paddedWidth,
|
|
235
|
+
length: paddedLength,
|
|
236
|
+
height: paddedHeight,
|
|
237
|
+
weight: item.weight,
|
|
238
|
+
volume,
|
|
239
|
+
attributes: item.attributes,
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
return expanded;
|
|
244
|
+
}
|
|
245
|
+
function getOrientations(item, noStack) {
|
|
246
|
+
const orientations = [];
|
|
247
|
+
const dims = [item.width, item.length, item.height];
|
|
248
|
+
const permutations = [
|
|
249
|
+
[dims[0], dims[1], dims[2]],
|
|
250
|
+
[dims[0], dims[2], dims[1]],
|
|
251
|
+
[dims[1], dims[0], dims[2]],
|
|
252
|
+
[dims[1], dims[2], dims[0]],
|
|
253
|
+
[dims[2], dims[0], dims[1]],
|
|
254
|
+
[dims[2], dims[1], dims[0]],
|
|
255
|
+
];
|
|
256
|
+
for (const [w, l, h] of permutations) {
|
|
257
|
+
// noStack items must be horizontal (height < width and length)
|
|
258
|
+
if (noStack && h > Math.min(w, l)) {
|
|
259
|
+
continue;
|
|
260
|
+
}
|
|
261
|
+
orientations.push({
|
|
262
|
+
width: Number(w.toFixed(2)),
|
|
263
|
+
length: Number(l.toFixed(2)),
|
|
264
|
+
height: Number(h.toFixed(2)),
|
|
265
|
+
volume: Number((w * l * h).toFixed(2)),
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
return orientations.sort((a, b) => a.height - b.height || a.volume - b.volume);
|
|
269
|
+
}
|
|
270
|
+
/**
|
|
271
|
+
* Get stackable value from item attributes
|
|
272
|
+
* Priority: noStack > stackable > default (unlimited)
|
|
273
|
+
*/
|
|
274
|
+
function getStackableValue(attributes) {
|
|
275
|
+
if (attributes?.noStack) {
|
|
276
|
+
return 0;
|
|
277
|
+
}
|
|
278
|
+
if (attributes?.stackable !== undefined) {
|
|
279
|
+
return attributes.stackable;
|
|
280
|
+
}
|
|
281
|
+
return undefined; // unlimited
|
|
282
|
+
}
|
|
283
|
+
function canStackOnLayer(layer) {
|
|
284
|
+
for (const placement of layer.placements) {
|
|
285
|
+
const stackable = placement.stackable;
|
|
286
|
+
if (stackable === 0) {
|
|
287
|
+
return false;
|
|
288
|
+
}
|
|
289
|
+
if (stackable === -1 || stackable === undefined) {
|
|
290
|
+
continue;
|
|
291
|
+
}
|
|
292
|
+
if (stackable > 0 && placement.stackedOnTopCount >= stackable) {
|
|
293
|
+
return false;
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
return true;
|
|
297
|
+
}
|
|
298
|
+
function incrementStackCount(layer) {
|
|
299
|
+
for (const placement of layer.placements) {
|
|
300
|
+
placement.stackedOnTopCount++;
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
function placeInLayer(layer, orientation) {
|
|
304
|
+
for (let i = 0; i < layer.spaces.length; i++) {
|
|
305
|
+
const space = layer.spaces[i];
|
|
306
|
+
if (orientation.width <= space.width + 1e-6 &&
|
|
307
|
+
orientation.length <= space.length + 1e-6) {
|
|
308
|
+
layer.spaces.splice(i, 1);
|
|
309
|
+
splitSpace(layer, space, orientation);
|
|
310
|
+
return {
|
|
311
|
+
x: space.x,
|
|
312
|
+
y: space.y,
|
|
313
|
+
width: orientation.width,
|
|
314
|
+
length: orientation.length,
|
|
315
|
+
};
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
return null;
|
|
319
|
+
}
|
|
320
|
+
function splitSpace(layer, space, orientation) {
|
|
321
|
+
const remainingWidth = Number(Math.max(space.width - orientation.width, 0).toFixed(2));
|
|
322
|
+
const remainingLength = Number(Math.max(space.length - orientation.length, 0).toFixed(2));
|
|
323
|
+
if (remainingWidth > 0) {
|
|
324
|
+
layer.spaces.push({
|
|
325
|
+
x: Number((space.x + orientation.width).toFixed(2)),
|
|
326
|
+
y: space.y,
|
|
327
|
+
width: remainingWidth,
|
|
328
|
+
length: orientation.length,
|
|
329
|
+
});
|
|
330
|
+
}
|
|
331
|
+
if (remainingLength > 0) {
|
|
332
|
+
layer.spaces.push({
|
|
333
|
+
x: space.x,
|
|
334
|
+
y: Number((space.y + orientation.length).toFixed(2)),
|
|
335
|
+
width: space.width,
|
|
336
|
+
length: remainingLength,
|
|
337
|
+
});
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
function recalculateLayerHeights(layers) {
|
|
341
|
+
let cursor = 0;
|
|
342
|
+
for (const layer of layers) {
|
|
343
|
+
layer.startHeight = Number(cursor.toFixed(2));
|
|
344
|
+
cursor += layer.height;
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
function updateWasteArea(metrics, layers) {
|
|
348
|
+
metrics.wasteAreaSum = layers.reduce((acc, layer) => {
|
|
349
|
+
return (acc +
|
|
350
|
+
layer.spaces.reduce((spaceAcc, space) => {
|
|
351
|
+
return spaceAcc + space.width * space.length;
|
|
352
|
+
}, 0));
|
|
353
|
+
}, 0);
|
|
354
|
+
}
|
|
355
|
+
function calculateSlackScore(box, items) {
|
|
356
|
+
const totalVolume = items.reduce((acc, item) => acc + item.volume, 0);
|
|
357
|
+
const boxVolume = box.width_cm * box.length_cm * box.height_cm;
|
|
358
|
+
const volumeSlack = boxVolume - totalVolume;
|
|
359
|
+
const maxWidth = Math.max(...items.map((item) => item.width));
|
|
360
|
+
const maxLength = Math.max(...items.map((item) => item.length));
|
|
361
|
+
const totalHeight = items.reduce((acc, item) => acc + item.height, 0);
|
|
362
|
+
const widthSlack = box.width_cm - maxWidth;
|
|
363
|
+
const lengthSlack = box.length_cm - maxLength;
|
|
364
|
+
const heightSlack = box.height_cm - totalHeight;
|
|
365
|
+
return ((volumeSlack > 0 ? volumeSlack : Number.MAX_SAFE_INTEGER) +
|
|
366
|
+
(widthSlack > 0 ? widthSlack : Number.MAX_SAFE_INTEGER / 2) +
|
|
367
|
+
(lengthSlack > 0 ? lengthSlack : Number.MAX_SAFE_INTEGER / 2) +
|
|
368
|
+
(heightSlack > 0 ? heightSlack : Number.MAX_SAFE_INTEGER / 2));
|
|
369
|
+
}
|
|
370
|
+
/**
|
|
371
|
+
* Compare packing solutions
|
|
372
|
+
* Priority: usedHeight < wasteAreaSum < voidVolume < price
|
|
373
|
+
*/
|
|
374
|
+
function comparePacking(a, b) {
|
|
375
|
+
if (a.metrics.usedHeight !== b.metrics.usedHeight) {
|
|
376
|
+
return a.metrics.usedHeight - b.metrics.usedHeight;
|
|
377
|
+
}
|
|
378
|
+
if (a.metrics.wasteAreaSum !== b.metrics.wasteAreaSum) {
|
|
379
|
+
return a.metrics.wasteAreaSum - b.metrics.wasteAreaSum;
|
|
380
|
+
}
|
|
381
|
+
if (a.metrics.voidVolume !== b.metrics.voidVolume) {
|
|
382
|
+
return a.metrics.voidVolume - b.metrics.voidVolume;
|
|
383
|
+
}
|
|
384
|
+
return a.box.price_thb - b.box.price_thb;
|
|
385
|
+
}
|
|
386
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../src/utils/packing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
4
|
+
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
5
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
6
|
+
const documents_1 = require("../modules/documents");
|
|
7
|
+
const assignPackingSlipToOrderWorkflow = (0, workflows_sdk_1.createWorkflow)("assign-packing-slip-to-order", function (input) {
|
|
8
|
+
(0, workflows_sdk_1.when)(input, (input) => {
|
|
9
|
+
return input.oldPackingSlipId !== undefined;
|
|
10
|
+
}).then(() => {
|
|
11
|
+
(0, core_flows_1.dismissRemoteLinkStep)([
|
|
12
|
+
{
|
|
13
|
+
[utils_1.Modules.ORDER]: {
|
|
14
|
+
order_id: input.orderId,
|
|
15
|
+
},
|
|
16
|
+
[documents_1.DOCUMENTS_MODULE]: {
|
|
17
|
+
document_packing_slip_id: input.oldPackingSlipId,
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
]);
|
|
21
|
+
});
|
|
22
|
+
(0, core_flows_1.createRemoteLinkStep)([
|
|
23
|
+
{
|
|
24
|
+
[utils_1.Modules.ORDER]: {
|
|
25
|
+
order_id: input.orderId,
|
|
26
|
+
},
|
|
27
|
+
[documents_1.DOCUMENTS_MODULE]: {
|
|
28
|
+
document_packing_slip_id: input.newPackingSlipId,
|
|
29
|
+
},
|
|
30
|
+
},
|
|
31
|
+
]);
|
|
32
|
+
return new workflows_sdk_1.WorkflowResponse({});
|
|
33
|
+
});
|
|
34
|
+
exports.default = assignPackingSlipToOrderWorkflow;
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzaWduLXBhY2tpbmctc2xpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy93b3JrZmxvd3MvYXNzaWduLXBhY2tpbmctc2xpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHFFQUkyQztBQUMzQyw0REFHcUM7QUFDckMscURBQW9EO0FBQ3BELG9EQUF3RDtBQVF4RCxNQUFNLGdDQUFnQyxHQUFHLElBQUEsOEJBQWMsRUFDckQsOEJBQThCLEVBQzlCLFVBQVUsS0FBb0M7SUFDNUMsSUFBQSxvQkFBSSxFQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQ3BCLE9BQU8sS0FBSyxDQUFDLGdCQUFnQixLQUFLLFNBQVMsQ0FBQztJQUM5QyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1FBQ1gsSUFBQSxrQ0FBcUIsRUFBQztZQUNwQjtnQkFDRSxDQUFDLGVBQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtvQkFDZixRQUFRLEVBQUUsS0FBSyxDQUFDLE9BQU87aUJBQ3hCO2dCQUNELENBQUMsNEJBQWdCLENBQUMsRUFBRTtvQkFDbEIsd0JBQXdCLEVBQUUsS0FBSyxDQUFDLGdCQUFnQjtpQkFDakQ7YUFDRjtTQUNGLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0lBRUgsSUFBQSxpQ0FBb0IsRUFBQztRQUNuQjtZQUNFLENBQUMsZUFBTyxDQUFDLEtBQUssQ0FBQyxFQUFFO2dCQUNmLFFBQVEsRUFBRSxLQUFLLENBQUMsT0FBTzthQUN4QjtZQUNELENBQUMsNEJBQWdCLENBQUMsRUFBRTtnQkFDbEIsd0JBQXdCLEVBQUUsS0FBSyxDQUFDLGdCQUFnQjthQUNqRDtTQUNGO0tBQ0YsQ0FBQyxDQUFDO0lBRUgsT0FBTyxJQUFJLGdDQUFnQixDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ2xDLENBQUMsQ0FDRixDQUFDO0FBRUYsa0JBQWUsZ0NBQWdDLENBQUMifQ==
|
|
@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.assignPackingSlipToOrderWorkflow = void 0;
|
|
7
7
|
var assign_packing_slip_1 = require("./assign-packing-slip");
|
|
8
8
|
Object.defineProperty(exports, "assignPackingSlipToOrderWorkflow", { enumerable: true, get: function () { return __importDefault(assign_packing_slip_1).default; } });
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvd29ya2Zsb3dzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDZEQUFtRjtBQUExRSx3SkFBQSxPQUFPLE9BQW9DIn0=
|
package/package.json
CHANGED
|
@@ -1,21 +1,27 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lodashventure/medusa-parcel-shipping",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.18",
|
|
4
4
|
"description": "Parcel box selection and Thailand shipping quotes for Medusa.",
|
|
5
5
|
"author": "LodashVenture",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"files": [
|
|
8
|
-
".medusa/server"
|
|
8
|
+
".medusa/server/**/*",
|
|
9
|
+
".medusa/admin/**/*"
|
|
9
10
|
],
|
|
11
|
+
"main": "./.medusa/server/index.js",
|
|
10
12
|
"exports": {
|
|
11
13
|
"./package.json": "./package.json",
|
|
12
|
-
"./workflows": "./.medusa/server/workflows/index.js",
|
|
13
|
-
"
|
|
14
|
-
"./
|
|
15
|
-
"./
|
|
16
|
-
"./
|
|
17
|
-
"
|
|
18
|
-
"
|
|
14
|
+
"./workflows": "./.medusa/server/src/workflows/index.js",
|
|
15
|
+
"./.medusa/server/src/modules/*": "./.medusa/server/src/modules/*/index.js",
|
|
16
|
+
"./modules/*": "./.medusa/server/src/modules/*/index.js",
|
|
17
|
+
"./providers": "./.medusa/server/src/providers/index.js",
|
|
18
|
+
"./providers/*": "./.medusa/server/src/providers/*/index.js",
|
|
19
|
+
"./*": "./.medusa/server/src/*.js",
|
|
20
|
+
"./admin": {
|
|
21
|
+
"import": "./.medusa/server/src/admin/index.mjs",
|
|
22
|
+
"require": "./.medusa/server/src/admin/index.js",
|
|
23
|
+
"default": "./.medusa/server/src/admin/index.js"
|
|
24
|
+
}
|
|
19
25
|
},
|
|
20
26
|
"keywords": [
|
|
21
27
|
"medusa",
|
|
@@ -24,9 +30,10 @@
|
|
|
24
30
|
"parcel"
|
|
25
31
|
],
|
|
26
32
|
"scripts": {
|
|
27
|
-
"build": "medusa plugin:build",
|
|
33
|
+
"build": "medusa plugin:build && npm run resolve:aliases",
|
|
28
34
|
"dev": "medusa plugin:develop",
|
|
29
|
-
"prepublishOnly": "medusa plugin:build"
|
|
35
|
+
"prepublishOnly": "medusa plugin:build && npm run resolve:aliases",
|
|
36
|
+
"resolve:aliases": "tsc-alias -p tsconfig.json --outDir .medusa/server"
|
|
30
37
|
},
|
|
31
38
|
"devDependencies": {
|
|
32
39
|
"@medusajs/admin-sdk": "2.11.0",
|
|
@@ -44,7 +51,9 @@
|
|
|
44
51
|
"prop-types": "^15.8.1",
|
|
45
52
|
"react": "^18.2.0",
|
|
46
53
|
"react-dom": "^18.2.0",
|
|
54
|
+
"rimraf": "^6.0.1",
|
|
47
55
|
"ts-node": "^10.9.2",
|
|
56
|
+
"tsc-alias": "^1.8.16",
|
|
48
57
|
"typescript": "^5.6.2",
|
|
49
58
|
"vite": "^5.2.11",
|
|
50
59
|
"yalc": "^1.0.0-pre.53"
|
|
@@ -66,6 +75,7 @@
|
|
|
66
75
|
"dependencies": {
|
|
67
76
|
"@types/pdfkit": "^0.13.5",
|
|
68
77
|
"i18next": "^23.11.0",
|
|
78
|
+
"lucide-react": "^0.547.0",
|
|
69
79
|
"pdfkit": "0.15.0",
|
|
70
80
|
"thai-address-autocomplete-react": "^1.2.2",
|
|
71
81
|
"zod": "^4.1.5"
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Copyright 2024 RSC-Labs, https://rsoftcon.com/
|
|
4
|
-
*
|
|
5
|
-
* MIT License
|
|
6
|
-
*
|
|
7
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
8
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
9
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
10
|
-
* See the License for the specific language governing permissions and
|
|
11
|
-
* limitations under the License.
|
|
12
|
-
*/
|
|
13
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.POST = exports.GET = void 0;
|
|
15
|
-
const documents_1 = require("../../../../modules/documents");
|
|
16
|
-
const GET = async (req, res) => {
|
|
17
|
-
const documentsModuleService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
18
|
-
try {
|
|
19
|
-
const lastDocumentPackingSlipSettings = await documentsModuleService.listDocumentPackingSlipSettings({}, {
|
|
20
|
-
order: {
|
|
21
|
-
created_at: "DESC"
|
|
22
|
-
},
|
|
23
|
-
take: 1
|
|
24
|
-
});
|
|
25
|
-
res.status(200).json({
|
|
26
|
-
settings: lastDocumentPackingSlipSettings && lastDocumentPackingSlipSettings.length ? lastDocumentPackingSlipSettings[0] : undefined
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
catch (e) {
|
|
30
|
-
res.status(400).json({
|
|
31
|
-
message: e.message
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
exports.GET = GET;
|
|
36
|
-
const POST = async (req, res) => {
|
|
37
|
-
const body = req.body;
|
|
38
|
-
const formatNumber = body.formatNumber;
|
|
39
|
-
const forcedNumber = body.forcedNumber;
|
|
40
|
-
const template = body.template;
|
|
41
|
-
const documentsModuleService = req.scope.resolve(documents_1.DOCUMENTS_MODULE);
|
|
42
|
-
try {
|
|
43
|
-
const newSettings = await documentsModuleService.updatePackingSlipSettings(formatNumber, forcedNumber, template);
|
|
44
|
-
if (newSettings !== undefined) {
|
|
45
|
-
res.status(201).json({
|
|
46
|
-
settings: newSettings
|
|
47
|
-
});
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
res.status(400).json({
|
|
51
|
-
message: 'Cant update invoice settings'
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
catch (e) {
|
|
56
|
-
res.status(400).json({
|
|
57
|
-
message: e.message
|
|
58
|
-
});
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
-
exports.POST = POST;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9kb2N1bWVudC1wYWNraW5nLXNsaXAtc2V0dGluZ3Mvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7O0dBVUc7OztBQU9ILDZEQUFnRTtBQUl6RCxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQ3RCLEdBQWtCLEVBQ2xCLEdBQW1CLEVBQ25CLEVBQUU7SUFFRixNQUFNLHNCQUFzQixHQUEyQixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyw0QkFBZ0IsQ0FBQyxDQUFBO0lBRTFGLElBQUksQ0FBQztRQUNILE1BQU0sK0JBQStCLEdBQUcsTUFBTSxzQkFBc0IsQ0FBQywrQkFBK0IsQ0FBQyxFQUFFLEVBQUU7WUFDdkcsS0FBSyxFQUFFO2dCQUNMLFVBQVUsRUFBRSxNQUFNO2FBQ25CO1lBQ0QsSUFBSSxFQUFFLENBQUM7U0FDUixDQUFDLENBQUE7UUFDRixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUNuQixRQUFRLEVBQUUsK0JBQStCLElBQUksK0JBQStCLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQywrQkFBK0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUztTQUNySSxDQUFDLENBQUM7SUFFTCxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNYLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ25CLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTztTQUNuQixDQUFDLENBQUE7SUFDSixDQUFDO0FBQ0gsQ0FBQyxDQUFBO0FBdkJZLFFBQUEsR0FBRyxPQXVCZjtBQUVNLE1BQU0sSUFBSSxHQUFHLEtBQUssRUFDdkIsR0FBa0IsRUFDbEIsR0FBbUIsRUFDbkIsRUFBRTtJQUVGLE1BQU0sSUFBSSxHQUFRLEdBQUcsQ0FBQyxJQUFXLENBQUM7SUFDbEMsTUFBTSxZQUFZLEdBQXVCLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0QsTUFBTSxZQUFZLEdBQXVCLElBQUksQ0FBQyxZQUFZLENBQUM7SUFDM0QsTUFBTSxRQUFRLEdBQXVCLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDbkQsTUFBTSxzQkFBc0IsR0FBMkIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsNEJBQWdCLENBQUMsQ0FBQTtJQUUxRixJQUFJLENBQUM7UUFDSCxNQUFNLFdBQVcsR0FBRyxNQUFNLHNCQUFzQixDQUFDLHlCQUF5QixDQUFDLFlBQVksRUFBRSxZQUFZLEVBQUUsUUFBbUMsQ0FBQyxDQUFBO1FBQzNJLElBQUksV0FBVyxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQzlCLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNuQixRQUFRLEVBQUUsV0FBVzthQUN0QixDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNuQixPQUFPLEVBQUUsOEJBQThCO2FBQ3hDLENBQUMsQ0FBQTtRQUNKLENBQUM7SUFHSCxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNYLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ2pCLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTztTQUNyQixDQUFDLENBQUE7SUFDSixDQUFDO0FBQ0gsQ0FBQyxDQUFBO0FBN0JZLFFBQUEsSUFBSSxRQTZCaEIifQ==
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PUT = PUT;
|
|
4
|
-
exports.DELETE = DELETE;
|
|
5
|
-
const zod_1 = require("zod");
|
|
6
|
-
const updateBoxSchema = zod_1.z.object({
|
|
7
|
-
name: zod_1.z.string().min(1).optional(),
|
|
8
|
-
width_cm: zod_1.z.number().positive().optional(),
|
|
9
|
-
length_cm: zod_1.z.number().positive().optional(),
|
|
10
|
-
height_cm: zod_1.z.number().positive().optional(),
|
|
11
|
-
max_weight_kg: zod_1.z.number().positive().optional(),
|
|
12
|
-
price_thb: zod_1.z.number().nonnegative().optional(),
|
|
13
|
-
active: zod_1.z.boolean().optional(),
|
|
14
|
-
});
|
|
15
|
-
async function PUT(req, res) {
|
|
16
|
-
const { id } = req.params;
|
|
17
|
-
const fulfillmentService = req.scope.resolve("fulfillmentService");
|
|
18
|
-
const provider = (await fulfillmentService.retrieveProvider("company-truck"));
|
|
19
|
-
const dataService = provider.getDataService();
|
|
20
|
-
try {
|
|
21
|
-
const payload = updateBoxSchema.parse(req.body);
|
|
22
|
-
const updated = await dataService.modifyParcelBox(id, payload);
|
|
23
|
-
dataService.invalidateCache(["boxes"]);
|
|
24
|
-
res.status(200).json({ box: updated });
|
|
25
|
-
}
|
|
26
|
-
catch (error) {
|
|
27
|
-
if (error instanceof zod_1.ZodError) {
|
|
28
|
-
return res.status(400).json({
|
|
29
|
-
code: "invalid_payload",
|
|
30
|
-
issues: error.issues,
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
throw error;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
async function DELETE(req, res) {
|
|
37
|
-
const { id } = req.params;
|
|
38
|
-
const fulfillmentService = req.scope.resolve("fulfillmentService");
|
|
39
|
-
const provider = (await fulfillmentService.retrieveProvider("company-truck"));
|
|
40
|
-
const dataService = provider.getDataService();
|
|
41
|
-
await dataService.removeParcelBox(id);
|
|
42
|
-
dataService.invalidateCache(["boxes"]);
|
|
43
|
-
res.status(204).send();
|
|
44
|
-
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3BhcmNlbC1ib3hlcy9baWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBY0Esa0JBdUJDO0FBRUQsd0JBWUM7QUFsREQsNkJBQWtDO0FBR2xDLE1BQU0sZUFBZSxHQUFHLE9BQUMsQ0FBQyxNQUFNLENBQUM7SUFDL0IsSUFBSSxFQUFFLE9BQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO0lBQ2xDLFFBQVEsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQzFDLFNBQVMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQzNDLFNBQVMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQzNDLGFBQWEsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQy9DLFNBQVMsRUFBRSxPQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUMsUUFBUSxFQUFFO0lBQzlDLE1BQU0sRUFBRSxPQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsUUFBUSxFQUFFO0NBQy9CLENBQUMsQ0FBQztBQUVJLEtBQUssVUFBVSxHQUFHLENBQUMsR0FBa0IsRUFBRSxHQUFtQjtJQUMvRCxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUMxQixNQUFNLGtCQUFrQixHQUFRLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDeEUsTUFBTSxRQUFRLEdBQUcsQ0FBQyxNQUFNLGtCQUFrQixDQUFDLGdCQUFnQixDQUN6RCxlQUFlLENBQ2hCLENBQW9DLENBQUM7SUFDdEMsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBRTlDLElBQUksQ0FBQztRQUNILE1BQU0sT0FBTyxHQUFHLGVBQWUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2hELE1BQU0sT0FBTyxHQUFHLE1BQU0sV0FBVyxDQUFDLGVBQWUsQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDL0QsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFFdkMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUN6QyxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLElBQUksS0FBSyxZQUFZLGNBQVEsRUFBRSxDQUFDO1lBQzlCLE9BQU8sR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQzFCLElBQUksRUFBRSxpQkFBaUI7Z0JBQ3ZCLE1BQU0sRUFBRSxLQUFLLENBQUMsTUFBTTthQUNyQixDQUFDLENBQUM7UUFDTCxDQUFDO1FBQ0QsTUFBTSxLQUFLLENBQUM7SUFDZCxDQUFDO0FBQ0gsQ0FBQztBQUVNLEtBQUssVUFBVSxNQUFNLENBQUMsR0FBa0IsRUFBRSxHQUFtQjtJQUNsRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztJQUMxQixNQUFNLGtCQUFrQixHQUFRLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFDeEUsTUFBTSxRQUFRLEdBQUcsQ0FBQyxNQUFNLGtCQUFrQixDQUFDLGdCQUFnQixDQUN6RCxlQUFlLENBQ2hCLENBQW9DLENBQUM7SUFDdEMsTUFBTSxXQUFXLEdBQUcsUUFBUSxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBRTlDLE1BQU0sV0FBVyxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN0QyxXQUFXLENBQUMsZUFBZSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUV2QyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0FBQ3pCLENBQUMifQ==
|