@things-factory/operato-hub 4.3.203 → 4.3.205
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/config.development.js +40 -18
- package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js +25 -1
- package/dist-server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js +12 -1
- package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js.map +1 -1
- package/package.json +10 -10
- package/server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts +29 -1
- package/server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts +11 -1
package/config.development.js
CHANGED
|
@@ -4,32 +4,47 @@ module.exports = {
|
|
|
4
4
|
useVirtualHostBasedDomain: false,
|
|
5
5
|
fallbackRoute: '/',
|
|
6
6
|
subdomainOffset: 2,
|
|
7
|
-
port:
|
|
7
|
+
port: 3000,
|
|
8
8
|
inspect: '9260',
|
|
9
|
-
// ormconfig: {
|
|
10
|
-
// name: 'default',
|
|
11
|
-
// type: 'postgres',
|
|
12
|
-
// database: 'dev',
|
|
13
|
-
// username: 'postgres',
|
|
14
|
-
// password: 'hatio',
|
|
15
|
-
// host: '192.168.0.153',
|
|
16
|
-
// port: 15432,
|
|
17
|
-
// synchronize: true,
|
|
18
|
-
// logging: false
|
|
19
|
-
// },
|
|
20
9
|
ormconfig: {
|
|
21
10
|
name: 'default',
|
|
22
11
|
type: 'postgres',
|
|
23
|
-
host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
|
|
24
|
-
port: 55432,
|
|
25
12
|
database: 'postgres',
|
|
26
13
|
username: 'postgres',
|
|
27
|
-
password: '
|
|
28
|
-
|
|
14
|
+
password: 'hatio',
|
|
15
|
+
host: 'localhost',
|
|
16
|
+
port: 15432,
|
|
17
|
+
synchronize: false,
|
|
29
18
|
logging: true,
|
|
30
19
|
connectTimeoutMS: 30000,
|
|
31
20
|
extra: { poolSize: 30 }
|
|
32
21
|
},
|
|
22
|
+
// ormconfig: {
|
|
23
|
+
// name: 'default',
|
|
24
|
+
// type: 'postgres',
|
|
25
|
+
// database: 'dev2', // dev2
|
|
26
|
+
// username: 'postgres',
|
|
27
|
+
// password: 'abcd1234',
|
|
28
|
+
// host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
|
|
29
|
+
// port: 55432,
|
|
30
|
+
// synchronize:false,
|
|
31
|
+
// logging: false,
|
|
32
|
+
// connectTimeoutMS: 30000,
|
|
33
|
+
// extra: { poolSize: 30 }
|
|
34
|
+
// },
|
|
35
|
+
// ormconfig: {
|
|
36
|
+
// name: 'default',
|
|
37
|
+
// type: 'postgres',
|
|
38
|
+
// host: 'localhost',
|
|
39
|
+
// port: 15432,
|
|
40
|
+
// database: 'postgres',
|
|
41
|
+
// username: 'postgres',
|
|
42
|
+
// password: 'hatio',
|
|
43
|
+
// synchronize: false,
|
|
44
|
+
// logging: true,
|
|
45
|
+
// connectTimeoutMS: 30000,
|
|
46
|
+
// extra: { poolSize: 30 }
|
|
47
|
+
// },
|
|
33
48
|
password: {
|
|
34
49
|
lowerCase: true,
|
|
35
50
|
upperCase: false,
|
|
@@ -106,13 +121,13 @@ module.exports = {
|
|
|
106
121
|
// }
|
|
107
122
|
},
|
|
108
123
|
fulfillmentIntegrationOperato: {
|
|
109
|
-
host: '
|
|
124
|
+
host: '192.168.0.161:3000',
|
|
110
125
|
protocol: 'http',
|
|
111
126
|
platform: 'operato',
|
|
112
127
|
application: 'Operato MMS',
|
|
113
128
|
appKey: 'a9bf751e622bf146662b240d58971051',
|
|
114
129
|
appSecret: '1c385935dc131c4b902b9bbf6a4798af',
|
|
115
|
-
callback: 'http://
|
|
130
|
+
callback: 'http://192.168.0.161:5000/callback-operato'
|
|
116
131
|
},
|
|
117
132
|
marketplaceIntegrationShopee: {
|
|
118
133
|
platform: 'shopee',
|
|
@@ -135,5 +150,12 @@ module.exports = {
|
|
|
135
150
|
apiSecret: 'T139_ItMjObC82mmy7iwnNflhd2iV0kUvDBj0P_201EmA7Sj',
|
|
136
151
|
callback: 'http://operato-h.com:3000/callback-xero',
|
|
137
152
|
hostname: 'http://operato-h.com:3000/'
|
|
153
|
+
},
|
|
154
|
+
awbFileStorage: {
|
|
155
|
+
type: 's3',
|
|
156
|
+
accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
|
|
157
|
+
secretAccessKey: 'OG2qS0Usg4wyjPWbfv1ahPZzP80/w8z4i8MYHl+e',
|
|
158
|
+
bucketName: 'operato-awb',
|
|
159
|
+
region: 'ap-southeast-1'
|
|
138
160
|
}
|
|
139
161
|
}
|
|
@@ -15,7 +15,8 @@ api_1.restfulApiRouter.post('/v1/marketplace/add-marketplace-order', middlewares
|
|
|
15
15
|
const { user, domain } = context.state;
|
|
16
16
|
const marketplaceOrder = context.request.body.data;
|
|
17
17
|
const marketplaceStore = await tx.getRepository(integration_marketplace_1.MarketplaceStore).findOne({
|
|
18
|
-
where: { name: marketplaceOrder.storeId, domain }
|
|
18
|
+
where: { name: marketplaceOrder.storeId, domain },
|
|
19
|
+
relations: ['domain']
|
|
19
20
|
});
|
|
20
21
|
if (!marketplaceStore)
|
|
21
22
|
throw new error_util_1.ApiError('E04', 'storeId');
|
|
@@ -81,6 +82,29 @@ api_1.restfulApiRouter.post('/v1/marketplace/add-marketplace-order', middlewares
|
|
|
81
82
|
await tx.getRepository(marketplace_base_1.MarketplaceProductVariation).save(newVariation);
|
|
82
83
|
foundVariation = newVariation;
|
|
83
84
|
}
|
|
85
|
+
if (foundVariation === null || foundVariation === void 0 ? void 0 : foundVariation.sku) {
|
|
86
|
+
let product = await tx
|
|
87
|
+
.getRepository(product_base_1.Product)
|
|
88
|
+
.findOne({ where: { domain, sku: foundVariation === null || foundVariation === void 0 ? void 0 : foundVariation.sku } });
|
|
89
|
+
if (product && (product === null || product === void 0 ? void 0 : product.brand)) {
|
|
90
|
+
let transactionRate = await tx
|
|
91
|
+
.getRepository(marketplace_base_1.MarketplaceTransactionRate)
|
|
92
|
+
.findOne({
|
|
93
|
+
where: {
|
|
94
|
+
domain,
|
|
95
|
+
brand: product.brand,
|
|
96
|
+
paymentMethod: newMarketplaceOrder.paymentMethod,
|
|
97
|
+
marketplaceStore
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
marketplaceOrderItem.brand = product.brand;
|
|
101
|
+
marketplaceOrderItem.commissionFee = product.commissionFee;
|
|
102
|
+
marketplaceOrderItem.platformFee = product.platformFee;
|
|
103
|
+
marketplaceOrderItem.serviceFee = product.serviceFee;
|
|
104
|
+
marketplaceOrderItem.transactionRateType = transactionRate.rateType;
|
|
105
|
+
marketplaceOrderItem.transactionRate = transactionRate.rate;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
84
108
|
marketplaceOrderItem.marketplaceProductVariation = foundVariation;
|
|
85
109
|
marketplaceOrderItem.name = orderItem.orderItemId;
|
|
86
110
|
marketplaceOrderItem.marketplaceOrder = newMarketplaceOrder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-marketplace-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts"],"names":[],"mappings":";;AAAA,qCAAkF;AAClF,+BAAmC;AAEnC,6CAAgE;AAChE,qFAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"add-marketplace-order.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/add-marketplace-order.ts"],"names":[],"mappings":"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"}
|
package/dist-server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.js
CHANGED
|
@@ -17,6 +17,7 @@ api_1.restfulApiRouter.get('/v1/marketplace/get-marketplace-order-shipping-list'
|
|
|
17
17
|
.createQueryBuilder('mos')
|
|
18
18
|
.innerJoinAndSelect('mos.marketplaceStore', 'mps')
|
|
19
19
|
.innerJoinAndSelect('mos.marketplaceOrderShippingItems', 'mosi')
|
|
20
|
+
.leftJoinAndSelect('mosi.product', 'p')
|
|
20
21
|
.innerJoinAndSelect('mosi.marketplaceOrderItem', 'moi')
|
|
21
22
|
.innerJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
|
|
22
23
|
.innerJoinAndMapOne('mos.marketplaceOrder', marketplace_base_1.MarketplaceOrder, 'mo', 'mo.orderNo = mos.orderNoRef')
|
|
@@ -80,18 +81,28 @@ api_1.restfulApiRouter.get('/v1/marketplace/get-marketplace-order-shipping-list'
|
|
|
80
81
|
storeId: marketplaceOrderShipping.marketplaceStore.id
|
|
81
82
|
},
|
|
82
83
|
marketplaceOrderItems: marketplaceOrderShipping.marketplaceOrderShippingItems.map(mposi => {
|
|
84
|
+
var _a, _b, _c, _d;
|
|
83
85
|
return {
|
|
84
86
|
marketplaceProductVariation: {
|
|
85
87
|
variationId: mposi.marketplaceOrderItem.marketplaceProductVariation.variationId,
|
|
86
88
|
sku: mposi.marketplaceOrderItem.marketplaceProductVariation.sku,
|
|
87
89
|
variationSku: mposi.marketplaceOrderItem.marketplaceProductVariation.variationSku,
|
|
88
|
-
variationName: mposi.marketplaceOrderItem.marketplaceProductVariation.name
|
|
90
|
+
variationName: mposi.marketplaceOrderItem.marketplaceProductVariation.name,
|
|
91
|
+
productBrand: ((_a = mposi === null || mposi === void 0 ? void 0 : mposi.product) === null || _a === void 0 ? void 0 : _a.brand) || null,
|
|
92
|
+
productCommissionFee: ((_b = mposi === null || mposi === void 0 ? void 0 : mposi.product) === null || _b === void 0 ? void 0 : _b.commissionFee) || null,
|
|
93
|
+
productPlatformFee: ((_c = mposi === null || mposi === void 0 ? void 0 : mposi.product) === null || _c === void 0 ? void 0 : _c.platformFee) || null,
|
|
94
|
+
productServiceFee: ((_d = mposi === null || mposi === void 0 ? void 0 : mposi.product) === null || _d === void 0 ? void 0 : _d.serviceFee) || null
|
|
89
95
|
},
|
|
90
96
|
orderItemId: mposi.marketplaceOrderItem.id,
|
|
91
97
|
qty: mposi.marketplaceOrderItem.qty,
|
|
92
98
|
cancelBy: mposi.marketplaceOrderItem.cancelBy,
|
|
93
99
|
returnStatus: mposi.marketplaceOrderItem.returnStatus,
|
|
94
100
|
packageId: mposi.marketplaceOrderItem.packageId,
|
|
101
|
+
commissionFee: mposi.marketplaceOrderItem.commissionFee,
|
|
102
|
+
serviceFee: mposi.marketplaceOrderItem.serviceFee,
|
|
103
|
+
platformFee: mposi.marketplaceOrderItem.platformFee,
|
|
104
|
+
transactionRateType: mposi.marketplaceOrderItem.transactionRateType,
|
|
105
|
+
transactionRate: mposi.marketplaceOrderItem.transactionRate,
|
|
95
106
|
status: mposi.marketplaceOrderItem.status
|
|
96
107
|
};
|
|
97
108
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-marketplace-order-shipping-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-marketplace-order-shipping-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.205",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -77,21 +77,21 @@
|
|
|
77
77
|
"@things-factory/i18n-base": "^4.3.179",
|
|
78
78
|
"@things-factory/import-ui": "^4.3.179",
|
|
79
79
|
"@things-factory/import-ui-excel": "^4.3.179",
|
|
80
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.204",
|
|
81
81
|
"@things-factory/integration-fulfillment": "^4.3.190",
|
|
82
82
|
"@things-factory/integration-lmd": "^4.3.197",
|
|
83
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.204",
|
|
84
84
|
"@things-factory/integration-pos": "^4.3.190",
|
|
85
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
85
|
+
"@things-factory/integration-sellercraft": "^4.3.204",
|
|
86
86
|
"@things-factory/integration-sftp": "^4.3.190",
|
|
87
87
|
"@things-factory/lite-menu": "^4.3.186",
|
|
88
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
88
|
+
"@things-factory/marketplace-base": "^4.3.204",
|
|
89
89
|
"@things-factory/more-ui": "^4.3.179",
|
|
90
90
|
"@things-factory/notification": "^4.3.186",
|
|
91
91
|
"@things-factory/pdf": "^4.3.159",
|
|
92
|
-
"@things-factory/product-ui": "^4.3.
|
|
92
|
+
"@things-factory/product-ui": "^4.3.204",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.179",
|
|
94
|
-
"@things-factory/sales-base": "^4.3.
|
|
94
|
+
"@things-factory/sales-base": "^4.3.205",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.159",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.159",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.159",
|
|
@@ -106,8 +106,8 @@
|
|
|
106
106
|
"@things-factory/setting-ui": "^4.3.186",
|
|
107
107
|
"@things-factory/shell": "^4.3.179",
|
|
108
108
|
"@things-factory/system-ui": "^4.3.179",
|
|
109
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
110
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
109
|
+
"@things-factory/warehouse-base": "^4.3.204",
|
|
110
|
+
"@things-factory/worksheet-base": "^4.3.205",
|
|
111
111
|
"cron-parser": "^4.7.0",
|
|
112
112
|
"koa2-swagger-ui": "^5.0.2",
|
|
113
113
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -119,5 +119,5 @@
|
|
|
119
119
|
"resolutions": {
|
|
120
120
|
"core-js": "^3.16.0"
|
|
121
121
|
},
|
|
122
|
-
"gitHead": "
|
|
122
|
+
"gitHead": "50caf0130df28e6a05dfc16aeda8812196cdb47d"
|
|
123
123
|
}
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
MarketplaceOrderShipping as MarketplaceOrderShippingEntity,
|
|
10
10
|
MarketplaceOrderShippingItem as MarketplaceOrderShippingItemEntity,
|
|
11
11
|
MarketplaceProductVariation as MarketplaceProductVariationEntity,
|
|
12
|
+
MarketplaceTransactionRate as MarketplaceTransactionRateEntity,
|
|
12
13
|
NoGenerator,
|
|
13
14
|
updateQtyAndReserveQty
|
|
14
15
|
} from '@things-factory/marketplace-base'
|
|
@@ -29,7 +30,8 @@ router.post(
|
|
|
29
30
|
const marketplaceOrder = context.request.body.data
|
|
30
31
|
|
|
31
32
|
const marketplaceStore: MarketplaceStore = await tx.getRepository(MarketplaceStore).findOne({
|
|
32
|
-
where: { name: marketplaceOrder.storeId, domain }
|
|
33
|
+
where: { name: marketplaceOrder.storeId, domain },
|
|
34
|
+
relations: ['domain']
|
|
33
35
|
})
|
|
34
36
|
if (!marketplaceStore) throw new ApiError('E04', 'storeId')
|
|
35
37
|
|
|
@@ -108,6 +110,32 @@ router.post(
|
|
|
108
110
|
foundVariation = newVariation
|
|
109
111
|
}
|
|
110
112
|
|
|
113
|
+
if (foundVariation?.sku) {
|
|
114
|
+
let product: Product = await tx
|
|
115
|
+
.getRepository(Product)
|
|
116
|
+
.findOne({ where: { domain, sku: foundVariation?.sku } })
|
|
117
|
+
|
|
118
|
+
if (product && product?.brand) {
|
|
119
|
+
let transactionRate: MarketplaceTransactionRateEntity = await tx
|
|
120
|
+
.getRepository(MarketplaceTransactionRateEntity)
|
|
121
|
+
.findOne({
|
|
122
|
+
where: {
|
|
123
|
+
domain,
|
|
124
|
+
brand: product.brand,
|
|
125
|
+
paymentMethod: newMarketplaceOrder.paymentMethod,
|
|
126
|
+
marketplaceStore
|
|
127
|
+
}
|
|
128
|
+
})
|
|
129
|
+
|
|
130
|
+
marketplaceOrderItem.brand = product.brand
|
|
131
|
+
marketplaceOrderItem.commissionFee = product.commissionFee
|
|
132
|
+
marketplaceOrderItem.platformFee = product.platformFee
|
|
133
|
+
marketplaceOrderItem.serviceFee = product.serviceFee
|
|
134
|
+
marketplaceOrderItem.transactionRateType = transactionRate.rateType
|
|
135
|
+
marketplaceOrderItem.transactionRate = transactionRate.rate
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
111
139
|
marketplaceOrderItem.marketplaceProductVariation = foundVariation
|
|
112
140
|
marketplaceOrderItem.name = orderItem.orderItemId
|
|
113
141
|
marketplaceOrderItem.marketplaceOrder = newMarketplaceOrder
|
package/server/routers/api/restful-apis/v1/marketplace/get-marketplace-order-shipping-list.ts
CHANGED
|
@@ -21,6 +21,7 @@ router.get(
|
|
|
21
21
|
.createQueryBuilder('mos')
|
|
22
22
|
.innerJoinAndSelect('mos.marketplaceStore', 'mps')
|
|
23
23
|
.innerJoinAndSelect('mos.marketplaceOrderShippingItems', 'mosi')
|
|
24
|
+
.leftJoinAndSelect('mosi.product', 'p')
|
|
24
25
|
.innerJoinAndSelect('mosi.marketplaceOrderItem', 'moi')
|
|
25
26
|
.innerJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
|
|
26
27
|
.innerJoinAndMapOne('mos.marketplaceOrder', MarketplaceOrder, 'mo', 'mo.orderNo = mos.orderNoRef')
|
|
@@ -89,13 +90,22 @@ router.get(
|
|
|
89
90
|
variationId: mposi.marketplaceOrderItem.marketplaceProductVariation.variationId,
|
|
90
91
|
sku: mposi.marketplaceOrderItem.marketplaceProductVariation.sku,
|
|
91
92
|
variationSku: mposi.marketplaceOrderItem.marketplaceProductVariation.variationSku,
|
|
92
|
-
variationName: mposi.marketplaceOrderItem.marketplaceProductVariation.name
|
|
93
|
+
variationName: mposi.marketplaceOrderItem.marketplaceProductVariation.name,
|
|
94
|
+
productBrand: mposi?.product?.brand || null,
|
|
95
|
+
productCommissionFee: mposi?.product?.commissionFee || null,
|
|
96
|
+
productPlatformFee: mposi?.product?.platformFee || null,
|
|
97
|
+
productServiceFee: mposi?.product?.serviceFee || null
|
|
93
98
|
},
|
|
94
99
|
orderItemId: mposi.marketplaceOrderItem.id,
|
|
95
100
|
qty: mposi.marketplaceOrderItem.qty,
|
|
96
101
|
cancelBy: mposi.marketplaceOrderItem.cancelBy,
|
|
97
102
|
returnStatus: mposi.marketplaceOrderItem.returnStatus,
|
|
98
103
|
packageId: mposi.marketplaceOrderItem.packageId,
|
|
104
|
+
commissionFee: mposi.marketplaceOrderItem.commissionFee,
|
|
105
|
+
serviceFee: mposi.marketplaceOrderItem.serviceFee,
|
|
106
|
+
platformFee: mposi.marketplaceOrderItem.platformFee,
|
|
107
|
+
transactionRateType: mposi.marketplaceOrderItem.transactionRateType,
|
|
108
|
+
transactionRate: mposi.marketplaceOrderItem.transactionRate,
|
|
99
109
|
status: mposi.marketplaceOrderItem.status
|
|
100
110
|
}
|
|
101
111
|
})
|