@things-factory/operato-mms 4.0.27 → 4.0.31
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/pages/inventory/inventory-by-product.js +17 -4
- 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/routers/etrax-router.js +8 -2
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/package.json +61 -61
- package/server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.ts +5 -3
- package/server/routers/etrax-router.ts +8 -2
- package/translations/en.json +1 -0
- package/translations/ko.json +1 -0
- package/translations/ms.json +1 -0
- package/translations/zh.json +1 -0
|
@@ -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 = {
|
|
@@ -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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"}
|
|
@@ -45,7 +45,10 @@ 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
|
};
|
|
50
53
|
context.type = 'application/json';
|
|
51
54
|
context.body = JSON.stringify(resp);
|
|
@@ -79,7 +82,10 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
79
82
|
const resp = {
|
|
80
83
|
Status: 'SUCCESS',
|
|
81
84
|
Code: 200,
|
|
82
|
-
Message: 'Updated'
|
|
85
|
+
Message: 'Updated',
|
|
86
|
+
OrderNo: order.orderNo,
|
|
87
|
+
ExtOrderNo: extOrderNo,
|
|
88
|
+
TrackingNo: trackingNo
|
|
83
89
|
};
|
|
84
90
|
context.type = 'application/json';
|
|
85
91
|
context.body = JSON.stringify(resp);
|
|
@@ -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.31",
|
|
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.3.
|
|
45
|
-
"@operato/scene-chartjs": "^0.1.
|
|
46
|
-
"@operato/scene-clock": "^0.1.
|
|
47
|
-
"@operato/scene-clone": "^0.1.
|
|
48
|
-
"@operato/scene-compass": "^0.1.
|
|
49
|
-
"@operato/scene-gauge": "^0.1.
|
|
50
|
-
"@operato/scene-grist": "^0.1.
|
|
51
|
-
"@operato/scene-indoor-map": "^0.1.
|
|
52
|
-
"@operato/scene-integration": "^0.1.
|
|
53
|
-
"@operato/scene-legend": "^0.1.
|
|
54
|
-
"@operato/scene-progressbar": "^0.1.
|
|
55
|
-
"@operato/scene-random": "^0.1.
|
|
56
|
-
"@operato/scene-switch": "^0.1.
|
|
57
|
-
"@operato/scene-tab": "^0.1.
|
|
58
|
-
"@operato/scene-table": "^0.1.
|
|
59
|
-
"@operato/scene-timer": "^0.1.
|
|
60
|
-
"@operato/scene-wheel-sorter": "^0.1.
|
|
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.7",
|
|
45
|
+
"@operato/scene-chartjs": "^0.1.2",
|
|
46
|
+
"@operato/scene-clock": "^0.1.2",
|
|
47
|
+
"@operato/scene-clone": "^0.1.2",
|
|
48
|
+
"@operato/scene-compass": "^0.1.2",
|
|
49
|
+
"@operato/scene-gauge": "^0.1.2",
|
|
50
|
+
"@operato/scene-grist": "^0.1.2",
|
|
51
|
+
"@operato/scene-indoor-map": "^0.1.2",
|
|
52
|
+
"@operato/scene-integration": "^0.1.2",
|
|
53
|
+
"@operato/scene-legend": "^0.1.2",
|
|
54
|
+
"@operato/scene-progressbar": "^0.1.2",
|
|
55
|
+
"@operato/scene-random": "^0.1.2",
|
|
56
|
+
"@operato/scene-switch": "^0.1.2",
|
|
57
|
+
"@operato/scene-tab": "^0.1.2",
|
|
58
|
+
"@operato/scene-table": "^0.1.2",
|
|
59
|
+
"@operato/scene-timer": "^0.1.2",
|
|
60
|
+
"@operato/scene-wheel-sorter": "^0.1.2",
|
|
61
|
+
"@things-factory/apptool-ui": "^4.0.31",
|
|
62
|
+
"@things-factory/attachment-base": "^4.0.31",
|
|
63
|
+
"@things-factory/auth-ui": "^4.0.31",
|
|
64
|
+
"@things-factory/biz-base": "^4.0.31",
|
|
65
|
+
"@things-factory/board-service": "^4.0.31",
|
|
66
|
+
"@things-factory/board-ui": "^4.0.31",
|
|
67
|
+
"@things-factory/code-ui": "^4.0.31",
|
|
68
|
+
"@things-factory/context-ui": "^4.0.31",
|
|
69
|
+
"@things-factory/dashboard": "^4.0.31",
|
|
70
|
+
"@things-factory/export-ui": "^4.0.31",
|
|
71
|
+
"@things-factory/export-ui-csv": "^4.0.31",
|
|
72
|
+
"@things-factory/export-ui-excel": "^4.0.31",
|
|
73
|
+
"@things-factory/geography": "^4.0.31",
|
|
74
|
+
"@things-factory/grist-ui": "^4.0.31",
|
|
75
|
+
"@things-factory/help": "^4.0.31",
|
|
76
|
+
"@things-factory/i18n-ui": "^4.0.31",
|
|
77
|
+
"@things-factory/integration-fulfillment": "^4.0.31",
|
|
78
|
+
"@things-factory/integration-lmd": "^4.0.31",
|
|
79
|
+
"@things-factory/lite-menu": "^4.0.31",
|
|
80
|
+
"@things-factory/marketplace-base": "^4.0.31",
|
|
81
|
+
"@things-factory/more-ui": "^4.0.31",
|
|
82
|
+
"@things-factory/notification": "^4.0.31",
|
|
83
|
+
"@things-factory/oauth2-client": "^4.0.31",
|
|
84
|
+
"@things-factory/pdf": "^4.0.31",
|
|
85
|
+
"@things-factory/product-base": "^4.0.31",
|
|
86
|
+
"@things-factory/resource-ui": "^4.0.31",
|
|
87
|
+
"@things-factory/scene-data-transform": "^4.0.31",
|
|
88
|
+
"@things-factory/scene-excel": "^4.0.31",
|
|
89
|
+
"@things-factory/scene-firebase": "^4.0.31",
|
|
90
|
+
"@things-factory/scene-form": "^4.0.31",
|
|
91
|
+
"@things-factory/scene-google-map": "^4.0.31",
|
|
92
|
+
"@things-factory/scene-graphql": "^4.0.31",
|
|
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.31",
|
|
95
|
+
"@things-factory/scene-marker": "^4.0.31",
|
|
96
|
+
"@things-factory/scene-mqtt": "^4.0.31",
|
|
97
|
+
"@things-factory/scene-news-ticker": "^4.0.31",
|
|
98
|
+
"@things-factory/scene-restful": "^4.0.31",
|
|
99
|
+
"@things-factory/scene-visualizer": "^4.0.31",
|
|
100
|
+
"@things-factory/setting-ui": "^4.0.31",
|
|
101
|
+
"@things-factory/system-ui": "^4.0.31",
|
|
102
|
+
"@things-factory/warehouse-base": "^4.0.31"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
|
-
"@things-factory/builder": "^4.0.
|
|
105
|
+
"@things-factory/builder": "^4.0.31",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "6c021ffdeacc9d123298528f6bba91f61389f33d"
|
|
109
109
|
}
|
|
@@ -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
|
}
|
|
@@ -49,7 +49,10 @@ 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
|
}
|
|
54
57
|
context.type = 'application/json'
|
|
55
58
|
context.body = JSON.stringify(resp)
|
|
@@ -92,7 +95,10 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
92
95
|
const resp = {
|
|
93
96
|
Status: 'SUCCESS',
|
|
94
97
|
Code: 200,
|
|
95
|
-
Message: 'Updated'
|
|
98
|
+
Message: 'Updated',
|
|
99
|
+
OrderNo: order.orderNo,
|
|
100
|
+
ExtOrderNo: extOrderNo,
|
|
101
|
+
TrackingNo: trackingNo
|
|
96
102
|
}
|
|
97
103
|
context.type = 'application/json'
|
|
98
104
|
context.body = JSON.stringify(resp)
|
package/translations/en.json
CHANGED
|
@@ -114,6 +114,7 @@
|
|
|
114
114
|
"field.required_branch": "required branch",
|
|
115
115
|
"field.required_sender": "required sender",
|
|
116
116
|
"field.required_tracking": "required tracking",
|
|
117
|
+
"field.reserve_qty": "reserve qty",
|
|
117
118
|
"field.ro_created": "ro created",
|
|
118
119
|
"field.save": "save",
|
|
119
120
|
"field.seller_shipping_fee_voucher": "seller shipping fee voucher",
|
package/translations/ko.json
CHANGED
|
@@ -114,6 +114,7 @@
|
|
|
114
114
|
"field.required_branch": "[ko] required branch",
|
|
115
115
|
"field.required_sender": "[ko] required sender",
|
|
116
116
|
"field.required_tracking": "[ko] required tracking",
|
|
117
|
+
"field.reserve_qty": "[ko] reserve qty",
|
|
117
118
|
"field.ro_created": "[ko] ro created",
|
|
118
119
|
"field.save": "[ko] save",
|
|
119
120
|
"field.seller_shipping_fee_voucher": "[ko] seller shipping fee voucher",
|
package/translations/ms.json
CHANGED
|
@@ -114,6 +114,7 @@
|
|
|
114
114
|
"field.required_branch": "[ms] required branch",
|
|
115
115
|
"field.required_sender": "[ms] required sender",
|
|
116
116
|
"field.required_tracking": "[ms] required tracking",
|
|
117
|
+
"field.reserve_qty": "[ms] reserve qty",
|
|
117
118
|
"field.ro_created": "[ms] ro created",
|
|
118
119
|
"field.save": "[ms] save",
|
|
119
120
|
"field.seller_shipping_fee_voucher": "[ms] seller shipping fee voucher",
|
package/translations/zh.json
CHANGED
|
@@ -114,6 +114,7 @@
|
|
|
114
114
|
"field.required_branch": "[zh] required branch",
|
|
115
115
|
"field.required_sender": "[zh] required sender",
|
|
116
116
|
"field.required_tracking": "[zh] required tracking",
|
|
117
|
+
"field.reserve_qty": "[zh] reserve qty",
|
|
117
118
|
"field.ro_created": "[zh] ro created",
|
|
118
119
|
"field.save": "[zh] save",
|
|
119
120
|
"field.seller_shipping_fee_voucher": "[zh] seller shipping fee voucher",
|