@lodashventure/medusa-parcel-shipping 0.2.13 → 0.3.0
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 +1787 -1278
- package/.medusa/server/src/admin/index.mjs +1790 -1279
- 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
|
@@ -78,4 +78,4 @@ class OSRMClient {
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
exports.OSRMClient = OSRMClient;
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3NybS1jbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvY29tbW9uL3V0aWxzL29zcm0tY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHFEQUF3RDtBQWF4RDs7O0dBR0c7QUFDSCxNQUFhLFVBQVU7SUFHckIsWUFBWSxVQUFrQixpQ0FBaUM7UUFDN0QsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsS0FBSyxDQUFDLHNCQUFzQixDQUMxQixNQUF3QixFQUN4QixXQUE2QjtRQUU3QixNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLE1BQU0sQ0FBQztRQUM1QixNQUFNLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxHQUFHLFdBQVcsQ0FBQztRQUVqQyw2Q0FBNkM7UUFDN0MsTUFBTSxPQUFPLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxxQkFBcUIsSUFBSSxJQUFJLElBQUksSUFBSSxJQUFJLElBQUksSUFBSSxpQkFBaUIsQ0FBQztRQUVsRyxJQUFJLENBQUM7WUFDSCxNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUV0QyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUNqQixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQ2xDLDRCQUE0QixRQUFRLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxVQUFVLEVBQUUsQ0FDdEUsQ0FBQztZQUNKLENBQUM7WUFFRCxNQUFNLElBQUksR0FBaUIsTUFBTSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7WUFFakQsSUFBSSxJQUFJLENBQUMsSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO2dCQUN2QixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFL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
|
|
@@ -0,0 +1,484 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.selectBestPacking = selectBestPacking;
|
|
4
|
+
exports.selectMultiBoxPacking = selectMultiBoxPacking;
|
|
5
|
+
const PADDING_PER_SIDE_CM = 2;
|
|
6
|
+
const PADDING_TOTAL = PADDING_PER_SIDE_CM * 2;
|
|
7
|
+
function selectBestPacking(items, boxes) {
|
|
8
|
+
const expandedItems = expandItems(items);
|
|
9
|
+
if (!expandedItems.length) {
|
|
10
|
+
return {
|
|
11
|
+
success: false,
|
|
12
|
+
code: "invalid_items",
|
|
13
|
+
message: "No items with positive quantity were provided.",
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
const successful = [];
|
|
17
|
+
const overweight = [];
|
|
18
|
+
const nearFits = [];
|
|
19
|
+
for (const box of boxes) {
|
|
20
|
+
const evaluation = evaluateBox(box, expandedItems);
|
|
21
|
+
if (evaluation.status === "success") {
|
|
22
|
+
successful.push(evaluation.evaluation);
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
if (evaluation.evaluation) {
|
|
26
|
+
if (evaluation.status === "overweight") {
|
|
27
|
+
overweight.push(evaluation.evaluation);
|
|
28
|
+
}
|
|
29
|
+
else if (evaluation.status === "no_fit") {
|
|
30
|
+
nearFits.push(evaluation.evaluation);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
if (successful.length) {
|
|
35
|
+
const sorted = successful.sort(comparePacking);
|
|
36
|
+
return {
|
|
37
|
+
success: true,
|
|
38
|
+
result: sorted[0],
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
if (overweight.length) {
|
|
42
|
+
return {
|
|
43
|
+
success: false,
|
|
44
|
+
code: "no_fit_weight",
|
|
45
|
+
message: "Total weight exceeds the maximum weight limit for available boxes.",
|
|
46
|
+
alternatives: overweight.slice(0, 3).sort(comparePacking),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
success: false,
|
|
51
|
+
code: "no_fit",
|
|
52
|
+
message: "No configured box can fit the provided items.",
|
|
53
|
+
alternatives: nearFits.slice(0, 3).sort(comparePacking),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Select packing strategy with support for multiple boxes
|
|
58
|
+
* Tries single box first, then attempts multi-box packing if needed
|
|
59
|
+
*/
|
|
60
|
+
function selectMultiBoxPacking(items, boxes) {
|
|
61
|
+
// Try single box first
|
|
62
|
+
const singleBoxResult = selectBestPacking(items, boxes);
|
|
63
|
+
if (singleBoxResult.success) {
|
|
64
|
+
return {
|
|
65
|
+
success: true,
|
|
66
|
+
results: [singleBoxResult.result],
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
// If single box fails, try multi-box packing
|
|
70
|
+
const expandedItems = expandItems(items);
|
|
71
|
+
if (!expandedItems.length) {
|
|
72
|
+
return {
|
|
73
|
+
success: false,
|
|
74
|
+
code: "invalid_items",
|
|
75
|
+
message: "No items with positive quantity were provided.",
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
// Sort boxes by volume (largest first) for efficiency
|
|
79
|
+
const sortedBoxes = [...boxes].sort((a, b) => b.width_cm * b.length_cm * b.height_cm -
|
|
80
|
+
a.width_cm * a.length_cm * a.height_cm);
|
|
81
|
+
// Greedy algorithm: pack items into boxes one by one
|
|
82
|
+
const packedBoxes = [];
|
|
83
|
+
const remainingItems = [...expandedItems];
|
|
84
|
+
while (remainingItems.length > 0) {
|
|
85
|
+
let bestPacking = null;
|
|
86
|
+
let bestPackedCount = 0;
|
|
87
|
+
let bestPackedIndices = [];
|
|
88
|
+
// Try each box type with partial packing enabled
|
|
89
|
+
for (const box of sortedBoxes) {
|
|
90
|
+
// Try to pack as many remaining items as possible into this box
|
|
91
|
+
const evaluation = evaluateBox(box, remainingItems, true);
|
|
92
|
+
if (evaluation.status === "success" ||
|
|
93
|
+
evaluation.status === "partial") {
|
|
94
|
+
const packedCount = evaluation.evaluation.metrics.placements.length;
|
|
95
|
+
if (packedCount > bestPackedCount) {
|
|
96
|
+
bestPacking = evaluation.evaluation;
|
|
97
|
+
bestPackedCount = packedCount;
|
|
98
|
+
// Track which items were packed
|
|
99
|
+
bestPackedIndices = evaluation.evaluation.metrics.placements.map((p, idx) => idx);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
if (!bestPacking || bestPackedCount === 0) {
|
|
104
|
+
// Can't pack any more items
|
|
105
|
+
return {
|
|
106
|
+
success: false,
|
|
107
|
+
code: "no_fit_multi_box",
|
|
108
|
+
message: `Unable to pack all items. ${remainingItems.length} item(s) could not fit in any available boxes.`,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
// Add this packing solution
|
|
112
|
+
packedBoxes.push(bestPacking);
|
|
113
|
+
// Remove packed items from remaining items
|
|
114
|
+
// Note: This is a simplified approach - we remove items based on count
|
|
115
|
+
const itemSkuCounts = new Map();
|
|
116
|
+
for (const placement of bestPacking.metrics.placements) {
|
|
117
|
+
itemSkuCounts.set(placement.sku, (itemSkuCounts.get(placement.sku) || 0) + 1);
|
|
118
|
+
}
|
|
119
|
+
// Remove packed items
|
|
120
|
+
const newRemaining = [];
|
|
121
|
+
const toRemove = new Map(itemSkuCounts);
|
|
122
|
+
for (const item of remainingItems) {
|
|
123
|
+
const removeCount = toRemove.get(item.sku) || 0;
|
|
124
|
+
if (removeCount > 0) {
|
|
125
|
+
toRemove.set(item.sku, removeCount - 1);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
newRemaining.push(item);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
remainingItems.length = 0;
|
|
132
|
+
remainingItems.push(...newRemaining);
|
|
133
|
+
}
|
|
134
|
+
return {
|
|
135
|
+
success: true,
|
|
136
|
+
results: packedBoxes,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
function evaluateBox(box, items, allowPartial = false) {
|
|
140
|
+
const totalActualWeight = items.reduce((acc, item) => acc + item.weight, 0);
|
|
141
|
+
const packedVolume = items.reduce((acc, item) => acc + item.volume, 0);
|
|
142
|
+
const initialMetrics = {
|
|
143
|
+
usedHeight: 0,
|
|
144
|
+
headroom: box.height_cm,
|
|
145
|
+
wasteAreaSum: box.width_cm * box.length_cm,
|
|
146
|
+
voidVolume: Math.max(box.width_cm * box.length_cm * box.height_cm - packedVolume, 0),
|
|
147
|
+
layers: 0,
|
|
148
|
+
placements: [],
|
|
149
|
+
totalWeightKg: Number(totalActualWeight.toFixed(4)),
|
|
150
|
+
};
|
|
151
|
+
if (totalActualWeight > box.max_weight_kg) {
|
|
152
|
+
return {
|
|
153
|
+
status: "overweight",
|
|
154
|
+
overBy: totalActualWeight - box.max_weight_kg,
|
|
155
|
+
evaluation: {
|
|
156
|
+
box,
|
|
157
|
+
metrics: initialMetrics,
|
|
158
|
+
},
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
const layers = [];
|
|
162
|
+
const sortedItems = items
|
|
163
|
+
.map((item) => ({ item }))
|
|
164
|
+
.sort((a, b) => b.item.volume - a.item.volume);
|
|
165
|
+
let packedItemsCount = 0;
|
|
166
|
+
let unpackedItemsCount = 0;
|
|
167
|
+
for (const { item } of sortedItems) {
|
|
168
|
+
const orientations = getOrientations(item, Boolean(item.attributes?.noStack));
|
|
169
|
+
// Get stackable value from item attributes
|
|
170
|
+
const itemStackable = getStackableValue(item.attributes);
|
|
171
|
+
let placed = false;
|
|
172
|
+
for (const orientation of orientations) {
|
|
173
|
+
for (const layer of layers) {
|
|
174
|
+
// Check if item has noStack and trying to place on non-ground layer
|
|
175
|
+
if (item.attributes?.noStack && layer.index !== 0) {
|
|
176
|
+
continue;
|
|
177
|
+
}
|
|
178
|
+
// Skip if this is not the first layer and the layer below has stacking restrictions
|
|
179
|
+
if (layer.index > 0 && !canStackOnLayer(layers[layer.index - 1])) {
|
|
180
|
+
continue;
|
|
181
|
+
}
|
|
182
|
+
const totalHeightIfPlaced = layers.reduce((acc, existingLayer) => acc +
|
|
183
|
+
(existingLayer === layer
|
|
184
|
+
? Math.max(existingLayer.height, orientation.height)
|
|
185
|
+
: existingLayer.height), 0);
|
|
186
|
+
if (totalHeightIfPlaced > box.height_cm + 1e-6) {
|
|
187
|
+
continue;
|
|
188
|
+
}
|
|
189
|
+
const placement = placeInLayer(layer, orientation);
|
|
190
|
+
if (placement) {
|
|
191
|
+
placed = true;
|
|
192
|
+
layer.height = Math.max(layer.height, orientation.height);
|
|
193
|
+
layer.hasNoStack =
|
|
194
|
+
layer.hasNoStack || Boolean(item.attributes?.noStack);
|
|
195
|
+
layer.placements.push({
|
|
196
|
+
sku: item.sku,
|
|
197
|
+
orientation,
|
|
198
|
+
position: [placement.x, placement.y, layer.startHeight],
|
|
199
|
+
stackable: itemStackable,
|
|
200
|
+
stackedOnTopCount: 0,
|
|
201
|
+
});
|
|
202
|
+
// Increment stack count for items in the layer below
|
|
203
|
+
if (layer.index > 0) {
|
|
204
|
+
incrementStackCount(layers[layer.index - 1]);
|
|
205
|
+
}
|
|
206
|
+
recalculateLayerHeights(layers);
|
|
207
|
+
updateWasteArea(initialMetrics, layers);
|
|
208
|
+
packedItemsCount++;
|
|
209
|
+
break;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
if (placed) {
|
|
213
|
+
break;
|
|
214
|
+
}
|
|
215
|
+
const totalUsedHeight = layers.reduce((acc, layer) => acc + layer.height, 0);
|
|
216
|
+
if (totalUsedHeight + orientation.height > box.height_cm + 1e-6) {
|
|
217
|
+
continue;
|
|
218
|
+
}
|
|
219
|
+
if (item.attributes?.noStack && layers.length > 0) {
|
|
220
|
+
continue;
|
|
221
|
+
}
|
|
222
|
+
// Check if we can create a new layer on top of the existing ones
|
|
223
|
+
if (layers.length > 0 && !canStackOnLayer(layers[layers.length - 1])) {
|
|
224
|
+
continue;
|
|
225
|
+
}
|
|
226
|
+
const newLayer = {
|
|
227
|
+
index: layers.length,
|
|
228
|
+
startHeight: totalUsedHeight,
|
|
229
|
+
height: orientation.height,
|
|
230
|
+
spaces: [
|
|
231
|
+
{
|
|
232
|
+
x: 0,
|
|
233
|
+
y: 0,
|
|
234
|
+
width: box.width_cm,
|
|
235
|
+
length: box.length_cm,
|
|
236
|
+
},
|
|
237
|
+
],
|
|
238
|
+
placements: [],
|
|
239
|
+
hasNoStack: Boolean(item.attributes?.noStack),
|
|
240
|
+
};
|
|
241
|
+
const placement = placeInLayer(newLayer, orientation);
|
|
242
|
+
if (!placement) {
|
|
243
|
+
continue;
|
|
244
|
+
}
|
|
245
|
+
newLayer.placements.push({
|
|
246
|
+
sku: item.sku,
|
|
247
|
+
orientation,
|
|
248
|
+
position: [placement.x, placement.y, newLayer.startHeight],
|
|
249
|
+
stackable: itemStackable,
|
|
250
|
+
stackedOnTopCount: 0,
|
|
251
|
+
});
|
|
252
|
+
// Increment stack count for items in the layer below
|
|
253
|
+
if (layers.length > 0) {
|
|
254
|
+
incrementStackCount(layers[layers.length - 1]);
|
|
255
|
+
}
|
|
256
|
+
layers.push(newLayer);
|
|
257
|
+
recalculateLayerHeights(layers);
|
|
258
|
+
updateWasteArea(initialMetrics, layers);
|
|
259
|
+
packedItemsCount++;
|
|
260
|
+
placed = true;
|
|
261
|
+
break;
|
|
262
|
+
}
|
|
263
|
+
if (!placed) {
|
|
264
|
+
unpackedItemsCount++;
|
|
265
|
+
// If partial packing is allowed and we've packed some items, continue
|
|
266
|
+
if (allowPartial && packedItemsCount > 0) {
|
|
267
|
+
continue;
|
|
268
|
+
}
|
|
269
|
+
// Otherwise, return no_fit
|
|
270
|
+
return {
|
|
271
|
+
status: "no_fit",
|
|
272
|
+
slackScore: calculateSlackScore(box, items),
|
|
273
|
+
evaluation: {
|
|
274
|
+
box,
|
|
275
|
+
metrics: initialMetrics,
|
|
276
|
+
},
|
|
277
|
+
};
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
initialMetrics.layers = layers.length;
|
|
281
|
+
initialMetrics.usedHeight = layers.reduce((acc, layer) => acc + layer.height, 0);
|
|
282
|
+
initialMetrics.headroom = Number(Math.max(box.height_cm - initialMetrics.usedHeight, 0).toFixed(2));
|
|
283
|
+
initialMetrics.placements = layers.flatMap((layer, layerIdx) => layer.placements.map((placement) => ({
|
|
284
|
+
sku: placement.sku,
|
|
285
|
+
orientation: [
|
|
286
|
+
Number(placement.orientation.width.toFixed(2)),
|
|
287
|
+
Number(placement.orientation.length.toFixed(2)),
|
|
288
|
+
Number(placement.orientation.height.toFixed(2)),
|
|
289
|
+
],
|
|
290
|
+
position: placement.position,
|
|
291
|
+
layerIndex: layerIdx,
|
|
292
|
+
})));
|
|
293
|
+
initialMetrics.wasteAreaSum = layers.reduce((acc, layer) => acc +
|
|
294
|
+
layer.spaces.reduce((spaceAcc, space) => {
|
|
295
|
+
return spaceAcc + space.width * space.length;
|
|
296
|
+
}, 0), 0);
|
|
297
|
+
// Check if we have unpacked items
|
|
298
|
+
if (unpackedItemsCount > 0 && allowPartial) {
|
|
299
|
+
return {
|
|
300
|
+
status: "partial",
|
|
301
|
+
evaluation: {
|
|
302
|
+
box,
|
|
303
|
+
metrics: initialMetrics,
|
|
304
|
+
},
|
|
305
|
+
unpackedCount: unpackedItemsCount,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
return {
|
|
309
|
+
status: "success",
|
|
310
|
+
evaluation: {
|
|
311
|
+
box,
|
|
312
|
+
metrics: initialMetrics,
|
|
313
|
+
},
|
|
314
|
+
};
|
|
315
|
+
}
|
|
316
|
+
function expandItems(items) {
|
|
317
|
+
const expanded = [];
|
|
318
|
+
for (const item of items) {
|
|
319
|
+
const qty = Math.max(0, Math.floor(item.quantity));
|
|
320
|
+
if (!qty) {
|
|
321
|
+
continue;
|
|
322
|
+
}
|
|
323
|
+
const paddedWidth = item.width + PADDING_TOTAL;
|
|
324
|
+
const paddedLength = item.length + PADDING_TOTAL;
|
|
325
|
+
const paddedHeight = item.height + PADDING_TOTAL;
|
|
326
|
+
const volume = paddedWidth * paddedLength * paddedHeight;
|
|
327
|
+
for (let i = 0; i < qty; i++) {
|
|
328
|
+
expanded.push({
|
|
329
|
+
sku: item.sku,
|
|
330
|
+
baseWidth: item.width,
|
|
331
|
+
baseLength: item.length,
|
|
332
|
+
baseHeight: item.height,
|
|
333
|
+
width: paddedWidth,
|
|
334
|
+
length: paddedLength,
|
|
335
|
+
height: paddedHeight,
|
|
336
|
+
weight: item.weight,
|
|
337
|
+
volume,
|
|
338
|
+
attributes: item.attributes,
|
|
339
|
+
});
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
return expanded;
|
|
343
|
+
}
|
|
344
|
+
function getOrientations(item, noStack) {
|
|
345
|
+
const orientations = [];
|
|
346
|
+
const dims = [item.width, item.length, item.height];
|
|
347
|
+
const permutations = [
|
|
348
|
+
[dims[0], dims[1], dims[2]],
|
|
349
|
+
[dims[0], dims[2], dims[1]],
|
|
350
|
+
[dims[1], dims[0], dims[2]],
|
|
351
|
+
[dims[1], dims[2], dims[0]],
|
|
352
|
+
[dims[2], dims[0], dims[1]],
|
|
353
|
+
[dims[2], dims[1], dims[0]],
|
|
354
|
+
];
|
|
355
|
+
for (const [w, l, h] of permutations) {
|
|
356
|
+
if (noStack && h > Math.min(w, l)) {
|
|
357
|
+
continue;
|
|
358
|
+
}
|
|
359
|
+
orientations.push({
|
|
360
|
+
width: Number(w.toFixed(2)),
|
|
361
|
+
length: Number(l.toFixed(2)),
|
|
362
|
+
height: Number(h.toFixed(2)),
|
|
363
|
+
volume: Number((w * l * h).toFixed(2)),
|
|
364
|
+
});
|
|
365
|
+
}
|
|
366
|
+
return orientations.sort((a, b) => a.height - b.height || a.volume - b.volume);
|
|
367
|
+
}
|
|
368
|
+
function getStackableValue(attributes) {
|
|
369
|
+
// If noStack is true, return 0 (no stacking allowed)
|
|
370
|
+
if (attributes?.noStack) {
|
|
371
|
+
return 0;
|
|
372
|
+
}
|
|
373
|
+
// If stackable attribute exists, use it
|
|
374
|
+
if (attributes?.stackable !== undefined) {
|
|
375
|
+
return attributes.stackable;
|
|
376
|
+
}
|
|
377
|
+
// Default: undefined means unlimited stacking
|
|
378
|
+
return undefined;
|
|
379
|
+
}
|
|
380
|
+
function canStackOnLayer(layer) {
|
|
381
|
+
// Check if any item in this layer has reached its stacking limit
|
|
382
|
+
for (const placement of layer.placements) {
|
|
383
|
+
const stackable = placement.stackable;
|
|
384
|
+
// If stackable is 0 or undefined with noStack, no items can be placed on top
|
|
385
|
+
if (stackable === 0) {
|
|
386
|
+
return false;
|
|
387
|
+
}
|
|
388
|
+
// If stackable is -1, unlimited stacking is allowed
|
|
389
|
+
if (stackable === -1 || stackable === undefined) {
|
|
390
|
+
continue;
|
|
391
|
+
}
|
|
392
|
+
// If stackable is a positive number, check if limit is reached
|
|
393
|
+
if (stackable > 0 && placement.stackedOnTopCount >= stackable) {
|
|
394
|
+
return false;
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
return true;
|
|
398
|
+
}
|
|
399
|
+
function incrementStackCount(layer) {
|
|
400
|
+
// Increment stack count for all items in this layer
|
|
401
|
+
for (const placement of layer.placements) {
|
|
402
|
+
placement.stackedOnTopCount++;
|
|
403
|
+
}
|
|
404
|
+
}
|
|
405
|
+
function placeInLayer(layer, orientation) {
|
|
406
|
+
for (let i = 0; i < layer.spaces.length; i++) {
|
|
407
|
+
const space = layer.spaces[i];
|
|
408
|
+
if (orientation.width <= space.width + 1e-6 &&
|
|
409
|
+
orientation.length <= space.length + 1e-6) {
|
|
410
|
+
layer.spaces.splice(i, 1);
|
|
411
|
+
splitSpace(layer, space, orientation);
|
|
412
|
+
return {
|
|
413
|
+
x: space.x,
|
|
414
|
+
y: space.y,
|
|
415
|
+
width: orientation.width,
|
|
416
|
+
length: orientation.length,
|
|
417
|
+
};
|
|
418
|
+
}
|
|
419
|
+
}
|
|
420
|
+
return null;
|
|
421
|
+
}
|
|
422
|
+
function splitSpace(layer, space, orientation) {
|
|
423
|
+
const remainingWidth = Number(Math.max(space.width - orientation.width, 0).toFixed(2));
|
|
424
|
+
const remainingLength = Number(Math.max(space.length - orientation.length, 0).toFixed(2));
|
|
425
|
+
if (remainingWidth > 0) {
|
|
426
|
+
layer.spaces.push({
|
|
427
|
+
x: Number((space.x + orientation.width).toFixed(2)),
|
|
428
|
+
y: space.y,
|
|
429
|
+
width: remainingWidth,
|
|
430
|
+
length: orientation.length,
|
|
431
|
+
});
|
|
432
|
+
}
|
|
433
|
+
if (remainingLength > 0) {
|
|
434
|
+
layer.spaces.push({
|
|
435
|
+
x: space.x,
|
|
436
|
+
y: Number((space.y + orientation.length).toFixed(2)),
|
|
437
|
+
width: space.width,
|
|
438
|
+
length: remainingLength,
|
|
439
|
+
});
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
function recalculateLayerHeights(layers) {
|
|
443
|
+
let cursor = 0;
|
|
444
|
+
for (const layer of layers) {
|
|
445
|
+
layer.startHeight = Number(cursor.toFixed(2));
|
|
446
|
+
cursor += layer.height;
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
function updateWasteArea(metrics, layers) {
|
|
450
|
+
metrics.wasteAreaSum = layers.reduce((acc, layer) => {
|
|
451
|
+
return (acc +
|
|
452
|
+
layer.spaces.reduce((spaceAcc, space) => {
|
|
453
|
+
return spaceAcc + space.width * space.length;
|
|
454
|
+
}, 0));
|
|
455
|
+
}, 0);
|
|
456
|
+
}
|
|
457
|
+
function calculateSlackScore(box, items) {
|
|
458
|
+
const totalVolume = items.reduce((acc, item) => acc + item.volume, 0);
|
|
459
|
+
const boxVolume = box.width_cm * box.length_cm * box.height_cm;
|
|
460
|
+
const volumeSlack = boxVolume - totalVolume;
|
|
461
|
+
const maxWidth = Math.max(...items.map((item) => item.width));
|
|
462
|
+
const maxLength = Math.max(...items.map((item) => item.length));
|
|
463
|
+
const totalHeight = items.reduce((acc, item) => acc + item.height, 0);
|
|
464
|
+
const widthSlack = box.width_cm - maxWidth;
|
|
465
|
+
const lengthSlack = box.length_cm - maxLength;
|
|
466
|
+
const heightSlack = box.height_cm - totalHeight;
|
|
467
|
+
return ((volumeSlack > 0 ? volumeSlack : Number.MAX_SAFE_INTEGER) +
|
|
468
|
+
(widthSlack > 0 ? widthSlack : Number.MAX_SAFE_INTEGER / 2) +
|
|
469
|
+
(lengthSlack > 0 ? lengthSlack : Number.MAX_SAFE_INTEGER / 2) +
|
|
470
|
+
(heightSlack > 0 ? heightSlack : Number.MAX_SAFE_INTEGER / 2));
|
|
471
|
+
}
|
|
472
|
+
function comparePacking(a, b) {
|
|
473
|
+
if (a.metrics.usedHeight !== b.metrics.usedHeight) {
|
|
474
|
+
return a.metrics.usedHeight - b.metrics.usedHeight;
|
|
475
|
+
}
|
|
476
|
+
if (a.metrics.wasteAreaSum !== b.metrics.wasteAreaSum) {
|
|
477
|
+
return a.metrics.wasteAreaSum - b.metrics.wasteAreaSum;
|
|
478
|
+
}
|
|
479
|
+
if (a.metrics.voidVolume !== b.metrics.voidVolume) {
|
|
480
|
+
return a.metrics.voidVolume - b.metrics.voidVolume;
|
|
481
|
+
}
|
|
482
|
+
return a.box.price_thb - b.box.price_thb;
|
|
483
|
+
}
|
|
484
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../src/common/utils/packing.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
|
+
};
|
|
19
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
+
exports.assignPackingSlipToOrderWorkflow = exports.ParcelFulfillmentProvider = exports.DocumentsModule = exports.PARCEL_SHIPPING_MODULE = exports.ParcelShippingModule = void 0;
|
|
21
|
+
// Export unified types (new)
|
|
22
|
+
__exportStar(require("./types"), exports);
|
|
23
|
+
// Export models
|
|
24
|
+
__exportStar(require("./modules/parcel-shipping/models"), exports);
|
|
25
|
+
// Export modules
|
|
26
|
+
var parcel_shipping_1 = require("./modules/parcel-shipping");
|
|
27
|
+
Object.defineProperty(exports, "ParcelShippingModule", { enumerable: true, get: function () { return __importDefault(parcel_shipping_1).default; } });
|
|
28
|
+
var parcel_shipping_2 = require("./modules/parcel-shipping");
|
|
29
|
+
Object.defineProperty(exports, "PARCEL_SHIPPING_MODULE", { enumerable: true, get: function () { return parcel_shipping_2.PARCEL_SHIPPING_MODULE; } });
|
|
30
|
+
var documents_1 = require("./modules/documents");
|
|
31
|
+
Object.defineProperty(exports, "DocumentsModule", { enumerable: true, get: function () { return __importDefault(documents_1).default; } });
|
|
32
|
+
// Export provider
|
|
33
|
+
var index_1 = require("./providers/index");
|
|
34
|
+
Object.defineProperty(exports, "ParcelFulfillmentProvider", { enumerable: true, get: function () { return __importDefault(index_1).default; } });
|
|
35
|
+
// Export workflows
|
|
36
|
+
var assign_packing_slip_1 = require("./workflows/assign-packing-slip");
|
|
37
|
+
Object.defineProperty(exports, "assignPackingSlipToOrderWorkflow", { enumerable: true, get: function () { return __importDefault(assign_packing_slip_1).default; } });
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw2QkFBNkI7QUFDN0IsMENBQXdCO0FBRXhCLGdCQUFnQjtBQUNoQixtRUFBaUQ7QUFFakQsaUJBQWlCO0FBQ2pCLDZEQUE0RTtBQUFuRSx3SUFBQSxPQUFPLE9BQXdCO0FBQ3hDLDZEQUFtRTtBQUExRCx5SEFBQSxzQkFBc0IsT0FBQTtBQUMvQixpREFBaUU7QUFBeEQsNkhBQUEsT0FBTyxPQUFtQjtBQUVuQyxrQkFBa0I7QUFDbEIsMkNBQXlFO0FBQWhFLG1JQUFBLE9BQU8sT0FBNkI7QUFFN0MsbUJBQW1CO0FBQ25CLHVFQUE4RjtBQUFyRix3SkFBQSxPQUFPLE9BQW9DIn0=
|
|
@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.packingSlipOrderLink = void 0;
|
|
7
7
|
var packing_slip_order_1 = require("./packing-slip-order");
|
|
8
8
|
Object.defineProperty(exports, "packingSlipOrderLink", { enumerable: true, get: function () { return __importDefault(packing_slip_order_1).default; } });
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbGlua3MvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsMkRBQXNFO0FBQTdELDJJQUFBLE9BQU8sT0FBd0IifQ==
|
|
@@ -10,4 +10,4 @@ exports.default = (0, utils_1.defineLink)(order_1.default.linkable.order, {
|
|
|
10
10
|
linkable: documents_1.default.linkable.documentPackingSlip,
|
|
11
11
|
deleteCascade: true
|
|
12
12
|
});
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFja2luZy1zbGlwLW9yZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2xpbmtzL3BhY2tpbmctc2xpcC1vcmRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHFFQUFrRDtBQUNsRCxtRUFBZ0Q7QUFDaEQscURBQXNEO0FBRXRELGtCQUFlLElBQUEsa0JBQVUsRUFDdkIsZUFBVyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQzFCO0lBQ0UsUUFBUSxFQUFFLG1CQUFlLENBQUMsUUFBUSxDQUFDLG1CQUFtQjtJQUN0RCxhQUFhLEVBQUUsSUFBSTtDQUNwQixDQUNGLENBQUEifQ==
|
|
@@ -21,4 +21,4 @@ exports.DOCUMENTS_MODULE = "documentsModuleService";
|
|
|
21
21
|
exports.default = (0, utils_1.Module)(exports.DOCUMENTS_MODULE, {
|
|
22
22
|
service: service_1.default,
|
|
23
23
|
});
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9kb2N1bWVudHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7O0dBVUc7Ozs7OztBQUVILHdEQUE4QztBQUM5QyxxREFBa0Q7QUFFckMsUUFBQSxnQkFBZ0IsR0FBRyx3QkFBd0IsQ0FBQTtBQUV4RCxrQkFBZSxJQUFBLGNBQU0sRUFBQyx3QkFBZ0IsRUFBRTtJQUN0QyxPQUFPLEVBQUUsaUJBQXNCO0NBQ2hDLENBQUMsQ0FBQSJ9
|
|
@@ -17,4 +17,4 @@ const DocumentInvoice = utils_1.model.define("document_invoice", {
|
|
|
17
17
|
})
|
|
18
18
|
});
|
|
19
19
|
exports.default = DocumentInvoice;
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnQtaW52b2ljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL2RvY3VtZW50cy9tb2RlbHMvZG9jdW1lbnQtaW52b2ljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBOzs7O0dBSUc7QUFDSCxxREFBaUQ7QUFDakQsNEVBQWtEO0FBRWxELE1BQU0sZUFBZSxHQUFHLGFBQUssQ0FBQyxNQUFNLENBQUMsa0JBQWtCLEVBQUU7SUFDdkQsRUFBRSxFQUFFLGFBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLEVBQUU7SUFDM0IsUUFBUSxFQUFFLGFBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsMkJBQWdCLEVBQUU7UUFDaEQsUUFBUSxFQUFFLGlCQUFpQjtLQUM1QixDQUFDO0NBQ0gsQ0FBQyxDQUFBO0FBRUYsa0JBQWUsZUFBZSxDQUFBIn0=
|
package/.medusa/server/{modules → src/modules}/documents/models/document-packing-slip-settings.js
RENAMED
|
@@ -26,4 +26,4 @@ const DocumentPackingSlipSettings = utils_1.model.define("document_packing_slip_
|
|
|
26
26
|
})
|
|
27
27
|
});
|
|
28
28
|
exports.default = DocumentPackingSlipSettings;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnQtcGFja2luZy1zbGlwLXNldHRpbmdzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL21vZHVsZXMvZG9jdW1lbnRzL21vZGVscy9kb2N1bWVudC1wYWNraW5nLXNsaXAtc2V0dGluZ3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7O0dBVUc7Ozs7O0FBRUgscURBQWlEO0FBQ2pELG9GQUF5RDtBQUV6RCxNQUFNLDJCQUEyQixHQUFHLGFBQUssQ0FBQyxNQUFNLENBQUMsZ0NBQWdDLEVBQUU7SUFDakYsRUFBRSxFQUFFLGFBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLEVBQUU7SUFDM0IsWUFBWSxFQUFFLGFBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDdkMsWUFBWSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDckMsUUFBUSxFQUFFLGFBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxRQUFRLEVBQUU7SUFDakMsbUJBQW1CLEVBQUUsYUFBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQywrQkFBbUIsRUFBRTtRQUM1RCxRQUFRLEVBQUUscUJBQXFCO0tBQ2hDLENBQUM7Q0FDSCxDQUFDLENBQUE7QUFFRixrQkFBZSwyQkFBMkIsQ0FBQSJ9
|
|
@@ -29,4 +29,4 @@ const DocumentPackingSlip = utils_1.model.define("document_packing_slip", {
|
|
|
29
29
|
})
|
|
30
30
|
});
|
|
31
31
|
exports.default = DocumentPackingSlip;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnQtcGFja2luZy1zbGlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL21vZHVsZXMvZG9jdW1lbnRzL21vZGVscy9kb2N1bWVudC1wYWNraW5nLXNsaXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7O0dBVUc7Ozs7O0FBRUgscURBQWlEO0FBQ2pELHNHQUEwRTtBQUMxRSw0RUFBa0Q7QUFFbEQsTUFBTSxtQkFBbUIsR0FBRyxhQUFLLENBQUMsTUFBTSxDQUFDLHVCQUF1QixFQUFFO0lBQ2hFLEVBQUUsRUFBRSxhQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxFQUFFO0lBQzNCLE1BQU0sRUFBRSxhQUFLLENBQUMsTUFBTSxFQUFFO0lBQ3RCLGFBQWEsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFO0lBQzNCLG1CQUFtQixFQUFFLGFBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsd0NBQTJCLEVBQUU7UUFDdEUsUUFBUSxFQUFFLHFCQUFxQjtLQUNoQyxDQUFDO0lBQ0YsUUFBUSxFQUFFLGFBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsMkJBQWdCLEVBQUU7UUFDaEQsUUFBUSxFQUFFLHFCQUFxQjtLQUNoQyxDQUFDO0NBQ0gsQ0FBQyxDQUFBO0FBRUYsa0JBQWUsbUJBQW1CLENBQUEifQ==
|
|
@@ -29,4 +29,4 @@ const DocumentSettings = utils_1.model.define("document_settings", {
|
|
|
29
29
|
})
|
|
30
30
|
});
|
|
31
31
|
exports.default = DocumentSettings;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnQtc2V0dGluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9kb2N1bWVudHMvbW9kZWxzL2RvY3VtZW50LXNldHRpbmdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7OztHQVVHOzs7OztBQUVILHFEQUFpRDtBQUNqRCwwRUFBZ0Q7QUFDaEQsb0ZBQXlEO0FBRXpELE1BQU0sZ0JBQWdCLEdBQUcsYUFBSyxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRTtJQUN6RCxFQUFFLEVBQUUsYUFBSyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsRUFBRTtJQUMzQixZQUFZLEVBQUUsYUFBSyxDQUFDLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUNyQyxlQUFlLEVBQUUsYUFBSyxDQUFDLElBQUksRUFBRSxDQUFDLFFBQVEsRUFBRTtJQUN4QyxlQUFlLEVBQUUsYUFBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQywwQkFBZSxFQUFFO1FBQ3BELFFBQVEsRUFBRSxVQUFVO0tBQ3JCLENBQUM7SUFDRixtQkFBbUIsRUFBRSxhQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLCtCQUFtQixFQUFFO1FBQzVELFFBQVEsRUFBRSxVQUFVO0tBQ3JCLENBQUM7Q0FDSCxDQUFDLENBQUE7QUFFRixrQkFBZSxnQkFBZ0IsQ0FBQSJ9
|