@things-factory/marketplace-base 4.3.204 → 4.3.207
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-server/entities/marketplace-order-item.js +36 -0
- package/dist-server/entities/marketplace-order-item.js.map +1 -1
- package/dist-server/entities/marketplace-order.js +12 -0
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/marketplace-order.js +3 -0
- package/dist-server/graphql/types/marketplace-order/marketplace-order.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js +9 -0
- package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js.map +1 -1
- package/package.json +2 -2
- package/server/entities/marketplace-order-item.ts +27 -0
- package/server/entities/marketplace-order.ts +10 -0
- package/server/graphql/types/marketplace-order/marketplace-order.ts +3 -0
- package/server/graphql/types/marketplace-order-item/marketplace-order-item.ts +9 -0
|
@@ -53,6 +53,10 @@ __decorate([
|
|
|
53
53
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
54
54
|
__metadata("design:type", String)
|
|
55
55
|
], MarketplaceOrderItem.prototype, "returnStatus", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
58
|
+
__metadata("design:type", String)
|
|
59
|
+
], MarketplaceOrderItem.prototype, "paidUnitPrice", void 0);
|
|
56
60
|
__decorate([
|
|
57
61
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
58
62
|
__metadata("design:type", String)
|
|
@@ -61,6 +65,14 @@ __decorate([
|
|
|
61
65
|
(0, typeorm_1.Column)({ type: 'float', nullable: true }),
|
|
62
66
|
__metadata("design:type", Number)
|
|
63
67
|
], MarketplaceOrderItem.prototype, "originalPrice", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, typeorm_1.Column)({ type: 'float', nullable: true }),
|
|
70
|
+
__metadata("design:type", Number)
|
|
71
|
+
], MarketplaceOrderItem.prototype, "originalUnitPrice", void 0);
|
|
72
|
+
__decorate([
|
|
73
|
+
(0, typeorm_1.Column)({ type: 'float', nullable: true }),
|
|
74
|
+
__metadata("design:type", String)
|
|
75
|
+
], MarketplaceOrderItem.prototype, "profit", void 0);
|
|
64
76
|
__decorate([
|
|
65
77
|
(0, typeorm_1.Column)({ type: 'float', nullable: true }),
|
|
66
78
|
__metadata("design:type", Number)
|
|
@@ -81,6 +93,30 @@ __decorate([
|
|
|
81
93
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
82
94
|
__metadata("design:type", String)
|
|
83
95
|
], MarketplaceOrderItem.prototype, "reason", void 0);
|
|
96
|
+
__decorate([
|
|
97
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
98
|
+
__metadata("design:type", String)
|
|
99
|
+
], MarketplaceOrderItem.prototype, "salesType", void 0);
|
|
100
|
+
__decorate([
|
|
101
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
102
|
+
__metadata("design:type", String)
|
|
103
|
+
], MarketplaceOrderItem.prototype, "remark1", void 0);
|
|
104
|
+
__decorate([
|
|
105
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
106
|
+
__metadata("design:type", String)
|
|
107
|
+
], MarketplaceOrderItem.prototype, "remark2", void 0);
|
|
108
|
+
__decorate([
|
|
109
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
110
|
+
__metadata("design:type", String)
|
|
111
|
+
], MarketplaceOrderItem.prototype, "remark3", void 0);
|
|
112
|
+
__decorate([
|
|
113
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
114
|
+
__metadata("design:type", String)
|
|
115
|
+
], MarketplaceOrderItem.prototype, "remark4", void 0);
|
|
116
|
+
__decorate([
|
|
117
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
118
|
+
__metadata("design:type", String)
|
|
119
|
+
], MarketplaceOrderItem.prototype, "remark5", void 0);
|
|
84
120
|
__decorate([
|
|
85
121
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
86
122
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAyG;AAQlG,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":"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"}
|
|
@@ -195,6 +195,18 @@ __decorate([
|
|
|
195
195
|
}),
|
|
196
196
|
__metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
|
|
197
197
|
], MarketplaceOrder.prototype, "updater", void 0);
|
|
198
|
+
__decorate([
|
|
199
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
200
|
+
__metadata("design:type", String)
|
|
201
|
+
], MarketplaceOrder.prototype, "eventStartDate", void 0);
|
|
202
|
+
__decorate([
|
|
203
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
204
|
+
__metadata("design:type", String)
|
|
205
|
+
], MarketplaceOrder.prototype, "eventEndDate", void 0);
|
|
206
|
+
__decorate([
|
|
207
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
208
|
+
__metadata("design:type", String)
|
|
209
|
+
], MarketplaceOrder.prototype, "eventName", void 0);
|
|
198
210
|
MarketplaceOrder = __decorate([
|
|
199
211
|
(0, typeorm_1.Entity)(),
|
|
200
212
|
(0, typeorm_1.Index)('ix_marketplace-order_0', (marketplaceOrder) => [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;AAY3C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyClC,CAAA"}
|
|
@@ -16,6 +16,7 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
|
|
|
16
16
|
orderType: String
|
|
17
17
|
cancelBy: String
|
|
18
18
|
returnStatus: String
|
|
19
|
+
paidUnitPrice: String
|
|
19
20
|
paidPrice: String
|
|
20
21
|
packageId: String
|
|
21
22
|
invoiceNo: String
|
|
@@ -25,8 +26,15 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
|
|
|
25
26
|
reason: String
|
|
26
27
|
status: String
|
|
27
28
|
description: String
|
|
29
|
+
originalUnitPrice: Float
|
|
28
30
|
originalPrice: Float
|
|
29
31
|
discount: Float
|
|
32
|
+
profit: String
|
|
33
|
+
remark1: String
|
|
34
|
+
remark2: String
|
|
35
|
+
remark3: String
|
|
36
|
+
remark4: String
|
|
37
|
+
remark5: String
|
|
30
38
|
promotionId: String
|
|
31
39
|
paymentFee: Float
|
|
32
40
|
platformFee: Float
|
|
@@ -34,6 +42,7 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
|
|
|
34
42
|
brand: String
|
|
35
43
|
transactionRateType: String
|
|
36
44
|
transactionRate: Float
|
|
45
|
+
ordersSalesTotal: Float
|
|
37
46
|
updater: User
|
|
38
47
|
creator: User
|
|
39
48
|
updatedAt: String
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CtC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.207",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,5 +28,5 @@
|
|
|
28
28
|
"@things-factory/product-base": "^4.3.204",
|
|
29
29
|
"@things-factory/shell": "^4.3.179"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "ed466df1affa16c0c06e6507bc3bc1b840e9d6b7"
|
|
32
32
|
}
|
|
@@ -51,12 +51,21 @@ export class MarketplaceOrderItem {
|
|
|
51
51
|
@Column({ nullable: true })
|
|
52
52
|
returnStatus: string
|
|
53
53
|
|
|
54
|
+
@Column({ nullable: true })
|
|
55
|
+
paidUnitPrice: string
|
|
56
|
+
|
|
54
57
|
@Column({ nullable: true })
|
|
55
58
|
paidPrice: string
|
|
56
59
|
|
|
57
60
|
@Column({ type: 'float', nullable: true })
|
|
58
61
|
originalPrice: number
|
|
59
62
|
|
|
63
|
+
@Column({ type: 'float', nullable: true })
|
|
64
|
+
originalUnitPrice: number
|
|
65
|
+
|
|
66
|
+
@Column({ type: 'float', nullable: true })
|
|
67
|
+
profit: string
|
|
68
|
+
|
|
60
69
|
@Column({ type: 'float', nullable: true })
|
|
61
70
|
discount: number
|
|
62
71
|
|
|
@@ -72,6 +81,24 @@ export class MarketplaceOrderItem {
|
|
|
72
81
|
@Column({ nullable: true })
|
|
73
82
|
reason: string
|
|
74
83
|
|
|
84
|
+
@Column({ nullable: true })
|
|
85
|
+
salesType: string
|
|
86
|
+
|
|
87
|
+
@Column({ nullable: true })
|
|
88
|
+
remark1: string
|
|
89
|
+
|
|
90
|
+
@Column({ nullable: true })
|
|
91
|
+
remark2: string
|
|
92
|
+
|
|
93
|
+
@Column({ nullable: true })
|
|
94
|
+
remark3: string
|
|
95
|
+
|
|
96
|
+
@Column({ nullable: true })
|
|
97
|
+
remark4: string
|
|
98
|
+
|
|
99
|
+
@Column({ nullable: true })
|
|
100
|
+
remark5: string
|
|
101
|
+
|
|
75
102
|
@Column({ nullable: true })
|
|
76
103
|
docRefNo: string
|
|
77
104
|
|
|
@@ -159,4 +159,14 @@ export class MarketplaceOrder {
|
|
|
159
159
|
nullable: true
|
|
160
160
|
})
|
|
161
161
|
updater: User
|
|
162
|
+
|
|
163
|
+
// MMS custom order
|
|
164
|
+
@Column({ nullable: true })
|
|
165
|
+
eventStartDate: string
|
|
166
|
+
|
|
167
|
+
@Column({ nullable: true })
|
|
168
|
+
eventEndDate: string
|
|
169
|
+
|
|
170
|
+
@Column({ nullable: true })
|
|
171
|
+
eventName: string
|
|
162
172
|
}
|
|
@@ -11,6 +11,7 @@ export const MarketplaceOrderItem = gql`
|
|
|
11
11
|
orderType: String
|
|
12
12
|
cancelBy: String
|
|
13
13
|
returnStatus: String
|
|
14
|
+
paidUnitPrice: String
|
|
14
15
|
paidPrice: String
|
|
15
16
|
packageId: String
|
|
16
17
|
invoiceNo: String
|
|
@@ -20,8 +21,15 @@ export const MarketplaceOrderItem = gql`
|
|
|
20
21
|
reason: String
|
|
21
22
|
status: String
|
|
22
23
|
description: String
|
|
24
|
+
originalUnitPrice: Float
|
|
23
25
|
originalPrice: Float
|
|
24
26
|
discount: Float
|
|
27
|
+
profit: String
|
|
28
|
+
remark1: String
|
|
29
|
+
remark2: String
|
|
30
|
+
remark3: String
|
|
31
|
+
remark4: String
|
|
32
|
+
remark5: String
|
|
25
33
|
promotionId: String
|
|
26
34
|
paymentFee: Float
|
|
27
35
|
platformFee: Float
|
|
@@ -29,6 +37,7 @@ export const MarketplaceOrderItem = gql`
|
|
|
29
37
|
brand: String
|
|
30
38
|
transactionRateType: String
|
|
31
39
|
transactionRate: Float
|
|
40
|
+
ordersSalesTotal: Float
|
|
32
41
|
updater: User
|
|
33
42
|
creator: User
|
|
34
43
|
updatedAt: String
|