@lodashventure/medusa-parcel-shipping 0.2.8 → 0.2.13
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/api/admin/documents/packing-slip/preview/route.js +7 -7
- package/.medusa/server/api/admin/documents/packing-slip/route.js +20 -27
- package/.medusa/server/modules/documents/service.js +42 -35
- package/.medusa/server/src/admin/index.js +443 -58
- package/.medusa/server/src/admin/index.mjs +444 -61
- package/package.json +5 -4
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.GET = void 0;
|
|
15
|
-
const utils_1 = require("@medusajs/utils");
|
|
15
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
16
16
|
const documents_1 = require("../../../../../modules/documents");
|
|
17
17
|
const utils_2 = require("@medusajs/framework/utils");
|
|
18
18
|
const GET = async (req, res) => {
|
|
@@ -20,11 +20,11 @@ const GET = async (req, res) => {
|
|
|
20
20
|
const orderModuleService = req.scope.resolve(utils_2.Modules.ORDER);
|
|
21
21
|
const lastOrders = await orderModuleService.listOrders({}, {
|
|
22
22
|
order: {
|
|
23
|
-
created_at: "DESC"
|
|
23
|
+
created_at: "DESC",
|
|
24
24
|
},
|
|
25
25
|
take: 1,
|
|
26
|
-
select: [
|
|
27
|
-
relations: [
|
|
26
|
+
select: ["*", "item_total", "shipping_total", "tax_total"],
|
|
27
|
+
relations: ["shipping_address", "billing_address", "items"],
|
|
28
28
|
});
|
|
29
29
|
try {
|
|
30
30
|
if (lastOrders && lastOrders.length) {
|
|
@@ -34,14 +34,14 @@ const GET = async (req, res) => {
|
|
|
34
34
|
res.status(201).json(result);
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA,
|
|
37
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "You need to have at least one order to see preview");
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (e) {
|
|
41
41
|
res.status(400).json({
|
|
42
|
-
message: e.message
|
|
42
|
+
message: e.message,
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
};
|
|
46
46
|
exports.GET = GET;
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9wYWNraW5nLXNsaXAvcHJldmlldy9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7R0FVRzs7O0FBR0gscURBQXdEO0FBR3hELGdFQUFvRTtBQUVwRSxxREFBb0Q7QUFFN0MsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ25FLE1BQU0sc0JBQXNCLEdBQzFCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLDRCQUFnQixDQUFDLENBQUM7SUFFdEMsTUFBTSxrQkFBa0IsR0FBd0IsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQy9ELGVBQU8sQ0FBQyxLQUFLLENBQ2QsQ0FBQztJQUVGLE1BQU0sVUFBVSxHQUFlLE1BQU0sa0JBQWtCLENBQUMsVUFBVSxDQUNoRSxFQUFFLEVBQ0Y7UUFDRSxLQUFLLEVBQUU7WUFDTCxVQUFVLEVBQUUsTUFBTTtTQUNuQjtRQUNELElBQUksRUFBRSxDQUFDO1FBQ1AsTUFBTSxFQUFFLENBQUMsR0FBRyxFQUFFLFlBQVksRUFBRSxnQkFBZ0IsRUFBRSxXQUFXLENBQUM7UUFDMUQsU0FBUyxFQUFFLENBQUMsa0JBQWtCLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxDQUFDO0tBQzVELENBQ0YsQ0FBQztJQUNGLElBQUksQ0FBQztRQUNILElBQUksVUFBVSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNwQyxNQUFNLFVBQVUsR0FBRyxHQUFxQixDQUFDO1lBQ3pDLE1BQU0sWUFBWSxHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDO1lBQy9DLE1BQU0sTUFBTSxHQUFHLE1BQU0sc0JBQXNCLENBQUMsdUJBQXVCLENBQ2pFLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFDYixZQUF1QyxDQUN4QyxDQUFDO1lBQ0YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDL0IsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLElBQUksbUJBQVcsQ0FDbkIsbUJBQVcsQ0FBQyxLQUFLLENBQUMsWUFBWSxFQUM5QixvREFBb0QsQ0FDckQsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNYLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ25CLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTztTQUNuQixDQUFDLENBQUM7SUFDTCxDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBdkNXLFFBQUEsR0FBRyxPQXVDZCJ9
|
|
@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.GET = exports.POST = void 0;
|
|
18
|
-
const utils_1 = require("@medusajs/utils");
|
|
18
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
19
19
|
const documents_1 = require("../../../../modules/documents");
|
|
20
20
|
const utils_2 = require("@medusajs/framework/utils");
|
|
21
21
|
const utils_3 = require("@medusajs/framework/utils");
|
|
@@ -26,8 +26,8 @@ const POST = async (req, res) => {
|
|
|
26
26
|
try {
|
|
27
27
|
const body = req.body;
|
|
28
28
|
const order = await orderModuleService.retrieveOrder(body.order_id, {
|
|
29
|
-
select: [
|
|
30
|
-
relations: [
|
|
29
|
+
select: ["*", "item_total", "shipping_total", "tax_total"],
|
|
30
|
+
relations: ["shipping_address", "billing_address", "items"],
|
|
31
31
|
});
|
|
32
32
|
if (order) {
|
|
33
33
|
const result = await documentsModuleService.generatePackingSlipForOrder(order);
|
|
@@ -36,35 +36,32 @@ const POST = async (req, res) => {
|
|
|
36
36
|
const { data: [orderWithPackingSlip], } = await query.graph({
|
|
37
37
|
entity: "order",
|
|
38
38
|
filters: {
|
|
39
|
-
id: [
|
|
40
|
-
order.id
|
|
41
|
-
]
|
|
39
|
+
id: [order.id],
|
|
42
40
|
},
|
|
43
|
-
fields: [
|
|
44
|
-
"document_packing_slip.*",
|
|
45
|
-
],
|
|
41
|
+
fields: ["document_packing_slip.*"],
|
|
46
42
|
});
|
|
47
|
-
await (0, assign_packing_slip_1.default)(req.scope)
|
|
48
|
-
.run({
|
|
43
|
+
await (0, assign_packing_slip_1.default)(req.scope).run({
|
|
49
44
|
input: {
|
|
50
45
|
orderId: order.id,
|
|
51
46
|
newPackingSlipId: result.packingSlip.id,
|
|
52
|
-
oldPackingSlipId: orderWithPackingSlip.document_packing_slip
|
|
53
|
-
|
|
47
|
+
oldPackingSlipId: orderWithPackingSlip.document_packing_slip
|
|
48
|
+
? orderWithPackingSlip.document_packing_slip.id
|
|
49
|
+
: undefined,
|
|
50
|
+
},
|
|
54
51
|
});
|
|
55
52
|
res.status(201).json(result);
|
|
56
53
|
}
|
|
57
54
|
else {
|
|
58
|
-
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA,
|
|
55
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Packing slip not generated");
|
|
59
56
|
}
|
|
60
57
|
}
|
|
61
58
|
else {
|
|
62
|
-
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA,
|
|
59
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Invalid order id");
|
|
63
60
|
}
|
|
64
61
|
}
|
|
65
62
|
catch (e) {
|
|
66
63
|
res.status(400).json({
|
|
67
|
-
message: e.message
|
|
64
|
+
message: e.message,
|
|
68
65
|
});
|
|
69
66
|
}
|
|
70
67
|
};
|
|
@@ -78,35 +75,31 @@ const GET = async (req, res) => {
|
|
|
78
75
|
const { data: [orderWithPackingSlip], } = await query.graph({
|
|
79
76
|
entity: "order",
|
|
80
77
|
filters: {
|
|
81
|
-
id: [
|
|
82
|
-
orderId
|
|
83
|
-
]
|
|
78
|
+
id: [orderId],
|
|
84
79
|
},
|
|
85
|
-
fields: [
|
|
86
|
-
"document_packing_slip.*",
|
|
87
|
-
],
|
|
80
|
+
fields: ["document_packing_slip.*"],
|
|
88
81
|
});
|
|
89
82
|
if (orderWithPackingSlip.document_packing_slip && orderId) {
|
|
90
83
|
const orderModuleService = req.scope.resolve(utils_2.Modules.ORDER);
|
|
91
84
|
const orderDto = await orderModuleService.retrieveOrder(orderId, {
|
|
92
|
-
select: [
|
|
93
|
-
relations: [
|
|
85
|
+
select: ["*", "item_total", "shipping_total", "tax_total"],
|
|
86
|
+
relations: ["shipping_address", "billing_address", "items"],
|
|
94
87
|
});
|
|
95
88
|
const result = await documentsModuleService.getPackingSlip(orderDto, orderWithPackingSlip.document_packing_slip.id, includeBuffer !== undefined);
|
|
96
89
|
res.status(200).json(result);
|
|
97
90
|
}
|
|
98
91
|
else {
|
|
99
92
|
const result = {
|
|
100
|
-
packingSlip: undefined
|
|
93
|
+
packingSlip: undefined,
|
|
101
94
|
};
|
|
102
95
|
res.status(200).json(result);
|
|
103
96
|
}
|
|
104
97
|
}
|
|
105
98
|
catch (e) {
|
|
106
99
|
res.status(400).json({
|
|
107
|
-
message: e.message
|
|
100
|
+
message: e.message,
|
|
108
101
|
});
|
|
109
102
|
}
|
|
110
103
|
};
|
|
111
104
|
exports.GET = GET;
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9wYWNraW5nLXNsaXAvcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7O0dBVUc7Ozs7OztBQUlILHFEQUF3RDtBQUV4RCw2REFBaUU7QUFDakUscURBQW9EO0FBQ3BELHFEQUFzRTtBQUN0RSxzR0FBMkY7QUFFcEYsTUFBTSxJQUFJLEdBQUcsS0FBSyxFQUFFLEdBQWtCLEVBQUUsR0FBbUIsRUFBRSxFQUFFO0lBQ3BFLE1BQU0sc0JBQXNCLEdBQzFCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLDRCQUFnQixDQUFDLENBQUM7SUFDdEMsTUFBTSxrQkFBa0IsR0FBd0IsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQy9ELGVBQU8sQ0FBQyxLQUFLLENBQ2QsQ0FBQztJQUVGLElBQUksQ0FBQztRQUNILE1BQU0sSUFBSSxHQUFRLEdBQUcsQ0FBQyxJQUFXLENBQUM7UUFDbEMsTUFBTSxLQUFLLEdBQWEsTUFBTSxrQkFBa0IsQ0FBQyxhQUFhLENBQzVELElBQUksQ0FBQyxRQUFRLEVBQ2I7WUFDRSxNQUFNLEVBQUUsQ0FBQyxHQUFHLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLFdBQVcsQ0FBQztZQUMxRCxTQUFTLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLENBQUM7U0FDNUQsQ0FDRixDQUFDO1FBQ0YsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLE1BQU0sTUFBTSxHQUNWLE1BQU0sc0JBQXNCLENBQUMsMkJBQTJCLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbEUsSUFBSSxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7Z0JBQ3ZCLE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGlDQUF5QixDQUFDLEtBQUssQ0FB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
|
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
const utils_1 = require("@medusajs/utils");
|
|
17
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
18
18
|
const utils_2 = require("@medusajs/framework/utils");
|
|
19
19
|
const document_packing_slip_1 = __importDefault(require("./models/document-packing-slip"));
|
|
20
20
|
const document_settings_1 = __importDefault(require("./models/document-settings"));
|
|
@@ -25,7 +25,7 @@ const packing_slip_generator_1 = require("./services/generators/packing-slip-gen
|
|
|
25
25
|
class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
26
26
|
DocumentPackingSlip: document_packing_slip_1.default,
|
|
27
27
|
DocumentSettings: document_settings_1.default,
|
|
28
|
-
DocumentPackingSlipSettings: document_packing_slip_settings_1.default
|
|
28
|
+
DocumentPackingSlipSettings: document_packing_slip_settings_1.default,
|
|
29
29
|
}) {
|
|
30
30
|
constructor({}, options) {
|
|
31
31
|
super(...arguments);
|
|
@@ -34,26 +34,26 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
34
34
|
async getNextPackingSlipNumber() {
|
|
35
35
|
const lastPackingSlip = await this.listDocumentPackingSlips({}, {
|
|
36
36
|
order: {
|
|
37
|
-
created_at: "DESC"
|
|
37
|
+
created_at: "DESC",
|
|
38
38
|
},
|
|
39
|
-
take: 1
|
|
39
|
+
take: 1,
|
|
40
40
|
});
|
|
41
41
|
if (lastPackingSlip && lastPackingSlip.length) {
|
|
42
42
|
return (lastPackingSlip[0].number + 1).toString();
|
|
43
43
|
}
|
|
44
|
-
return
|
|
44
|
+
return "1";
|
|
45
45
|
}
|
|
46
46
|
async getPackingSlip(order, packingSlipId, includeBuffer = false) {
|
|
47
47
|
if (includeBuffer) {
|
|
48
48
|
const packingSlip = await this.retrieveDocumentPackingSlip(packingSlipId, {
|
|
49
|
-
relations: [
|
|
49
|
+
relations: ["packingSlipSettings", "settings"],
|
|
50
50
|
});
|
|
51
51
|
if (packingSlip) {
|
|
52
52
|
const calculatedTemplateKind = this.calculatePackingSlipTemplateKind(packingSlip.packingSlipSettings);
|
|
53
53
|
const buffer = await (0, packing_slip_generator_1.generatePackingSlip)(calculatedTemplateKind, packingSlip.settings, packingSlip, order);
|
|
54
54
|
return {
|
|
55
55
|
packingSlip: packingSlip,
|
|
56
|
-
buffer: buffer
|
|
56
|
+
buffer: buffer,
|
|
57
57
|
};
|
|
58
58
|
}
|
|
59
59
|
}
|
|
@@ -61,16 +61,16 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
61
61
|
const packingSlip = await this.retrieveDocumentPackingSlip(packingSlipId);
|
|
62
62
|
return {
|
|
63
63
|
packingSlip: packingSlip,
|
|
64
|
-
buffer: undefined
|
|
64
|
+
buffer: undefined,
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
async generateTestPackingSlip(order, templateKind) {
|
|
69
69
|
const lastDocumentSettings = await this.listDocumentSettings({}, {
|
|
70
70
|
order: {
|
|
71
|
-
created_at: "DESC"
|
|
71
|
+
created_at: "DESC",
|
|
72
72
|
},
|
|
73
|
-
take: 1
|
|
73
|
+
take: 1,
|
|
74
74
|
});
|
|
75
75
|
if (lastDocumentSettings && lastDocumentSettings.length) {
|
|
76
76
|
const nextNumber = await this.getNextPackingSlipNumber();
|
|
@@ -79,12 +79,12 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
79
79
|
const testPackingSlip = {
|
|
80
80
|
number: parseInt(nextNumber),
|
|
81
81
|
displayNumber: nextNumber,
|
|
82
|
-
created_at: new Date(Date.now())
|
|
82
|
+
created_at: new Date(Date.now()),
|
|
83
83
|
};
|
|
84
84
|
const buffer = await (0, packing_slip_generator_1.generatePackingSlip)(templateKind, lastDocumentSettings[0], testPackingSlip, order);
|
|
85
85
|
return {
|
|
86
86
|
packingSlip: testPackingSlip,
|
|
87
|
-
buffer: buffer
|
|
87
|
+
buffer: buffer,
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
90
|
else {
|
|
@@ -101,18 +101,19 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
101
101
|
async generatePackingSlipForOrder(order) {
|
|
102
102
|
const lastDocumentSettings = await this.listDocumentSettings({}, {
|
|
103
103
|
order: {
|
|
104
|
-
created_at: "DESC"
|
|
104
|
+
created_at: "DESC",
|
|
105
105
|
},
|
|
106
|
-
take: 1
|
|
106
|
+
take: 1,
|
|
107
107
|
});
|
|
108
108
|
if (lastDocumentSettings && lastDocumentSettings.length) {
|
|
109
109
|
const lastDocumentPackingSlipSettings = await this.listDocumentPackingSlipSettings({}, {
|
|
110
110
|
order: {
|
|
111
|
-
created_at: "DESC"
|
|
111
|
+
created_at: "DESC",
|
|
112
112
|
},
|
|
113
|
-
take: 1
|
|
113
|
+
take: 1,
|
|
114
114
|
});
|
|
115
|
-
if (lastDocumentPackingSlipSettings &&
|
|
115
|
+
if (lastDocumentPackingSlipSettings &&
|
|
116
|
+
lastDocumentPackingSlipSettings.length) {
|
|
116
117
|
const packingSlipSettings = lastDocumentPackingSlipSettings[0];
|
|
117
118
|
const calculatedTemplateKind = this.calculatePackingSlipTemplateKind(lastDocumentPackingSlipSettings[0]);
|
|
118
119
|
const [validationPassed, info] = (0, packing_slip_generator_1.validateInputForProvidedKind)(calculatedTemplateKind, lastDocumentSettings[0]);
|
|
@@ -120,16 +121,18 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
120
121
|
const nextNumber = await this.getNextPackingSlipNumber();
|
|
121
122
|
const entryPackingSlip = {
|
|
122
123
|
number: parseInt(nextNumber),
|
|
123
|
-
displayNumber: packingSlipSettings.numberFormat
|
|
124
|
+
displayNumber: packingSlipSettings.numberFormat
|
|
125
|
+
? packingSlipSettings.numberFormat.replace(constants_1.PACKING_SLIP_NUMBER_PLACEHOLDER, nextNumber)
|
|
126
|
+
: nextNumber,
|
|
124
127
|
created_at: new Date(Date.now()),
|
|
125
128
|
packing_slip_settings_id: packingSlipSettings.id,
|
|
126
|
-
settings_id: lastDocumentSettings[0].id
|
|
129
|
+
settings_id: lastDocumentSettings[0].id,
|
|
127
130
|
};
|
|
128
131
|
const packingSlipResult = await this.createDocumentPackingSlips(entryPackingSlip);
|
|
129
132
|
const buffer = await (0, packing_slip_generator_1.generatePackingSlip)(calculatedTemplateKind, lastDocumentSettings[0], packingSlipResult, order);
|
|
130
133
|
return {
|
|
131
134
|
packingSlip: packingSlipResult,
|
|
132
|
-
buffer: buffer
|
|
135
|
+
buffer: buffer,
|
|
133
136
|
};
|
|
134
137
|
}
|
|
135
138
|
else {
|
|
@@ -137,32 +140,33 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
137
140
|
}
|
|
138
141
|
}
|
|
139
142
|
else {
|
|
140
|
-
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA,
|
|
143
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "No packing slip settings found");
|
|
141
144
|
}
|
|
142
145
|
}
|
|
143
146
|
else {
|
|
144
|
-
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA,
|
|
147
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "No document settings found");
|
|
145
148
|
}
|
|
146
149
|
}
|
|
147
150
|
async createOrUpdatePackingSlipSettingsWithTemplate(packingSlipTemplate) {
|
|
148
151
|
const lastDocumentPackingSlipSettings = await this.listDocumentPackingSlipSettings({}, {
|
|
149
152
|
order: {
|
|
150
|
-
created_at: "DESC"
|
|
153
|
+
created_at: "DESC",
|
|
151
154
|
},
|
|
152
|
-
take: 1
|
|
155
|
+
take: 1,
|
|
153
156
|
});
|
|
154
|
-
if (lastDocumentPackingSlipSettings &&
|
|
157
|
+
if (lastDocumentPackingSlipSettings &&
|
|
158
|
+
lastDocumentPackingSlipSettings.length) {
|
|
155
159
|
const newDocumentSettings = {
|
|
156
160
|
forcedNumber: lastDocumentPackingSlipSettings[0].forcedNumber,
|
|
157
161
|
numberFormat: lastDocumentPackingSlipSettings[0].numberFormat,
|
|
158
|
-
template: packingSlipTemplate
|
|
162
|
+
template: packingSlipTemplate,
|
|
159
163
|
};
|
|
160
164
|
const result = await this.createDocumentPackingSlipSettings(newDocumentSettings);
|
|
161
165
|
return result;
|
|
162
166
|
}
|
|
163
167
|
else {
|
|
164
168
|
const result = await this.createDocumentPackingSlipSettings({
|
|
165
|
-
template: packingSlipTemplate
|
|
169
|
+
template: packingSlipTemplate,
|
|
166
170
|
});
|
|
167
171
|
return result;
|
|
168
172
|
}
|
|
@@ -170,14 +174,17 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
170
174
|
async updatePackingSlipSettings(newFormatNumber, forcedNumber, template) {
|
|
171
175
|
const lastDocumentPackingSlipSettings = await this.listDocumentPackingSlipSettings({}, {
|
|
172
176
|
order: {
|
|
173
|
-
created_at: "DESC"
|
|
177
|
+
created_at: "DESC",
|
|
174
178
|
},
|
|
175
|
-
take: 1
|
|
179
|
+
take: 1,
|
|
176
180
|
});
|
|
177
|
-
if (lastDocumentPackingSlipSettings &&
|
|
181
|
+
if (lastDocumentPackingSlipSettings &&
|
|
182
|
+
lastDocumentPackingSlipSettings.length) {
|
|
178
183
|
const result = await this.createDocumentPackingSlipSettings({
|
|
179
184
|
numberFormat: newFormatNumber ?? lastDocumentPackingSlipSettings[0].numberFormat,
|
|
180
|
-
forcedNumber: forcedNumber
|
|
185
|
+
forcedNumber: forcedNumber
|
|
186
|
+
? parseInt(forcedNumber)
|
|
187
|
+
: lastDocumentPackingSlipSettings[0].forcedNumber,
|
|
181
188
|
template: template ?? lastDocumentPackingSlipSettings[0].template,
|
|
182
189
|
});
|
|
183
190
|
return result;
|
|
@@ -186,7 +193,7 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
186
193
|
const result = await this.createDocumentPackingSlipSettings({
|
|
187
194
|
numberFormat: newFormatNumber,
|
|
188
195
|
forcedNumber: forcedNumber ? parseInt(forcedNumber) : undefined,
|
|
189
|
-
template: template
|
|
196
|
+
template: template,
|
|
190
197
|
});
|
|
191
198
|
return result;
|
|
192
199
|
}
|
|
@@ -194,10 +201,10 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
194
201
|
async updateStoreDocumentAddress(address) {
|
|
195
202
|
const lastDocumentSettings = await this.listDocumentSettings({}, {
|
|
196
203
|
order: {
|
|
197
|
-
created_at: "DESC"
|
|
204
|
+
created_at: "DESC",
|
|
198
205
|
},
|
|
199
206
|
take: 1,
|
|
200
|
-
relations: ["documentPackingSlip"]
|
|
207
|
+
relations: ["documentPackingSlip"],
|
|
201
208
|
});
|
|
202
209
|
if (lastDocumentSettings && lastDocumentSettings.length) {
|
|
203
210
|
const result = await this.createDocumentSettings({
|
|
@@ -216,4 +223,4 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
216
223
|
}
|
|
217
224
|
}
|
|
218
225
|
exports.default = DocumentsModuleService;
|
|
219
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
226
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/modules/documents/service.ts"],"names":[],"mappings":"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"}
|