server-core-module 1.0.10 → 1.0.12
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/dist/models/order.model.js +7 -3
- package/main +0 -0
- package/package.json +1 -1
- package/src/models/order.model.ts +7 -3
|
@@ -17,16 +17,18 @@ exports.schemaOrder = joi_1.default.object({
|
|
|
17
17
|
price: joi_1.default.number().min(0).required(),
|
|
18
18
|
quantity: joi_1.default.number().min(1).required(),
|
|
19
19
|
note: joi_1.default.string().optional().allow(''),
|
|
20
|
-
wrapper: joi_1.default.string().optional().allow(''),
|
|
20
|
+
wrapper: joi_1.default.string().optional().allow('').allow(''),
|
|
21
21
|
ribbon: joi_1.default.string().optional().allow(''),
|
|
22
22
|
ribbonUrl: joi_1.default.string().optional().allow(''),
|
|
23
|
+
imageUrl: joi_1.default.string().optional().allow(''),
|
|
23
24
|
})).required(),
|
|
24
25
|
totalAmount: joi_1.default.number().min(0).required(),
|
|
25
|
-
note: joi_1.default.string().optional(),
|
|
26
|
+
note: joi_1.default.string().optional().allow(''),
|
|
26
27
|
deliveryDate: joi_1.default.date().optional(),
|
|
27
28
|
status: joi_1.default.string().default("pending"),
|
|
28
29
|
location: joi_1.default.string().optional(),
|
|
29
30
|
deliveryFee: joi_1.default.number().min(0).optional(),
|
|
31
|
+
paymentMethod: joi_1.default.string().optional().allow(''),
|
|
30
32
|
});
|
|
31
33
|
exports.schemaOrderUpdate = joi_1.default.object({
|
|
32
34
|
name: joi_1.default.string(),
|
|
@@ -38,10 +40,11 @@ exports.schemaOrderUpdate = joi_1.default.object({
|
|
|
38
40
|
name: joi_1.default.string().required(),
|
|
39
41
|
price: joi_1.default.number().min(0).required(),
|
|
40
42
|
quantity: joi_1.default.number().min(1).required(),
|
|
41
|
-
note: joi_1.default.string().optional().allow(''),
|
|
43
|
+
note: joi_1.default.string().optional().allow('').allow(''),
|
|
42
44
|
wrapper: joi_1.default.string().optional().allow(''),
|
|
43
45
|
ribbon: joi_1.default.string().optional().allow(''),
|
|
44
46
|
ribbonUrl: joi_1.default.string().optional().allow(''),
|
|
47
|
+
imageUrl: joi_1.default.string().optional().allow(''),
|
|
45
48
|
})),
|
|
46
49
|
totalAmount: joi_1.default.number().min(0),
|
|
47
50
|
note: joi_1.default.string(),
|
|
@@ -49,6 +52,7 @@ exports.schemaOrderUpdate = joi_1.default.object({
|
|
|
49
52
|
status: joi_1.default.string(),
|
|
50
53
|
location: joi_1.default.string(),
|
|
51
54
|
deliveryFee: joi_1.default.number().min(0),
|
|
55
|
+
paymentMethod: joi_1.default.string().optional().allow(''),
|
|
52
56
|
});
|
|
53
57
|
function modelOrder(value) {
|
|
54
58
|
return {
|
package/main
ADDED
|
File without changes
|
package/package.json
CHANGED
|
@@ -38,16 +38,18 @@ export const schemaOrder = Joi.object({
|
|
|
38
38
|
price: Joi.number().min(0).required(),
|
|
39
39
|
quantity: Joi.number().min(1).required(),
|
|
40
40
|
note: Joi.string().optional().allow(''),
|
|
41
|
-
wrapper: Joi.string().optional().allow(''),
|
|
41
|
+
wrapper: Joi.string().optional().allow('').allow(''),
|
|
42
42
|
ribbon: Joi.string().optional().allow(''),
|
|
43
43
|
ribbonUrl: Joi.string().optional().allow(''),
|
|
44
|
+
imageUrl: Joi.string().optional().allow(''),
|
|
44
45
|
})).required(),
|
|
45
46
|
totalAmount: Joi.number().min(0).required(),
|
|
46
|
-
note: Joi.string().optional(),
|
|
47
|
+
note: Joi.string().optional().allow(''),
|
|
47
48
|
deliveryDate: Joi.date().optional(),
|
|
48
49
|
status: Joi.string().default("pending"),
|
|
49
50
|
location: Joi.string().optional(),
|
|
50
51
|
deliveryFee: Joi.number().min(0).optional(),
|
|
52
|
+
paymentMethod: Joi.string().optional().allow(''),
|
|
51
53
|
});
|
|
52
54
|
|
|
53
55
|
|
|
@@ -61,10 +63,11 @@ export const schemaOrderUpdate = Joi.object({
|
|
|
61
63
|
name: Joi.string().required(),
|
|
62
64
|
price: Joi.number().min(0).required(),
|
|
63
65
|
quantity: Joi.number().min(1).required(),
|
|
64
|
-
note: Joi.string().optional().allow(''),
|
|
66
|
+
note: Joi.string().optional().allow('').allow(''),
|
|
65
67
|
wrapper: Joi.string().optional().allow(''),
|
|
66
68
|
ribbon: Joi.string().optional().allow(''),
|
|
67
69
|
ribbonUrl: Joi.string().optional().allow(''),
|
|
70
|
+
imageUrl: Joi.string().optional().allow(''),
|
|
68
71
|
})),
|
|
69
72
|
totalAmount: Joi.number().min(0),
|
|
70
73
|
note: Joi.string(),
|
|
@@ -72,6 +75,7 @@ export const schemaOrderUpdate = Joi.object({
|
|
|
72
75
|
status: Joi.string(),
|
|
73
76
|
location: Joi.string(),
|
|
74
77
|
deliveryFee: Joi.number().min(0),
|
|
78
|
+
paymentMethod: Joi.string().optional().allow(''),
|
|
75
79
|
});
|
|
76
80
|
|
|
77
81
|
export function modelOrder(value: TOrder): TOrder {
|