@things-factory/operato-mms 4.0.24 → 4.0.28
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/client/bootstrap.js +1 -1
- package/client/pages/catalogue-variation/product-variations.js +10 -0
- package/client/pages/inventory/inventory-by-product.js +17 -4
- package/client/pages/order/logistics/batch-init-popup.js +26 -1
- package/client/pages/order/logistics/lazada-order-init-batch-popup.js +8 -0
- package/client/pages/order/logistics/shopee-order-init-batch-popup.js +22 -0
- package/client/pages/order/order-by-store.js +8 -0
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +11 -8
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +3 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.js +91 -0
- package/dist-server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.js.map +1 -0
- package/dist-server/graphql/resolvers/interface-with-hub/index.js +2 -1
- package/dist-server/graphql/resolvers/interface-with-hub/index.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.js +3 -2
- package/dist-server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.js.map +1 -1
- package/dist-server/graphql/types/interface-with-hub/index.js +5 -4
- package/dist-server/graphql/types/interface-with-hub/index.js.map +1 -1
- package/dist-server/routers/etrax-router.js +10 -2
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/package.json +61 -61
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +12 -9
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +4 -1
- package/server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.ts +99 -0
- package/server/graphql/resolvers/interface-with-hub/index.ts +3 -1
- package/server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.ts +5 -3
- package/server/graphql/types/interface-with-hub/index.ts +5 -4
- package/server/routers/etrax-router.ts +10 -2
- package/translations/en.json +3 -0
- package/translations/ko.json +4 -1
- package/translations/ms.json +4 -1
- package/translations/zh.json +4 -1
- package/config.development.js +0 -88
package/client/bootstrap.js
CHANGED
|
@@ -5,7 +5,7 @@ import './viewparts/user-circle'
|
|
|
5
5
|
|
|
6
6
|
import { html } from 'lit-element'
|
|
7
7
|
|
|
8
|
-
import { registerDefaultGroups } from '@operato/board/
|
|
8
|
+
import { registerDefaultGroups } from '@operato/board/register-default-groups.js'
|
|
9
9
|
import { APPEND_APP_TOOL } from '@things-factory/apptool-base'
|
|
10
10
|
import { auth } from '@things-factory/auth-base'
|
|
11
11
|
import { setAuthManagementMenus } from '@things-factory/auth-ui'
|
|
@@ -183,6 +183,15 @@ class ProductVariations extends localize(i18next)(PageView) {
|
|
|
183
183
|
record: { align: 'center' },
|
|
184
184
|
width: 150
|
|
185
185
|
},
|
|
186
|
+
{
|
|
187
|
+
type: 'float',
|
|
188
|
+
name: 'reserveQty',
|
|
189
|
+
header: i18next.t('field.variation_reserve_qty'),
|
|
190
|
+
sortable: true,
|
|
191
|
+
imex: { header: i18next.t('field.variation_reserve_qty'), key: 'reserveQty', width: 25, type: 'string' },
|
|
192
|
+
record: { align: 'center' },
|
|
193
|
+
width: 150
|
|
194
|
+
},
|
|
186
195
|
{
|
|
187
196
|
type: 'float',
|
|
188
197
|
name: 'costPrice',
|
|
@@ -305,6 +314,7 @@ class ProductVariations extends localize(i18next)(PageView) {
|
|
|
305
314
|
variationSku
|
|
306
315
|
channelSku
|
|
307
316
|
qty
|
|
317
|
+
reserveQty
|
|
308
318
|
bufferQty
|
|
309
319
|
thresholdQty
|
|
310
320
|
name
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import '@things-factory/form-ui'
|
|
2
2
|
import '@things-factory/grist-ui'
|
|
3
|
-
|
|
4
|
-
import { client, PageView, gqlContext } from '@things-factory/shell'
|
|
5
|
-
import { ScrollbarStyles, CommonButtonStyles } from '@things-factory/styles'
|
|
6
|
-
import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
|
|
3
|
+
|
|
7
4
|
import gql from 'graphql-tag'
|
|
8
5
|
import { css, html } from 'lit-element'
|
|
9
6
|
|
|
7
|
+
import { i18next, localize } from '@things-factory/i18n-base'
|
|
8
|
+
import { client, gqlContext, PageView } from '@things-factory/shell'
|
|
9
|
+
import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
|
|
10
|
+
import { gqlBuilder, isMobileDevice } from '@things-factory/utils'
|
|
11
|
+
|
|
10
12
|
class InventoryByProduct extends localize(i18next)(PageView) {
|
|
11
13
|
static get styles() {
|
|
12
14
|
return [
|
|
@@ -170,6 +172,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
|
|
|
170
172
|
id
|
|
171
173
|
name
|
|
172
174
|
qty
|
|
175
|
+
reserveQty
|
|
173
176
|
}
|
|
174
177
|
}
|
|
175
178
|
warehouseInventory{
|
|
@@ -214,6 +217,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
|
|
|
214
217
|
if (existingGroup) {
|
|
215
218
|
existingGroup[mp.marketplaceStore.id + '_store'] = mpv.name
|
|
216
219
|
existingGroup[mp.marketplaceStore.id + '_qty'] = mpv.qty
|
|
220
|
+
existingGroup[mp.marketplaceStore.id + '_reserveQty'] = mpv.reserveQty
|
|
217
221
|
existingGroup[mp.marketplaceStore.id + '_variationId'] = mpv.id
|
|
218
222
|
} else {
|
|
219
223
|
data.push({
|
|
@@ -223,6 +227,7 @@ class InventoryByProduct extends localize(i18next)(PageView) {
|
|
|
223
227
|
name: item.name,
|
|
224
228
|
[mp.marketplaceStore.id + '_store']: mpv.name,
|
|
225
229
|
[mp.marketplaceStore.id + '_qty']: mpv.qty,
|
|
230
|
+
[mp.marketplaceStore.id + '_reserveQty']: mpv.reserveQty,
|
|
226
231
|
[mp.marketplaceStore.id + '_variationId']: mpv.id
|
|
227
232
|
})
|
|
228
233
|
}
|
|
@@ -348,6 +353,14 @@ class InventoryByProduct extends localize(i18next)(PageView) {
|
|
|
348
353
|
record: { editable: true, align: 'left' },
|
|
349
354
|
width: 60
|
|
350
355
|
})
|
|
356
|
+
stores.push({
|
|
357
|
+
type: 'number',
|
|
358
|
+
name: store.id.toString() + '_reserveQty',
|
|
359
|
+
header: i18next.t('field.reserve_qty'),
|
|
360
|
+
sortable: false,
|
|
361
|
+
record: { align: 'left' },
|
|
362
|
+
width: 60
|
|
363
|
+
})
|
|
351
364
|
})
|
|
352
365
|
|
|
353
366
|
this.config = {
|
|
@@ -176,6 +176,13 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
176
176
|
columns: [
|
|
177
177
|
{ type: 'gutter', gutterName: 'sequence' },
|
|
178
178
|
{ type: 'gutter', gutterName: 'row-selector', multiple: true },
|
|
179
|
+
{
|
|
180
|
+
type: 'boolean',
|
|
181
|
+
name: 'isSplitted',
|
|
182
|
+
header: i18next.t('field.is_splitted'),
|
|
183
|
+
record: { align: 'center' },
|
|
184
|
+
width: 40
|
|
185
|
+
},
|
|
179
186
|
{
|
|
180
187
|
type: 'string',
|
|
181
188
|
name: 'orderNoRef',
|
|
@@ -253,6 +260,20 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
253
260
|
label: true,
|
|
254
261
|
sortable: true,
|
|
255
262
|
width: 120
|
|
263
|
+
},
|
|
264
|
+
{
|
|
265
|
+
type: 'datetime',
|
|
266
|
+
name: 'orderCreatedAt',
|
|
267
|
+
header: i18next.t('field.created_at'),
|
|
268
|
+
sortable: true,
|
|
269
|
+
width: 180
|
|
270
|
+
},
|
|
271
|
+
{
|
|
272
|
+
type: 'datetime',
|
|
273
|
+
name: 'orderUpdatedAt',
|
|
274
|
+
header: i18next.t('field.updated_at'),
|
|
275
|
+
sortable: true,
|
|
276
|
+
width: 180
|
|
256
277
|
}
|
|
257
278
|
]
|
|
258
279
|
}
|
|
@@ -360,6 +381,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
360
381
|
paymentMethod
|
|
361
382
|
status
|
|
362
383
|
itemCount
|
|
384
|
+
isSplitted
|
|
363
385
|
shippingProvider
|
|
364
386
|
totalAmount
|
|
365
387
|
orderCreatedAt
|
|
@@ -384,8 +406,11 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
|
|
|
384
406
|
return {
|
|
385
407
|
...itm,
|
|
386
408
|
status: itm.marketplaceOrder.status,
|
|
409
|
+
idSplitted: itm.marketplaceOrder.isSplitted,
|
|
387
410
|
shippingProvider: itm.transporter,
|
|
388
|
-
ownShippingProvider: itm.ownTransporter
|
|
411
|
+
ownShippingProvider: itm.ownTransporter,
|
|
412
|
+
orderCreatedAt: itm.marketplaceOrder.orderCreatedAt,
|
|
413
|
+
orderUpdatedAt: itm.marketplaceOrder.orderUpdatedAt
|
|
389
414
|
}
|
|
390
415
|
}) || []
|
|
391
416
|
}
|
|
@@ -150,6 +150,13 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
150
150
|
columns: [
|
|
151
151
|
{ type: 'gutter', gutterName: 'sequence' },
|
|
152
152
|
{ type: 'gutter', gutterName: 'row-selector', multiple: true },
|
|
153
|
+
{
|
|
154
|
+
type: 'boolean',
|
|
155
|
+
name: 'isSplitted',
|
|
156
|
+
header: i18next.t('field.is_splitted'),
|
|
157
|
+
record: { align: 'center' },
|
|
158
|
+
width: 40
|
|
159
|
+
},
|
|
153
160
|
{
|
|
154
161
|
type: 'string',
|
|
155
162
|
name: 'docRefNo',
|
|
@@ -342,6 +349,7 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
342
349
|
paymentMethod
|
|
343
350
|
status
|
|
344
351
|
itemCount
|
|
352
|
+
isSplitted
|
|
345
353
|
shippingProvider
|
|
346
354
|
ownShippingProvider
|
|
347
355
|
totalAmount
|
|
@@ -201,6 +201,13 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
201
201
|
columns: [
|
|
202
202
|
{ type: 'gutter', gutterName: 'sequence' },
|
|
203
203
|
{ type: 'gutter', gutterName: 'row-selector', multiple: true },
|
|
204
|
+
{
|
|
205
|
+
type: 'boolean',
|
|
206
|
+
name: 'isSplitted',
|
|
207
|
+
header: i18next.t('field.is_splitted'),
|
|
208
|
+
record: { align: 'center' },
|
|
209
|
+
width: 40
|
|
210
|
+
},
|
|
204
211
|
{
|
|
205
212
|
type: 'string',
|
|
206
213
|
name: 'docRefNo',
|
|
@@ -268,6 +275,20 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
268
275
|
header: i18next.t('field.status'),
|
|
269
276
|
sortable: true,
|
|
270
277
|
width: 120
|
|
278
|
+
},
|
|
279
|
+
{
|
|
280
|
+
type: 'datetime',
|
|
281
|
+
name: 'orderCreatedAt',
|
|
282
|
+
header: i18next.t('field.created_at'),
|
|
283
|
+
sortable: true,
|
|
284
|
+
width: 180
|
|
285
|
+
},
|
|
286
|
+
{
|
|
287
|
+
type: 'datetime',
|
|
288
|
+
name: 'orderUpdatedAt',
|
|
289
|
+
header: i18next.t('field.updated_at'),
|
|
290
|
+
sortable: true,
|
|
291
|
+
width: 180
|
|
271
292
|
}
|
|
272
293
|
]
|
|
273
294
|
}
|
|
@@ -392,6 +413,7 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
|
|
|
392
413
|
paymentMethod
|
|
393
414
|
status
|
|
394
415
|
itemCount
|
|
416
|
+
isSplitted
|
|
395
417
|
shippingProvider
|
|
396
418
|
ownShippingProvider
|
|
397
419
|
totalAmount
|
|
@@ -249,6 +249,13 @@ class OrderByStore extends localize(i18next)(PageView) {
|
|
|
249
249
|
record: { align: 'center' },
|
|
250
250
|
width: 40
|
|
251
251
|
},
|
|
252
|
+
{
|
|
253
|
+
type: 'boolean',
|
|
254
|
+
name: 'isSplitted',
|
|
255
|
+
header: i18next.t('field.is_splitted'),
|
|
256
|
+
record: { align: 'center' },
|
|
257
|
+
width: 40
|
|
258
|
+
},
|
|
252
259
|
{
|
|
253
260
|
type: 'object',
|
|
254
261
|
name: 'marketplaceStore',
|
|
@@ -476,6 +483,7 @@ class OrderByStore extends localize(i18next)(PageView) {
|
|
|
476
483
|
type
|
|
477
484
|
paymentMethod
|
|
478
485
|
status
|
|
486
|
+
isSplitted
|
|
479
487
|
itemCount
|
|
480
488
|
releaseOrderId
|
|
481
489
|
totalAmount
|
|
@@ -1,30 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addReleaseOrderResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
6
|
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
6
7
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
8
|
const shell_1 = require("@things-factory/shell");
|
|
8
9
|
exports.addReleaseOrderResolver = {
|
|
9
10
|
async addReleaseOrder(_, { marketplaceOrderIds, warehouseId }, context) {
|
|
10
|
-
const {
|
|
11
|
+
const { domain } = context.state;
|
|
11
12
|
const fulfilmentCenter = await integration_fulfillment_1.FulfillmentAPI.getFulfillmentCenter(warehouseId);
|
|
12
13
|
const centerId = fulfilmentCenter.centerId;
|
|
13
|
-
var warehouseDomain = await
|
|
14
|
+
var warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
|
|
14
15
|
var customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
|
|
15
16
|
const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id === domain.id).id;
|
|
16
17
|
for (var i = 0; i < marketplaceOrderIds.length; i++) {
|
|
17
18
|
const marketplaceOrderId = marketplaceOrderIds[i];
|
|
18
|
-
const marketplaceOrder = await
|
|
19
|
+
const marketplaceOrder = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne(marketplaceOrderId, {
|
|
19
20
|
relations: [
|
|
20
21
|
'marketplaceOrderItems',
|
|
21
22
|
'marketplaceOrderItems.marketplaceProductVariation',
|
|
22
23
|
'marketplaceOrderItems.marketplaceOrderShipping'
|
|
23
24
|
]
|
|
24
25
|
});
|
|
25
|
-
const marketplaceOrderShippings = await
|
|
26
|
-
.
|
|
27
|
-
|
|
26
|
+
const marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
|
|
27
|
+
where: { orderNoRef: marketplaceOrder.orderNo, domain }
|
|
28
|
+
});
|
|
28
29
|
for (var j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
29
30
|
const marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
30
31
|
const date = new Date();
|
|
@@ -44,7 +45,9 @@ exports.addReleaseOrderResolver = {
|
|
|
44
45
|
courierOption: true,
|
|
45
46
|
collectionOrderNo: marketplaceOrder.orderNo,
|
|
46
47
|
refNo: marketplaceOrder.orderNo,
|
|
47
|
-
refNo2:
|
|
48
|
+
refNo2: marketplaceOrderShippings.length > 1
|
|
49
|
+
? marketplaceOrder.orderNo + ' - ' + (j + 1) + '/' + marketplaceOrderShippings.length
|
|
50
|
+
: marketplaceOrder.orderNo,
|
|
48
51
|
deliverTo: {
|
|
49
52
|
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
50
53
|
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
@@ -85,7 +88,7 @@ exports.addReleaseOrderResolver = {
|
|
|
85
88
|
}
|
|
86
89
|
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
87
90
|
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
88
|
-
await
|
|
91
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
94
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,9 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
51
51
|
courierOption: true,
|
|
52
52
|
collectionOrderNo: marketplaceOrder.orderNo,
|
|
53
53
|
refNo: marketplaceOrder.orderNo,
|
|
54
|
-
refNo2:
|
|
54
|
+
refNo2: marketplaceOrderShippings.length > 1
|
|
55
|
+
? marketplaceOrder.orderNo + ' - ' + (j + 1) + '/' + marketplaceOrderShippings.length
|
|
56
|
+
: marketplaceOrder.orderNo,
|
|
55
57
|
deliverTo: {
|
|
56
58
|
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
57
59
|
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
5
|
+
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
6
|
+
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
7
|
+
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
8
|
+
const product_base_1 = require("@things-factory/product-base");
|
|
9
|
+
const shell_1 = require("@things-factory/shell");
|
|
10
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
11
|
+
exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
12
|
+
async autoUpdateAllMarketplaceProductVariationQuantity(_, { companyDomainId, warehouseId }, context) {
|
|
13
|
+
var _a, _b;
|
|
14
|
+
try {
|
|
15
|
+
const { tx } = context.state;
|
|
16
|
+
const companyDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(companyDomainId);
|
|
17
|
+
const productVariations = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceProductVariation).find({
|
|
18
|
+
where: { domain: companyDomain },
|
|
19
|
+
relations: [
|
|
20
|
+
'marketplaceProduct',
|
|
21
|
+
'marketplaceProduct.marketplaceStore',
|
|
22
|
+
'marketplaceProduct.marketplaceStore.marketplaceDistributors',
|
|
23
|
+
'creator',
|
|
24
|
+
'updater'
|
|
25
|
+
]
|
|
26
|
+
});
|
|
27
|
+
for (var i = 0; i < productVariations.length; i++) {
|
|
28
|
+
const productVariation = productVariations[i];
|
|
29
|
+
const sku = productVariation.sku;
|
|
30
|
+
let warehouseProductQty = 0;
|
|
31
|
+
if (sku) {
|
|
32
|
+
const fulfilmentCenter = await integration_fulfillment_1.FulfillmentAPI.getFulfillmentCenter(warehouseId);
|
|
33
|
+
const centerId = fulfilmentCenter.centerId;
|
|
34
|
+
const warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
|
|
35
|
+
const product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({ where: { domain: companyDomain, sku } });
|
|
36
|
+
const qb = await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).createQueryBuilder('INV');
|
|
37
|
+
qb.select('SUM(INV.qty - INV.locked_qty)', 'remainQty')
|
|
38
|
+
.where('"INV"."domain_id" = :domainId', { domainId: warehouseDomain.id })
|
|
39
|
+
.andWhere('"INV"."product_id" = :productId', { productId: product.id })
|
|
40
|
+
.andWhere('"INV"."status" = :invStatus', { invStatus: 'STORED' })
|
|
41
|
+
.groupBy('"INV".product_id');
|
|
42
|
+
const item = await qb.getRawOne();
|
|
43
|
+
if (item)
|
|
44
|
+
warehouseProductQty += parseFloat(item.remainQty) || 0;
|
|
45
|
+
}
|
|
46
|
+
const marketplaceStore = (_a = productVariation === null || productVariation === void 0 ? void 0 : productVariation.marketplaceProduct) === null || _a === void 0 ? void 0 : _a.marketplaceStore;
|
|
47
|
+
const hasVariation = (_b = productVariation === null || productVariation === void 0 ? void 0 : productVariation.marketplaceProduct) === null || _b === void 0 ? void 0 : _b.hasVariation;
|
|
48
|
+
if (marketplaceStore) {
|
|
49
|
+
//Lazada Product quantity data update -> {sku, qty}
|
|
50
|
+
//Shopee Product quantity data update -> variation = false: {itemId, qty} | variation = true: {itemId, variationId, qty}
|
|
51
|
+
const productVariationQty = productVariation.qty || 0;
|
|
52
|
+
const productVariationReserveQty = productVariation.reserveQty || 0;
|
|
53
|
+
let adjustQty = productVariationQty == warehouseProductQty
|
|
54
|
+
? productVariationQty - productVariationReserveQty
|
|
55
|
+
: warehouseProductQty - productVariationReserveQty;
|
|
56
|
+
let productVariationLocationId = productVariation.locationId;
|
|
57
|
+
if (marketplaceStore.platform === 'SHOPIFY') {
|
|
58
|
+
adjustQty = productVariationReserveQty;
|
|
59
|
+
let locationIds = JSON.parse(productVariationLocationId);
|
|
60
|
+
productVariationLocationId = locationIds[0].location_id;
|
|
61
|
+
}
|
|
62
|
+
if (hasVariation) {
|
|
63
|
+
await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
|
|
64
|
+
{
|
|
65
|
+
itemId: productVariation.marketplaceProduct.itemId,
|
|
66
|
+
variationId: productVariation.variationId,
|
|
67
|
+
qty: adjustQty,
|
|
68
|
+
locationId: productVariationLocationId,
|
|
69
|
+
inventoryItemId: productVariation.inventoryItemId
|
|
70
|
+
}
|
|
71
|
+
]);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
await integration_marketplace_1.StoreAPI.updateStoreProductStock(marketplaceStore, [
|
|
75
|
+
{
|
|
76
|
+
itemId: productVariation.marketplaceProduct.itemId,
|
|
77
|
+
variationId: productVariation.variationId,
|
|
78
|
+
variationSku: productVariation.variationSku,
|
|
79
|
+
qty: adjustQty,
|
|
80
|
+
distributors: marketplaceStore.marketplaceDistributors
|
|
81
|
+
}
|
|
82
|
+
]);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
catch (ex) { }
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
//# sourceMappingURL=auto-update-all-marketplace-product-variation-quantity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auto-update-all-marketplace-product-variation-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.warehouseMarketplaceProduct = exports.Mutation = exports.Query = void 0;
|
|
4
4
|
const add_release_order_1 = require("./add-release-order");
|
|
5
5
|
const auto_add_release_order_1 = require("./auto-add-release-order");
|
|
6
|
+
const auto_update_all_marketplace_product_variation_quantity_1 = require("./auto-update-all-marketplace-product-variation-quantity");
|
|
6
7
|
const generate_replenishment_order_1 = require("./generate-replenishment-order");
|
|
7
8
|
const warehouse_marketplace_products_1 = require("./warehouse-marketplace-products");
|
|
8
9
|
Object.defineProperty(exports, "warehouseMarketplaceProduct", { enumerable: true, get: function () { return warehouse_marketplace_products_1.warehouseMarketplaceProduct; } });
|
|
9
10
|
exports.Query = Object.assign({}, warehouse_marketplace_products_1.warehouseMarketplaceProductsResolver);
|
|
10
|
-
exports.Mutation = Object.assign(Object.assign(Object.assign({}, add_release_order_1.addReleaseOrderResolver), auto_add_release_order_1.autoAddReleaseOrderResolver), generate_replenishment_order_1.generateReplenishmentOrderResolver);
|
|
11
|
+
exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign({}, add_release_order_1.addReleaseOrderResolver), auto_add_release_order_1.autoAddReleaseOrderResolver), generate_replenishment_order_1.generateReplenishmentOrderResolver), auto_update_all_marketplace_product_variation_quantity_1.autoUpdateAllMarketplaceProductVariationQuantityResolver);
|
|
11
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/index.ts"],"names":[],"mappings":";;;AAAA,2DAA6D;AAC7D,qEAAsE;AACtE,iFAAmF;AACnF,qFAAoH;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/index.ts"],"names":[],"mappings":";;;AAAA,2DAA6D;AAC7D,qEAAsE;AACtE,qIAAmI;AACnI,iFAAmF;AACnF,qFAAoH;AAa3G,4GAbA,4DAA2B,OAaA;AAXvB,QAAA,KAAK,qBACb,qEAAoC,EACxC;AAEY,QAAA,QAAQ,+DAChB,2CAAuB,GACvB,oDAA2B,GAC3B,iEAAkC,GAClC,iHAAwD,EAC5D"}
|
|
@@ -64,7 +64,7 @@ async function warehouseMarketplaceProduct(params, domain, user, tx) {
|
|
|
64
64
|
select "dt"."marketplace_store_id", "dt"."product_id", "dt"."sku", array_agg(row_to_json(dt)) as product_variation
|
|
65
65
|
from (
|
|
66
66
|
select "mp"."marketplace_store_id" as "marketplace_store_id", "mpv"."sku", "mpv"."id" as "marketplace_product_variation_id",
|
|
67
|
-
concat("mpv"."variation_sku", ' (', "mpv"."name", ')') as "name", "mpv"."qty" as "qty",
|
|
67
|
+
concat("mpv"."variation_sku", ' (', "mpv"."name", ')') as "name", "mpv"."qty" as "qty", "mpv"."reserve_qty" as "reserve_qty",
|
|
68
68
|
"Product"."product_id" AS "product_id"
|
|
69
69
|
from marketplace_product_variations "mpv"
|
|
70
70
|
inner join marketplace_products "mp" on "mp"."id" = "mpv"."marketplace_product_id"
|
|
@@ -146,7 +146,8 @@ async function warehouseMarketplaceProduct(params, domain, user, tx) {
|
|
|
146
146
|
return {
|
|
147
147
|
id: variation.marketplace_product_variation_id,
|
|
148
148
|
name: variation.name,
|
|
149
|
-
qty: variation.qty
|
|
149
|
+
qty: variation.qty,
|
|
150
|
+
reserveQty: variation.reserve_qty
|
|
150
151
|
};
|
|
151
152
|
})
|
|
152
153
|
};
|
package/dist-server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warehouse-marketplace-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"warehouse-marketplace-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Types = exports.Query = exports.Mutation = void 0;
|
|
4
|
+
const new_stock_replenishment_1 = require("./new-stock-replenishment");
|
|
5
|
+
const replenishment_order_product_1 = require("./replenishment-order-product");
|
|
6
|
+
const stock_replenishment_1 = require("./stock-replenishment");
|
|
7
|
+
const stock_replenishment_list_1 = require("./stock-replenishment-list");
|
|
4
8
|
const warehouse_inventory_1 = require("./warehouse-inventory");
|
|
5
9
|
const warehouse_marketplace_product_1 = require("./warehouse-marketplace-product");
|
|
6
10
|
const warehouse_marketplace_product_list_1 = require("./warehouse-marketplace-product-list");
|
|
7
|
-
const stock_replenishment_1 = require("./stock-replenishment");
|
|
8
|
-
const new_stock_replenishment_1 = require("./new-stock-replenishment");
|
|
9
|
-
const stock_replenishment_list_1 = require("./stock-replenishment-list");
|
|
10
|
-
const replenishment_order_product_1 = require("./replenishment-order-product");
|
|
11
11
|
exports.Mutation = `
|
|
12
12
|
addReleaseOrder(marketplaceOrderIds: [String]!, warehouseId: String!): Boolean @transaction
|
|
13
13
|
autoAddReleaseOrder(warehouseId: String): Boolean @transaction
|
|
14
14
|
generateReplenishmentOrder(stockReplenishmentId: String!, warehouseId: String!): StockReplenishment @transaction
|
|
15
|
+
autoUpdateAllMarketplaceProductVariationQuantity(companyDomainId: String, warehouseId: String): Boolean @transaction
|
|
15
16
|
`;
|
|
16
17
|
exports.Query = `
|
|
17
18
|
warehouseMarketplaceProducts(filters: [Filter], pagination: Pagination, sortings: [Sorting]): WarehouseMarketplaceProductList @transaction
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/interface-with-hub/index.ts"],"names":[],"mappings":";;;AAAA,+DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/interface-with-hub/index.ts"],"names":[],"mappings":";;;AAAA,uEAAiE;AACjE,+EAAyE;AACzE,+DAA0D;AAC1D,yEAAmE;AACnE,+DAA0D;AAC1D,mFAA6E;AAC7E,6FAAsF;AAEzE,QAAA,QAAQ,GAAiB;;;;;CAKrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;CAElC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,uDAAyB;IACzB,iDAAsB;IACtB,wCAAkB;IAClB,2DAA2B;IAC3B,oEAA+B;CAChC,CAAA"}
|
|
@@ -45,8 +45,12 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
45
45
|
const resp = {
|
|
46
46
|
Status: 'ERROR',
|
|
47
47
|
Code: 302,
|
|
48
|
-
Message: 'Validate failed'
|
|
48
|
+
Message: 'Validate failed',
|
|
49
|
+
OrderNo: extOrderNo,
|
|
50
|
+
ExtOrderNo: extOrderNo,
|
|
51
|
+
TrackingNo: trackingNo
|
|
49
52
|
};
|
|
53
|
+
context.type = 'application/json';
|
|
50
54
|
context.body = JSON.stringify(resp);
|
|
51
55
|
return;
|
|
52
56
|
}
|
|
@@ -78,8 +82,12 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
78
82
|
const resp = {
|
|
79
83
|
Status: 'SUCCESS',
|
|
80
84
|
Code: 200,
|
|
81
|
-
Message: 'Updated'
|
|
85
|
+
Message: 'Updated',
|
|
86
|
+
OrderNo: order.orderNo,
|
|
87
|
+
ExtOrderNo: extOrderNo,
|
|
88
|
+
TrackingNo: trackingNo
|
|
82
89
|
};
|
|
90
|
+
context.type = 'application/json';
|
|
83
91
|
context.body = JSON.stringify(resp);
|
|
84
92
|
//let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
|
|
85
93
|
//await orderItemRepo.save(orderItem)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,qCAAuC;AAEvC,qEAAyE;AACzE,qFAAoF;AACpF,uEAAmH;AAEnH,qHAAqH;AAErH,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,4BAA4B,CAAC,CAAA;AAC/C,QAAA,WAAW,GAAG,IAAI,oBAAM,EAAE,CAAA;AAEvC,mBAAW,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACnE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACtC,MAAM,IAAI,GAAG,IAAA,uBAAa,EAAC,kCAAgB,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;IACxC,KAAK,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAA;IAE/C,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAA;IACnC,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,CAAA;IAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAA;IACzC,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;IACzC,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAA;IACzC,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;IACjC,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAA,CAAC,gBAAgB;IAC9D,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAA;IAEjC,MAAM,YAAY,GAAG,YAAY,CAAA;IACjC,MAAM,GAAG,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC;QAC/C,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE;KACvD,CAAC,CAAA;IACF,KAAK,CAAC,GAAG,CAAC,CAAA;IAEV,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;IAE/B,IAAI,YAAY,KAAK,EAAE,IAAI,SAAS,KAAK,EAAE,EAAE;QAC3C,8BAA8B;QAC9B,OAAM;KACP;IAED,MAAM,KAAK,GAAG,IAAI,uBAAK,CAAC,YAAY,CAAC,CAAA;IACrC,KAAK,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;IACnC,gBAAgB;IAChB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,CAAC,CAAA;IACrF,KAAK,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAA;IAEpC,IAAI,CAAC,QAAQ,EAAE;QACb,qBAAqB;QACrB,MAAM,IAAI,GAAG;YACX,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.28",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -41,69 +41,69 @@
|
|
|
41
41
|
"@material/mwc-formfield": "^0.25.3",
|
|
42
42
|
"@material/mwc-linear-progress": "^0.25.3",
|
|
43
43
|
"@material/mwc-radio": "^0.25.3",
|
|
44
|
-
"@operato/ghost-print": "^0.
|
|
45
|
-
"@operato/scene-chartjs": "^0.
|
|
46
|
-
"@operato/scene-clock": "^0.
|
|
47
|
-
"@operato/scene-clone": "^0.
|
|
48
|
-
"@operato/scene-compass": "^0.
|
|
49
|
-
"@operato/scene-gauge": "^0.
|
|
50
|
-
"@operato/scene-grist": "^0.
|
|
51
|
-
"@operato/scene-indoor-map": "^0.
|
|
52
|
-
"@operato/scene-integration": "^0.
|
|
53
|
-
"@operato/scene-legend": "^0.
|
|
54
|
-
"@operato/scene-progressbar": "^0.
|
|
55
|
-
"@operato/scene-random": "^0.
|
|
56
|
-
"@operato/scene-switch": "^0.
|
|
57
|
-
"@operato/scene-tab": "^0.
|
|
58
|
-
"@operato/scene-table": "^0.
|
|
59
|
-
"@operato/scene-timer": "^0.
|
|
60
|
-
"@operato/scene-wheel-sorter": "^0.
|
|
61
|
-
"@things-factory/apptool-ui": "^4.0.
|
|
62
|
-
"@things-factory/attachment-base": "^4.0.
|
|
63
|
-
"@things-factory/auth-ui": "^4.0.
|
|
64
|
-
"@things-factory/biz-base": "^4.0.
|
|
65
|
-
"@things-factory/board-service": "^4.0.
|
|
66
|
-
"@things-factory/board-ui": "^4.0.
|
|
67
|
-
"@things-factory/code-ui": "^4.0.
|
|
68
|
-
"@things-factory/context-ui": "^4.0.
|
|
69
|
-
"@things-factory/dashboard": "^4.0.
|
|
70
|
-
"@things-factory/export-ui": "^4.0.
|
|
71
|
-
"@things-factory/export-ui-csv": "^4.0.
|
|
72
|
-
"@things-factory/export-ui-excel": "^4.0.
|
|
73
|
-
"@things-factory/geography": "^4.0.
|
|
74
|
-
"@things-factory/grist-ui": "^4.0.
|
|
75
|
-
"@things-factory/help": "^4.0.
|
|
76
|
-
"@things-factory/i18n-ui": "^4.0.
|
|
77
|
-
"@things-factory/integration-fulfillment": "^4.0.
|
|
78
|
-
"@things-factory/integration-lmd": "^4.0.
|
|
79
|
-
"@things-factory/lite-menu": "^4.0.
|
|
80
|
-
"@things-factory/marketplace-base": "^4.0.
|
|
81
|
-
"@things-factory/more-ui": "^4.0.
|
|
82
|
-
"@things-factory/notification": "^4.0.
|
|
83
|
-
"@things-factory/oauth2-client": "^4.0.
|
|
84
|
-
"@things-factory/pdf": "^4.0.
|
|
85
|
-
"@things-factory/product-base": "^4.0.
|
|
86
|
-
"@things-factory/resource-ui": "^4.0.
|
|
87
|
-
"@things-factory/scene-data-transform": "^4.0.
|
|
88
|
-
"@things-factory/scene-excel": "^4.0.
|
|
89
|
-
"@things-factory/scene-firebase": "^4.0.
|
|
90
|
-
"@things-factory/scene-form": "^4.0.
|
|
91
|
-
"@things-factory/scene-google-map": "^4.0.
|
|
92
|
-
"@things-factory/scene-graphql": "^4.0.
|
|
44
|
+
"@operato/ghost-print": "^0.3.4",
|
|
45
|
+
"@operato/scene-chartjs": "^0.1.1",
|
|
46
|
+
"@operato/scene-clock": "^0.1.1",
|
|
47
|
+
"@operato/scene-clone": "^0.1.1",
|
|
48
|
+
"@operato/scene-compass": "^0.1.1",
|
|
49
|
+
"@operato/scene-gauge": "^0.1.1",
|
|
50
|
+
"@operato/scene-grist": "^0.1.1",
|
|
51
|
+
"@operato/scene-indoor-map": "^0.1.1",
|
|
52
|
+
"@operato/scene-integration": "^0.1.1",
|
|
53
|
+
"@operato/scene-legend": "^0.1.1",
|
|
54
|
+
"@operato/scene-progressbar": "^0.1.1",
|
|
55
|
+
"@operato/scene-random": "^0.1.1",
|
|
56
|
+
"@operato/scene-switch": "^0.1.1",
|
|
57
|
+
"@operato/scene-tab": "^0.1.1",
|
|
58
|
+
"@operato/scene-table": "^0.1.1",
|
|
59
|
+
"@operato/scene-timer": "^0.1.1",
|
|
60
|
+
"@operato/scene-wheel-sorter": "^0.1.1",
|
|
61
|
+
"@things-factory/apptool-ui": "^4.0.28",
|
|
62
|
+
"@things-factory/attachment-base": "^4.0.28",
|
|
63
|
+
"@things-factory/auth-ui": "^4.0.28",
|
|
64
|
+
"@things-factory/biz-base": "^4.0.28",
|
|
65
|
+
"@things-factory/board-service": "^4.0.28",
|
|
66
|
+
"@things-factory/board-ui": "^4.0.28",
|
|
67
|
+
"@things-factory/code-ui": "^4.0.28",
|
|
68
|
+
"@things-factory/context-ui": "^4.0.28",
|
|
69
|
+
"@things-factory/dashboard": "^4.0.28",
|
|
70
|
+
"@things-factory/export-ui": "^4.0.28",
|
|
71
|
+
"@things-factory/export-ui-csv": "^4.0.28",
|
|
72
|
+
"@things-factory/export-ui-excel": "^4.0.28",
|
|
73
|
+
"@things-factory/geography": "^4.0.28",
|
|
74
|
+
"@things-factory/grist-ui": "^4.0.28",
|
|
75
|
+
"@things-factory/help": "^4.0.28",
|
|
76
|
+
"@things-factory/i18n-ui": "^4.0.28",
|
|
77
|
+
"@things-factory/integration-fulfillment": "^4.0.28",
|
|
78
|
+
"@things-factory/integration-lmd": "^4.0.28",
|
|
79
|
+
"@things-factory/lite-menu": "^4.0.28",
|
|
80
|
+
"@things-factory/marketplace-base": "^4.0.28",
|
|
81
|
+
"@things-factory/more-ui": "^4.0.28",
|
|
82
|
+
"@things-factory/notification": "^4.0.28",
|
|
83
|
+
"@things-factory/oauth2-client": "^4.0.28",
|
|
84
|
+
"@things-factory/pdf": "^4.0.28",
|
|
85
|
+
"@things-factory/product-base": "^4.0.28",
|
|
86
|
+
"@things-factory/resource-ui": "^4.0.28",
|
|
87
|
+
"@things-factory/scene-data-transform": "^4.0.28",
|
|
88
|
+
"@things-factory/scene-excel": "^4.0.28",
|
|
89
|
+
"@things-factory/scene-firebase": "^4.0.28",
|
|
90
|
+
"@things-factory/scene-form": "^4.0.28",
|
|
91
|
+
"@things-factory/scene-google-map": "^4.0.28",
|
|
92
|
+
"@things-factory/scene-graphql": "^4.0.28",
|
|
93
93
|
"@things-factory/scene-half-roundrect": "^4.0.9",
|
|
94
|
-
"@things-factory/scene-label": "^4.0.
|
|
95
|
-
"@things-factory/scene-marker": "^4.0.
|
|
96
|
-
"@things-factory/scene-mqtt": "^4.0.
|
|
97
|
-
"@things-factory/scene-news-ticker": "^4.0.
|
|
98
|
-
"@things-factory/scene-restful": "^4.0.
|
|
99
|
-
"@things-factory/scene-visualizer": "^4.0.
|
|
100
|
-
"@things-factory/setting-ui": "^4.0.
|
|
101
|
-
"@things-factory/system-ui": "^4.0.
|
|
102
|
-
"@things-factory/warehouse-base": "^4.0.
|
|
94
|
+
"@things-factory/scene-label": "^4.0.28",
|
|
95
|
+
"@things-factory/scene-marker": "^4.0.28",
|
|
96
|
+
"@things-factory/scene-mqtt": "^4.0.28",
|
|
97
|
+
"@things-factory/scene-news-ticker": "^4.0.28",
|
|
98
|
+
"@things-factory/scene-restful": "^4.0.28",
|
|
99
|
+
"@things-factory/scene-visualizer": "^4.0.28",
|
|
100
|
+
"@things-factory/setting-ui": "^4.0.28",
|
|
101
|
+
"@things-factory/system-ui": "^4.0.28",
|
|
102
|
+
"@things-factory/warehouse-base": "^4.0.28"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
|
-
"@things-factory/builder": "^4.0.
|
|
105
|
+
"@things-factory/builder": "^4.0.28",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "fc526e27ae290a6fa3f001ce7ee75a2904b1d363"
|
|
109
109
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
|
|
4
4
|
import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
|
|
@@ -11,12 +11,12 @@ export const addReleaseOrderResolver = {
|
|
|
11
11
|
{ marketplaceOrderIds, warehouseId }: { marketplaceOrderIds: any; warehouseId: string },
|
|
12
12
|
context: any
|
|
13
13
|
): Promise<void> {
|
|
14
|
-
const {
|
|
14
|
+
const { domain }: { domain: Domain } = context.state
|
|
15
15
|
|
|
16
16
|
const fulfilmentCenter: FulfillmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
|
|
17
17
|
const centerId: string = fulfilmentCenter.centerId
|
|
18
18
|
|
|
19
|
-
var warehouseDomain: Domain = await
|
|
19
|
+
var warehouseDomain: Domain = await getRepository(Domain).findOne({ where: { subdomain: centerId } })
|
|
20
20
|
var customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
|
|
21
21
|
|
|
22
22
|
const customerBizplaceId: string = customerBizplaces.find(
|
|
@@ -26,7 +26,7 @@ export const addReleaseOrderResolver = {
|
|
|
26
26
|
for (var i = 0; i < marketplaceOrderIds.length; i++) {
|
|
27
27
|
const marketplaceOrderId = marketplaceOrderIds[i]
|
|
28
28
|
|
|
29
|
-
const marketplaceOrder: MarketplaceOrder = await
|
|
29
|
+
const marketplaceOrder: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne(marketplaceOrderId, {
|
|
30
30
|
relations: [
|
|
31
31
|
'marketplaceOrderItems',
|
|
32
32
|
'marketplaceOrderItems.marketplaceProductVariation',
|
|
@@ -34,9 +34,9 @@ export const addReleaseOrderResolver = {
|
|
|
34
34
|
]
|
|
35
35
|
})
|
|
36
36
|
|
|
37
|
-
const marketplaceOrderShippings: MarketplaceOrderShipping[] = await
|
|
38
|
-
.
|
|
39
|
-
|
|
37
|
+
const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
|
|
38
|
+
where: { orderNoRef: marketplaceOrder.orderNo, domain }
|
|
39
|
+
})
|
|
40
40
|
|
|
41
41
|
for (var j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
42
42
|
const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
|
|
@@ -59,7 +59,10 @@ export const addReleaseOrderResolver = {
|
|
|
59
59
|
courierOption: true,
|
|
60
60
|
collectionOrderNo: marketplaceOrder.orderNo,
|
|
61
61
|
refNo: marketplaceOrder.orderNo,
|
|
62
|
-
refNo2:
|
|
62
|
+
refNo2:
|
|
63
|
+
marketplaceOrderShippings.length > 1
|
|
64
|
+
? marketplaceOrder.orderNo + ' - ' + (j + 1) + '/' + marketplaceOrderShippings.length
|
|
65
|
+
: marketplaceOrder.orderNo,
|
|
63
66
|
deliverTo: {
|
|
64
67
|
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
65
68
|
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
@@ -102,7 +105,7 @@ export const addReleaseOrderResolver = {
|
|
|
102
105
|
|
|
103
106
|
marketplaceOrder.releaseOrderId = releaseOrder.id
|
|
104
107
|
marketplaceOrder.fulfillmentCenter = fulfilmentCenter
|
|
105
|
-
await
|
|
108
|
+
await getRepository(MarketplaceOrder).save(marketplaceOrder)
|
|
106
109
|
}
|
|
107
110
|
}
|
|
108
111
|
}
|
|
@@ -60,7 +60,10 @@ export const autoAddReleaseOrderResolver = {
|
|
|
60
60
|
courierOption: true,
|
|
61
61
|
collectionOrderNo: marketplaceOrder.orderNo,
|
|
62
62
|
refNo: marketplaceOrder.orderNo,
|
|
63
|
-
refNo2:
|
|
63
|
+
refNo2:
|
|
64
|
+
marketplaceOrderShippings.length > 1
|
|
65
|
+
? marketplaceOrder.orderNo + ' - ' + (j + 1) + '/' + marketplaceOrderShippings.length
|
|
66
|
+
: marketplaceOrder.orderNo,
|
|
64
67
|
deliverTo: {
|
|
65
68
|
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
66
69
|
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { EntityManager, getRepository, SelectQueryBuilder } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { FulfillmentAPI } from '@things-factory/integration-fulfillment'
|
|
4
|
+
import { StoreAPI } from '@things-factory/integration-marketplace'
|
|
5
|
+
import { MarketplaceProductVariation } from '@things-factory/marketplace-base'
|
|
6
|
+
import { Product } from '@things-factory/product-base'
|
|
7
|
+
import { Domain } from '@things-factory/shell'
|
|
8
|
+
import { Inventory } from '@things-factory/warehouse-base'
|
|
9
|
+
|
|
10
|
+
export const autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
11
|
+
async autoUpdateAllMarketplaceProductVariationQuantity(_: any, { companyDomainId, warehouseId }, context: any) {
|
|
12
|
+
try {
|
|
13
|
+
const { tx }: { tx: EntityManager } = context.state
|
|
14
|
+
|
|
15
|
+
const companyDomain: Domain = await getRepository(Domain).findOne(companyDomainId)
|
|
16
|
+
|
|
17
|
+
const productVariations: MarketplaceProductVariation[] = await getRepository(MarketplaceProductVariation).find({
|
|
18
|
+
where: { domain: companyDomain },
|
|
19
|
+
relations: [
|
|
20
|
+
'marketplaceProduct',
|
|
21
|
+
'marketplaceProduct.marketplaceStore',
|
|
22
|
+
'marketplaceProduct.marketplaceStore.marketplaceDistributors',
|
|
23
|
+
'creator',
|
|
24
|
+
'updater'
|
|
25
|
+
]
|
|
26
|
+
})
|
|
27
|
+
|
|
28
|
+
for (var i = 0; i < productVariations.length; i++) {
|
|
29
|
+
const productVariation: MarketplaceProductVariation = productVariations[i]
|
|
30
|
+
|
|
31
|
+
const sku: string = productVariation.sku
|
|
32
|
+
|
|
33
|
+
let warehouseProductQty: number = 0
|
|
34
|
+
if (sku) {
|
|
35
|
+
const fulfilmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
|
|
36
|
+
const centerId: string = fulfilmentCenter.centerId
|
|
37
|
+
const warehouseDomain: Domain = await getRepository(Domain).findOne({ where: { subdomain: centerId } })
|
|
38
|
+
const product: Product = await getRepository(Product).findOne({ where: { domain: companyDomain, sku } })
|
|
39
|
+
const qb: SelectQueryBuilder<Inventory> = await getRepository(Inventory).createQueryBuilder('INV')
|
|
40
|
+
qb.select('SUM(INV.qty - INV.locked_qty)', 'remainQty')
|
|
41
|
+
.where('"INV"."domain_id" = :domainId', { domainId: warehouseDomain.id })
|
|
42
|
+
.andWhere('"INV"."product_id" = :productId', { productId: product.id })
|
|
43
|
+
.andWhere('"INV"."status" = :invStatus', { invStatus: 'STORED' })
|
|
44
|
+
.groupBy('"INV".product_id')
|
|
45
|
+
|
|
46
|
+
const item: any = await qb.getRawOne()
|
|
47
|
+
if (item) warehouseProductQty += parseFloat(item.remainQty) || 0
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
const marketplaceStore = productVariation?.marketplaceProduct?.marketplaceStore
|
|
51
|
+
const hasVariation = productVariation?.marketplaceProduct?.hasVariation
|
|
52
|
+
|
|
53
|
+
if (marketplaceStore) {
|
|
54
|
+
//Lazada Product quantity data update -> {sku, qty}
|
|
55
|
+
//Shopee Product quantity data update -> variation = false: {itemId, qty} | variation = true: {itemId, variationId, qty}
|
|
56
|
+
|
|
57
|
+
const productVariationQty: number = productVariation.qty || 0
|
|
58
|
+
const productVariationReserveQty: number = productVariation.reserveQty || 0
|
|
59
|
+
|
|
60
|
+
let adjustQty =
|
|
61
|
+
productVariationQty == warehouseProductQty
|
|
62
|
+
? productVariationQty - productVariationReserveQty
|
|
63
|
+
: warehouseProductQty - productVariationReserveQty
|
|
64
|
+
let productVariationLocationId = productVariation.locationId
|
|
65
|
+
if (marketplaceStore.platform === 'SHOPIFY') {
|
|
66
|
+
adjustQty = productVariationReserveQty
|
|
67
|
+
|
|
68
|
+
let locationIds: any[] = JSON.parse(productVariationLocationId)
|
|
69
|
+
productVariationLocationId = locationIds[0].location_id
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
if (hasVariation) {
|
|
73
|
+
await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
|
|
74
|
+
{
|
|
75
|
+
itemId: productVariation.marketplaceProduct.itemId,
|
|
76
|
+
variationId: productVariation.variationId,
|
|
77
|
+
qty: adjustQty,
|
|
78
|
+
locationId: productVariationLocationId,
|
|
79
|
+
inventoryItemId: productVariation.inventoryItemId
|
|
80
|
+
}
|
|
81
|
+
])
|
|
82
|
+
} else {
|
|
83
|
+
await StoreAPI.updateStoreProductStock(marketplaceStore, [
|
|
84
|
+
{
|
|
85
|
+
itemId: productVariation.marketplaceProduct.itemId,
|
|
86
|
+
variationId: productVariation.variationId,
|
|
87
|
+
variationSku: productVariation.variationSku,
|
|
88
|
+
qty: adjustQty,
|
|
89
|
+
distributors: marketplaceStore.marketplaceDistributors
|
|
90
|
+
}
|
|
91
|
+
])
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
return true
|
|
97
|
+
} catch (ex) {}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { addReleaseOrderResolver } from './add-release-order'
|
|
2
2
|
import { autoAddReleaseOrderResolver } from './auto-add-release-order'
|
|
3
|
+
import { autoUpdateAllMarketplaceProductVariationQuantityResolver } from './auto-update-all-marketplace-product-variation-quantity'
|
|
3
4
|
import { generateReplenishmentOrderResolver } from './generate-replenishment-order'
|
|
4
5
|
import { warehouseMarketplaceProduct, warehouseMarketplaceProductsResolver } from './warehouse-marketplace-products'
|
|
5
6
|
|
|
@@ -10,7 +11,8 @@ export const Query = {
|
|
|
10
11
|
export const Mutation = {
|
|
11
12
|
...addReleaseOrderResolver,
|
|
12
13
|
...autoAddReleaseOrderResolver,
|
|
13
|
-
...generateReplenishmentOrderResolver
|
|
14
|
+
...generateReplenishmentOrderResolver,
|
|
15
|
+
...autoUpdateAllMarketplaceProductVariationQuantityResolver
|
|
14
16
|
}
|
|
15
17
|
|
|
16
18
|
export { warehouseMarketplaceProduct }
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import { EntityManager } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { User } from '@things-factory/auth-base'
|
|
2
4
|
import { Bizplace, getCompanyBizplace, getMyBizplace } from '@things-factory/biz-base'
|
|
3
5
|
import { Product } from '@things-factory/product-base'
|
|
4
6
|
import { Domain, ListParam } from '@things-factory/shell'
|
|
5
|
-
import { EntityManager } from 'typeorm'
|
|
6
7
|
|
|
7
8
|
export const warehouseMarketplaceProductsResolver = {
|
|
8
9
|
async warehouseMarketplaceProducts(_: any, params: ListParam, context: any): Promise<any> {
|
|
@@ -71,7 +72,7 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
|
|
|
71
72
|
select "dt"."marketplace_store_id", "dt"."product_id", "dt"."sku", array_agg(row_to_json(dt)) as product_variation
|
|
72
73
|
from (
|
|
73
74
|
select "mp"."marketplace_store_id" as "marketplace_store_id", "mpv"."sku", "mpv"."id" as "marketplace_product_variation_id",
|
|
74
|
-
concat("mpv"."variation_sku", ' (', "mpv"."name", ')') as "name", "mpv"."qty" as "qty",
|
|
75
|
+
concat("mpv"."variation_sku", ' (', "mpv"."name", ')') as "name", "mpv"."qty" as "qty", "mpv"."reserve_qty" as "reserve_qty",
|
|
75
76
|
"Product"."product_id" AS "product_id"
|
|
76
77
|
from marketplace_product_variations "mpv"
|
|
77
78
|
inner join marketplace_products "mp" on "mp"."id" = "mpv"."marketplace_product_id"
|
|
@@ -164,7 +165,8 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
|
|
|
164
165
|
return {
|
|
165
166
|
id: variation.marketplace_product_variation_id,
|
|
166
167
|
name: variation.name,
|
|
167
|
-
qty: variation.qty
|
|
168
|
+
qty: variation.qty,
|
|
169
|
+
reserveQty: variation.reserve_qty
|
|
168
170
|
}
|
|
169
171
|
})
|
|
170
172
|
}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
+
import { NewStockReplenishment } from './new-stock-replenishment'
|
|
2
|
+
import { ReplenishmentOrderProduct } from './replenishment-order-product'
|
|
3
|
+
import { StockReplenishment } from './stock-replenishment'
|
|
4
|
+
import { StockReplenishmentList } from './stock-replenishment-list'
|
|
1
5
|
import { WarehouseInventory } from './warehouse-inventory'
|
|
2
6
|
import { WarehouseMarketplaceProduct } from './warehouse-marketplace-product'
|
|
3
7
|
import { WarehouseMarketplaceProductList } from './warehouse-marketplace-product-list'
|
|
4
|
-
import { StockReplenishment } from './stock-replenishment'
|
|
5
|
-
import { NewStockReplenishment } from './new-stock-replenishment'
|
|
6
|
-
import { StockReplenishmentList } from './stock-replenishment-list'
|
|
7
|
-
import { ReplenishmentOrderProduct } from './replenishment-order-product'
|
|
8
8
|
|
|
9
9
|
export const Mutation = /* GraphQL */ `
|
|
10
10
|
addReleaseOrder(marketplaceOrderIds: [String]!, warehouseId: String!): Boolean @transaction
|
|
11
11
|
autoAddReleaseOrder(warehouseId: String): Boolean @transaction
|
|
12
12
|
generateReplenishmentOrder(stockReplenishmentId: String!, warehouseId: String!): StockReplenishment @transaction
|
|
13
|
+
autoUpdateAllMarketplaceProductVariationQuantity(companyDomainId: String, warehouseId: String): Boolean @transaction
|
|
13
14
|
`
|
|
14
15
|
|
|
15
16
|
export const Query = /* GraphQL */ `
|
|
@@ -49,8 +49,12 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
49
49
|
const resp = {
|
|
50
50
|
Status: 'ERROR',
|
|
51
51
|
Code: 302,
|
|
52
|
-
Message: 'Validate failed'
|
|
52
|
+
Message: 'Validate failed',
|
|
53
|
+
OrderNo: extOrderNo,
|
|
54
|
+
ExtOrderNo: extOrderNo,
|
|
55
|
+
TrackingNo: trackingNo
|
|
53
56
|
}
|
|
57
|
+
context.type = 'application/json'
|
|
54
58
|
context.body = JSON.stringify(resp)
|
|
55
59
|
return
|
|
56
60
|
}
|
|
@@ -91,8 +95,12 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
91
95
|
const resp = {
|
|
92
96
|
Status: 'SUCCESS',
|
|
93
97
|
Code: 200,
|
|
94
|
-
Message: 'Updated'
|
|
98
|
+
Message: 'Updated',
|
|
99
|
+
OrderNo: order.orderNo,
|
|
100
|
+
ExtOrderNo: extOrderNo,
|
|
101
|
+
TrackingNo: trackingNo
|
|
95
102
|
}
|
|
103
|
+
context.type = 'application/json'
|
|
96
104
|
context.body = JSON.stringify(resp)
|
|
97
105
|
//let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
|
|
98
106
|
//await orderItemRepo.save(orderItem)
|
package/translations/en.json
CHANGED
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
"field.grand_total": "grand total",
|
|
67
67
|
"field.import_cargo": "import cargo",
|
|
68
68
|
"field.isku": "ISKU",
|
|
69
|
+
"field.is_splitted": "splitted",
|
|
69
70
|
"field.item_count": "item count",
|
|
70
71
|
"field.item_price_credit": "item price credit",
|
|
71
72
|
"field.item": "item",
|
|
@@ -113,6 +114,7 @@
|
|
|
113
114
|
"field.required_branch": "required branch",
|
|
114
115
|
"field.required_sender": "required sender",
|
|
115
116
|
"field.required_tracking": "required tracking",
|
|
117
|
+
"field.reserve_qty": "reserve qty",
|
|
116
118
|
"field.ro_created": "ro created",
|
|
117
119
|
"field.save": "save",
|
|
118
120
|
"field.seller_shipping_fee_voucher": "seller shipping fee voucher",
|
|
@@ -151,6 +153,7 @@
|
|
|
151
153
|
"field.variation_marketplace_status": "variation marketplace status",
|
|
152
154
|
"field.variation_name": "variation name",
|
|
153
155
|
"field.variation_qty": "variation qty",
|
|
156
|
+
"field.variation_reserve_qty": "variation reserve qty",
|
|
154
157
|
"field.variation_selling_price": "variation selling price",
|
|
155
158
|
"field.variation_sku": "variation sku",
|
|
156
159
|
"field.variation_uom_value": "variation uom value",
|
package/translations/ko.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"field.service_fee": "[ko] service fee",
|
|
7
7
|
"field.transaction_fee": "[ko] transaction fee",
|
|
8
8
|
"field.total_released_amt": "[ko] total release amt",
|
|
9
|
-
"field.voucher_code": "[ko] voucher code",
|
|
9
|
+
"field.voucher_code": "[ko] voucher code",
|
|
10
10
|
"field.comission_fee": "[ko] comission fee",
|
|
11
11
|
"field.fulfilment_center": "[ko] fulfilment center",
|
|
12
12
|
"button.add_product": "[ko] add product",
|
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
"field.grand_total": "[ko] grand total",
|
|
67
67
|
"field.import_cargo": "[ko] import cargo",
|
|
68
68
|
"field.isku": "[ko] ISKU",
|
|
69
|
+
"field.is_splitted": "[ko] splitted",
|
|
69
70
|
"field.item_count": "[ko] item count",
|
|
70
71
|
"field.item_price_credit": "[ko] item price credit",
|
|
71
72
|
"field.item": "[ko] item",
|
|
@@ -113,6 +114,7 @@
|
|
|
113
114
|
"field.required_branch": "[ko] required branch",
|
|
114
115
|
"field.required_sender": "[ko] required sender",
|
|
115
116
|
"field.required_tracking": "[ko] required tracking",
|
|
117
|
+
"field.reserve_qty": "[ko] reserve qty",
|
|
116
118
|
"field.ro_created": "[ko] ro created",
|
|
117
119
|
"field.save": "[ko] save",
|
|
118
120
|
"field.seller_shipping_fee_voucher": "[ko] seller shipping fee voucher",
|
|
@@ -150,6 +152,7 @@
|
|
|
150
152
|
"field.variation_marketplace_status": "[ko] variation marketplace status",
|
|
151
153
|
"field.variation_name": "[ko] variation name",
|
|
152
154
|
"field.variation_qty": "[ko] variation qty",
|
|
155
|
+
"field.variation_reserve_qty": "[ko] variation reserve qty",
|
|
153
156
|
"field.variation_selling_price": "[ko] variation selling price",
|
|
154
157
|
"field.variation_sku": "[ko] variation sku",
|
|
155
158
|
"field.variation_uom_value": "[ko] variation uom value",
|
package/translations/ms.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"field.service_fee": "[ms] service fee",
|
|
7
7
|
"field.transaction_fee": "[ms] transaction fee",
|
|
8
8
|
"field.total_released_amt": "[ms] total release amt",
|
|
9
|
-
"field.voucher_code": "[ms] voucher code",
|
|
9
|
+
"field.voucher_code": "[ms] voucher code",
|
|
10
10
|
"field.comission_fee": "[ms] comission fee",
|
|
11
11
|
"field.fulfilment_center": "[ms] fulfilment center",
|
|
12
12
|
"button.add_product": "[ms] add product",
|
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
"field.grand_total": "[ms] grand total",
|
|
67
67
|
"field.import_cargo": "[ms] import cargo",
|
|
68
68
|
"field.isku": "[ms] ISKU",
|
|
69
|
+
"field.is_splitted": "[ms] splitted",
|
|
69
70
|
"field.item_count": "[ms] item count",
|
|
70
71
|
"field.item_price_credit": "[ms] item price credit",
|
|
71
72
|
"field.item": "[ms] item",
|
|
@@ -113,6 +114,7 @@
|
|
|
113
114
|
"field.required_branch": "[ms] required branch",
|
|
114
115
|
"field.required_sender": "[ms] required sender",
|
|
115
116
|
"field.required_tracking": "[ms] required tracking",
|
|
117
|
+
"field.reserve_qty": "[ms] reserve qty",
|
|
116
118
|
"field.ro_created": "[ms] ro created",
|
|
117
119
|
"field.save": "[ms] save",
|
|
118
120
|
"field.seller_shipping_fee_voucher": "[ms] seller shipping fee voucher",
|
|
@@ -150,6 +152,7 @@
|
|
|
150
152
|
"field.variation_marketplace_status": "[ms] variation marketplace status",
|
|
151
153
|
"field.variation_name": "[ms] variation name",
|
|
152
154
|
"field.variation_qty": "[ms] variation qty",
|
|
155
|
+
"field.variation_reserve_qty": "[ms] variation reserve qty",
|
|
153
156
|
"field.variation_selling_price": "[ms] variation selling price",
|
|
154
157
|
"field.variation_sku": "[ms] variation sku",
|
|
155
158
|
"field.variation_uom_value": "[ms] variation uom value",
|
package/translations/zh.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"field.service_fee": "[zh] service fee",
|
|
7
7
|
"field.transaction_fee": "[zh] transaction fee",
|
|
8
8
|
"field.total_released_amt": "[zh] total release amt",
|
|
9
|
-
"field.voucher_code": "[zh] voucher code",
|
|
9
|
+
"field.voucher_code": "[zh] voucher code",
|
|
10
10
|
"field.comission_fee": "[zh] comission fee",
|
|
11
11
|
"field.fulfilment_center": "[zh] fulfilment center",
|
|
12
12
|
"button.add_product": "[zh] add product",
|
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
"field.grand_total": "[zh] grand total",
|
|
67
67
|
"field.import_cargo": "[zh] import cargo",
|
|
68
68
|
"field.isku": "[zh] ISKU",
|
|
69
|
+
"field.is_splitted": "[zh] splitted",
|
|
69
70
|
"field.item_count": "[zh] item count",
|
|
70
71
|
"field.item_price_credit": "[zh] item price credit",
|
|
71
72
|
"field.item": "[zh] item",
|
|
@@ -113,6 +114,7 @@
|
|
|
113
114
|
"field.required_branch": "[zh] required branch",
|
|
114
115
|
"field.required_sender": "[zh] required sender",
|
|
115
116
|
"field.required_tracking": "[zh] required tracking",
|
|
117
|
+
"field.reserve_qty": "[zh] reserve qty",
|
|
116
118
|
"field.ro_created": "[zh] ro created",
|
|
117
119
|
"field.save": "[zh] save",
|
|
118
120
|
"field.seller_shipping_fee_voucher": "[zh] seller shipping fee voucher",
|
|
@@ -150,6 +152,7 @@
|
|
|
150
152
|
"field.variation_marketplace_status": "[zh] variation marketplace status",
|
|
151
153
|
"field.variation_name": "[zh] variation name",
|
|
152
154
|
"field.variation_qty": "[zh] variation qty",
|
|
155
|
+
"field.variation_reserve_qty": "[zh] variation reserve qty",
|
|
153
156
|
"field.variation_selling_price": "[zh] variation selling price",
|
|
154
157
|
"field.variation_sku": "[zh] variation sku",
|
|
155
158
|
"field.variation_uom_value": "[zh] variation uom value",
|
package/config.development.js
DELETED
|
@@ -1,88 +0,0 @@
|
|
|
1
|
-
module.exports = {
|
|
2
|
-
domainType: 'company',
|
|
3
|
-
ormconfig: {
|
|
4
|
-
name: 'default',
|
|
5
|
-
type: 'sqlite',
|
|
6
|
-
database: 'db.sqlite',
|
|
7
|
-
synchronize: false,
|
|
8
|
-
logging: true,
|
|
9
|
-
logger: 'debug'
|
|
10
|
-
// name: 'default',
|
|
11
|
-
// type: 'postgres',
|
|
12
|
-
// database: 'postgres',
|
|
13
|
-
// username: 'postgres',
|
|
14
|
-
// password: 'abcd1234',
|
|
15
|
-
// host: 'localhost',
|
|
16
|
-
// port: 15432,
|
|
17
|
-
// synchronize: true,
|
|
18
|
-
// logging: true
|
|
19
|
-
},
|
|
20
|
-
oauth2: {
|
|
21
|
-
platforms: [
|
|
22
|
-
{
|
|
23
|
-
name: 'Operato Hub',
|
|
24
|
-
apiURL: 'http://operato-m.localhost:3000/api'
|
|
25
|
-
}
|
|
26
|
-
]
|
|
27
|
-
},
|
|
28
|
-
useVirtualHostBasedDomain: false,
|
|
29
|
-
port: 5000,
|
|
30
|
-
uploads: 'uploads',
|
|
31
|
-
attachmentsPath: 'attachments',
|
|
32
|
-
SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
|
|
33
|
-
logger: {
|
|
34
|
-
file: {
|
|
35
|
-
filename: 'logs/application-%DATE%.log',
|
|
36
|
-
datePattern: 'YYYY-MM-DD-HH',
|
|
37
|
-
zippedArchive: true,
|
|
38
|
-
maxSize: '200m',
|
|
39
|
-
maxFiles: '1m',
|
|
40
|
-
level: 'info'
|
|
41
|
-
}
|
|
42
|
-
},
|
|
43
|
-
fulfillmentIntegrationOperato: {
|
|
44
|
-
host: 'operatohub.com',
|
|
45
|
-
platform: 'operato',
|
|
46
|
-
application: 'Operato MMS',
|
|
47
|
-
appKey: '480d19cbfb0655357878119559d47333',
|
|
48
|
-
appSecret: 'dc5078bc17d50a18ef6fc3188934bbbd',
|
|
49
|
-
callback: 'https://www.myoperato.com/callback-operato'
|
|
50
|
-
},
|
|
51
|
-
marketplaceIntegrationShopee: {
|
|
52
|
-
platform: 'shopee',
|
|
53
|
-
isUAT: false,
|
|
54
|
-
application: 'Operato MMS',
|
|
55
|
-
partnerId: 846025,
|
|
56
|
-
partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
|
|
57
|
-
},
|
|
58
|
-
marketplaceIntegrationLazada: {
|
|
59
|
-
platform: 'lazada',
|
|
60
|
-
application: 'operato-mms',
|
|
61
|
-
appKey: '120961',
|
|
62
|
-
appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
|
|
63
|
-
callback: 'https://myoperato.com/lazada-callback'
|
|
64
|
-
},
|
|
65
|
-
notification: {
|
|
66
|
-
fcm: {
|
|
67
|
-
serviceAccount: {
|
|
68
|
-
project_id: 'operato',
|
|
69
|
-
private_key:
|
|
70
|
-
'-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
|
|
71
|
-
client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
|
|
72
|
-
},
|
|
73
|
-
appConfig: {
|
|
74
|
-
apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
|
|
75
|
-
projectId: 'operato',
|
|
76
|
-
messagingSenderId: 79537064975,
|
|
77
|
-
appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
|
|
78
|
-
},
|
|
79
|
-
serverKey:
|
|
80
|
-
'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
|
|
81
|
-
},
|
|
82
|
-
vapidKey: {
|
|
83
|
-
subject: 'mailto:heartyoh@hatiolab.com',
|
|
84
|
-
publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
|
|
85
|
-
privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
}
|