@things-factory/operato-mms 3.7.14 → 3.8.2

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.
Files changed (38) hide show
  1. package/client/pages/order/logistics/lazada-order-init-batch-popup.js +1 -2
  2. package/client/pages/order/logistics/request-ro-popup.js +69 -4
  3. package/client/pages/order/logistics/shopee-order-init-batch-popup.js +1 -2
  4. package/client/pages/order/order-by-store.js +71 -3
  5. package/client/pages/reports/sales-by-platform/lazada-sales-report.js +186 -61
  6. package/client/pages/setting/marketplace-setting.js +9 -6
  7. package/dist-server/graphql/resolvers/index.js +2 -1
  8. package/dist-server/graphql/resolvers/index.js.map +1 -1
  9. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +3 -1
  10. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
  11. package/dist-server/graphql/resolvers/shipping-provider/index.js +6 -0
  12. package/dist-server/graphql/resolvers/shipping-provider/index.js.map +1 -0
  13. package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js +32 -0
  14. package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js.map +1 -0
  15. package/dist-server/graphql/types/index.js +3 -2
  16. package/dist-server/graphql/types/index.js.map +1 -1
  17. package/dist-server/graphql/types/shipping-provider/index.js +10 -0
  18. package/dist-server/graphql/types/shipping-provider/index.js.map +1 -0
  19. package/dist-server/graphql/types/shipping-provider/shipping-provider-list.js +13 -0
  20. package/dist-server/graphql/types/shipping-provider/shipping-provider-list.js.map +1 -0
  21. package/dist-server/graphql/types/shipping-provider/shipping-provider.js +13 -0
  22. package/dist-server/graphql/types/shipping-provider/shipping-provider.js.map +1 -0
  23. package/dist-server/routers/etrax-router.js +2 -2
  24. package/dist-server/routers/etrax-router.js.map +1 -1
  25. package/package.json +31 -31
  26. package/server/graphql/resolvers/index.ts +2 -1
  27. package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +3 -1
  28. package/server/graphql/resolvers/shipping-provider/index.ts +5 -0
  29. package/server/graphql/resolvers/shipping-provider/shipping-providers.ts +37 -0
  30. package/server/graphql/types/index.ts +3 -2
  31. package/server/graphql/types/shipping-provider/index.ts +8 -0
  32. package/server/graphql/types/shipping-provider/shipping-provider-list.ts +7 -0
  33. package/server/graphql/types/shipping-provider/shipping-provider.ts +7 -0
  34. package/server/routers/etrax-router.ts +2 -2
  35. package/translations/en.json +18 -0
  36. package/translations/ko.json +18 -0
  37. package/translations/ms.json +18 -0
  38. package/translations/zh.json +18 -0
@@ -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,6 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Query = void 0;
4
+ const shipping_providers_1 = require("./shipping-providers");
5
+ exports.Query = Object.assign({}, shipping_providers_1.shippingProviders);
6
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/shipping-provider/index.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AAE3C,QAAA,KAAK,qBACX,sCAAiB,EACvB"}
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.shippingProviders = void 0;
4
+ const typeorm_1 = require("typeorm");
5
+ const marketplace_base_1 = require("@things-factory/marketplace-base");
6
+ exports.shippingProviders = {
7
+ async shippingProviders(_, params, context) {
8
+ try {
9
+ const { domain } = context.state;
10
+ let statusFilter = ``;
11
+ if (params.statuses) {
12
+ statusFilter = `AND status in (${params.statuses.map(e => {
13
+ return `'` + e + `'`;
14
+ })})`;
15
+ }
16
+ let items = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).query(`
17
+ SELECT DISTINCT shipping_provider FROM marketplace_orders WHERE domain_id = '${domain.id}' AND marketplace_store_id = '${params.storeId}' AND shipping_provider IS NOT null AND shipping_provider != ''
18
+ ` + statusFilter);
19
+ items = items.map(e => {
20
+ const { shipping_provider: shippingProvider } = e;
21
+ return {
22
+ shippingProvider
23
+ };
24
+ });
25
+ return { items };
26
+ }
27
+ catch (error) {
28
+ throw error;
29
+ }
30
+ }
31
+ };
32
+ //# sourceMappingURL=shipping-providers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shipping-providers.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/shipping-provider/shipping-providers.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,uEAAmE;AAItD,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;YAEpD,IAAI,YAAY,GAAG,EAAE,CAAA;YACrB,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnB,YAAY,GAAG,kBAAkB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBACvD,OAAO,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;gBACtB,CAAC,CAAC,GAAG,CAAA;aACN;YAED,IAAI,KAAK,GAAU,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAC,KAAK,CAC5D;uFAC+E,MAAM,CAAC,EAAE,iCAAiC,MAAM,CAAC,OAAO;OACxI,GAAG,YAAY,CACf,CAAA;YAED,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBACpB,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAA;gBAEjD,OAAO;oBACL,gBAAgB;iBACjB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,EAAE,KAAK,EAAE,CAAA;SACjB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
@@ -22,7 +22,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
22
22
  exports.types = exports.mutations = exports.queries = void 0;
23
23
  const InterfaceWithHub = __importStar(require("./interface-with-hub"));
24
24
  const WarehouseProduct = __importStar(require("./warehouse-product"));
25
- exports.queries = [InterfaceWithHub.Query];
25
+ const ShippingProvider = __importStar(require("./shipping-provider"));
26
+ exports.queries = [InterfaceWithHub.Query, ShippingProvider.Query];
26
27
  exports.mutations = [InterfaceWithHub.Mutation, WarehouseProduct.Mutation];
27
- exports.types = [...InterfaceWithHub.Types, ...WarehouseProduct.Types];
28
+ exports.types = [...InterfaceWithHub.Types, ...WarehouseProduct.Types, ...ShippingProvider.Types];
28
29
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uEAAwD;AACxD,sEAAuD;AAE1C,QAAA,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;AAElC,QAAA,SAAS,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;AAElE,QAAA,KAAK,GAAG,CAAC,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uEAAwD;AACxD,sEAAuD;AACvD,sEAAuD;AAE1C,QAAA,OAAO,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAA;AAE1D,QAAA,SAAS,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;AAElE,QAAA,KAAK,GAAG,CAAC,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAA"}
@@ -0,0 +1,10 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Types = exports.Query = void 0;
4
+ const shipping_provider_list_1 = require("./shipping-provider-list");
5
+ const shipping_provider_1 = require("./shipping-provider");
6
+ exports.Query = `
7
+ shippingProviders(storeId: String!, statuses: [String]): ShippingProviderList @transaction
8
+ `;
9
+ exports.Types = [shipping_provider_list_1.ShippingProviderList, shipping_provider_1.ShippingProvider];
10
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/shipping-provider/index.ts"],"names":[],"mappings":";;;AAAA,qEAA+D;AAC/D,2DAAsD;AAEzC,QAAA,KAAK,GAAG;;CAEpB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,6CAAoB,EAAE,oCAAgB,CAAC,CAAA"}
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ShippingProviderList = void 0;
7
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
+ exports.ShippingProviderList = (0, graphql_tag_1.default) `
9
+ type ShippingProviderList {
10
+ items: [ShippingProvider]
11
+ }
12
+ `;
13
+ //# sourceMappingURL=shipping-provider-list.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shipping-provider-list.js","sourceRoot":"","sources":["../../../../server/graphql/types/shipping-provider/shipping-provider-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;CAItC,CAAA"}
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ShippingProvider = void 0;
7
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
+ exports.ShippingProvider = (0, graphql_tag_1.default) `
9
+ type ShippingProvider {
10
+ shippingProvider: String
11
+ }
12
+ `;
13
+ //# sourceMappingURL=shipping-provider.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shipping-provider.js","sourceRoot":"","sources":["../../../../server/graphql/types/shipping-provider/shipping-provider.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;CAIlC,CAAA"}
@@ -47,7 +47,7 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
47
47
  Code: 302,
48
48
  Message: 'Validate failed'
49
49
  };
50
- context.response.body = JSON.stringify(resp);
50
+ context.body = JSON.stringify(resp);
51
51
  return;
52
52
  }
53
53
  //TAS - Transporter Assignment Success
@@ -80,7 +80,7 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
80
80
  Code: 200,
81
81
  Message: 'Updated'
82
82
  };
83
- context.response.body = JSON.stringify(resp);
83
+ context.body = JSON.stringify(resp);
84
84
  //let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
85
85
  //await orderItemRepo.save(orderItem)
86
86
  //await orderShippingRepo.save(orderShipping)
@@ -1 +1 @@
1
- {"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
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": "3.7.14",
3
+ "version": "3.8.2",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -42,32 +42,32 @@
42
42
  "@material/mwc-linear-progress": "^0.22.1",
43
43
  "@material/mwc-radio": "^0.22.1",
44
44
  "@operato/ghost-print": "0.1.14",
45
- "@things-factory/apptool-ui": "^3.7.5",
46
- "@things-factory/attachment-base": "^3.7.5",
47
- "@things-factory/auth-ui": "^3.7.7",
48
- "@things-factory/biz-base": "^3.7.5",
49
- "@things-factory/board-service": "^3.7.5",
50
- "@things-factory/board-ui": "^3.7.5",
51
- "@things-factory/code-ui": "^3.7.5",
52
- "@things-factory/context-ui": "^3.7.5",
53
- "@things-factory/dashboard": "^3.7.5",
54
- "@things-factory/export-ui": "^3.7.5",
55
- "@things-factory/export-ui-csv": "^3.7.5",
56
- "@things-factory/export-ui-excel": "^3.7.5",
57
- "@things-factory/geography": "^3.7.5",
45
+ "@things-factory/apptool-ui": "^3.8.0",
46
+ "@things-factory/attachment-base": "^3.8.0",
47
+ "@things-factory/auth-ui": "^3.8.0",
48
+ "@things-factory/biz-base": "^3.8.0",
49
+ "@things-factory/board-service": "^3.8.0",
50
+ "@things-factory/board-ui": "^3.8.0",
51
+ "@things-factory/code-ui": "^3.8.0",
52
+ "@things-factory/context-ui": "^3.8.0",
53
+ "@things-factory/dashboard": "^3.8.0",
54
+ "@things-factory/export-ui": "^3.8.0",
55
+ "@things-factory/export-ui-csv": "^3.8.0",
56
+ "@things-factory/export-ui-excel": "^3.8.0",
57
+ "@things-factory/geography": "^3.8.0",
58
58
  "@things-factory/grist-ui": "^3.7.5",
59
- "@things-factory/help": "^3.7.5",
60
- "@things-factory/i18n-ui": "^3.7.5",
61
- "@things-factory/integration-fulfillment": "^3.7.7",
62
- "@things-factory/integration-lmd": "^3.7.11",
63
- "@things-factory/lite-menu": "^3.7.5",
64
- "@things-factory/marketplace-base": "^3.7.11",
65
- "@things-factory/more-ui": "^3.7.5",
66
- "@things-factory/notification": "^3.7.5",
67
- "@things-factory/oauth2-client": "^3.7.5",
59
+ "@things-factory/help": "^3.8.0",
60
+ "@things-factory/i18n-ui": "^3.8.0",
61
+ "@things-factory/integration-fulfillment": "^3.8.0",
62
+ "@things-factory/integration-lmd": "^3.8.0",
63
+ "@things-factory/lite-menu": "^3.8.0",
64
+ "@things-factory/marketplace-base": "^3.8.0",
65
+ "@things-factory/more-ui": "^3.8.0",
66
+ "@things-factory/notification": "^3.8.0",
67
+ "@things-factory/oauth2-client": "^3.8.0",
68
68
  "@things-factory/pdf": "^3.7.5",
69
- "@things-factory/product-base": "^3.7.14",
70
- "@things-factory/resource-ui": "^3.7.7",
69
+ "@things-factory/product-base": "^3.8.1",
70
+ "@things-factory/resource-ui": "^3.8.0",
71
71
  "@things-factory/scene-chartjs": "^3.7.5",
72
72
  "@things-factory/scene-clock": "^3.7.5",
73
73
  "@things-factory/scene-clone": "^3.7.5",
@@ -79,11 +79,11 @@
79
79
  "@things-factory/scene-gauge": "^3.7.5",
80
80
  "@things-factory/scene-google-map": "^3.7.5",
81
81
  "@things-factory/scene-graphql": "^3.7.5",
82
- "@things-factory/scene-grist": "^3.7.5",
82
+ "@things-factory/scene-grist": "^3.8.0",
83
83
  "@things-factory/scene-half-roundrect": "^3.7.5",
84
84
  "@things-factory/scene-indoor-map": "^3.7.5",
85
85
  "@things-factory/scene-integration": "^3.7.5",
86
- "@things-factory/scene-label": "^3.7.7",
86
+ "@things-factory/scene-label": "^3.8.0",
87
87
  "@things-factory/scene-legend": "^3.7.5",
88
88
  "@things-factory/scene-marker": "^3.7.5",
89
89
  "@things-factory/scene-mqtt": "^3.7.5",
@@ -97,13 +97,13 @@
97
97
  "@things-factory/scene-timer": "^3.7.5",
98
98
  "@things-factory/scene-visualizer": "^3.7.5",
99
99
  "@things-factory/scene-wheel-sorter": "^3.7.5",
100
- "@things-factory/setting-ui": "^3.7.5",
101
- "@things-factory/system-ui": "^3.7.5",
102
- "@things-factory/warehouse-base": "^3.7.14"
100
+ "@things-factory/setting-ui": "^3.8.0",
101
+ "@things-factory/system-ui": "^3.8.0",
102
+ "@things-factory/warehouse-base": "^3.8.2"
103
103
  },
104
104
  "devDependencies": {
105
105
  "@things-factory/builder": "^3.7.5",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "b8736fcc7bbaa2102e70b4f4ab1c409743e2eb6c"
108
+ "gitHead": "d2f935bdad2321ef93780978e593157ef0c1eb52"
109
109
  }
@@ -1,6 +1,7 @@
1
1
  import * as InterfaceWithHub from './interface-with-hub'
2
2
  import * as WarehouseProduct from './warehouse-product'
3
+ import * as ShippingProviders from './shipping-provider'
3
4
 
4
- export const queries = [InterfaceWithHub.Query]
5
+ export const queries = [InterfaceWithHub.Query, ShippingProviders.Query]
5
6
 
6
7
  export const mutations = [InterfaceWithHub.Mutation, WarehouseProduct.Mutation]
@@ -17,7 +17,9 @@ export const autoAddReleaseOrderResolver = {
17
17
  .leftJoinAndSelect('MO.marketplaceStore', 'MPS')
18
18
  .where('MO.domain = :domainId', { domainId: domain.id })
19
19
  .andWhere('MO.releaseOrderId IS NULL')
20
- .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled', 'packed'] })
20
+ .andWhere('MO.status IN (:...status)', {
21
+ status: ['ready_to_ship', 'unfulfilled', 'packed', 'processing']
22
+ })
21
23
  .andWhere('MPS.status = :marketplaceStatus', { marketplaceStatus: 'ACTIVE' })
22
24
  .getMany()
23
25
 
@@ -0,0 +1,5 @@
1
+ import { shippingProviders } from './shipping-providers'
2
+
3
+ export const Query = {
4
+ ...shippingProviders
5
+ }
@@ -0,0 +1,37 @@
1
+ import { getRepository } from 'typeorm'
2
+ import { MarketplaceOrder } from '@things-factory/marketplace-base'
3
+
4
+ import { Domain, ListParam } from '@things-factory/shell'
5
+
6
+ export const shippingProviders = {
7
+ async shippingProviders(_: any, params: ListParam, context: any) {
8
+ try {
9
+ const { domain }: { domain: Domain } = context.state
10
+
11
+ let statusFilter = ``
12
+ if (params.statuses) {
13
+ statusFilter = `AND status in (${params.statuses.map(e => {
14
+ return `'` + e + `'`
15
+ })})`
16
+ }
17
+
18
+ let items: any[] = await getRepository(MarketplaceOrder).query(
19
+ `
20
+ SELECT DISTINCT shipping_provider FROM marketplace_orders WHERE domain_id = '${domain.id}' AND marketplace_store_id = '${params.storeId}' AND shipping_provider IS NOT null AND shipping_provider != ''
21
+ ` + statusFilter
22
+ )
23
+
24
+ items = items.map(e => {
25
+ const { shipping_provider: shippingProvider } = e
26
+
27
+ return {
28
+ shippingProvider
29
+ }
30
+ })
31
+
32
+ return { items }
33
+ } catch (error) {
34
+ throw error
35
+ }
36
+ }
37
+ }
@@ -1,8 +1,9 @@
1
1
  import * as InterfaceWithHub from './interface-with-hub'
2
2
  import * as WarehouseProduct from './warehouse-product'
3
+ import * as ShippingProvider from './shipping-provider'
3
4
 
4
- export const queries = [InterfaceWithHub.Query]
5
+ export const queries = [InterfaceWithHub.Query, ShippingProvider.Query]
5
6
 
6
7
  export const mutations = [InterfaceWithHub.Mutation, WarehouseProduct.Mutation]
7
8
 
8
- export const types = [...InterfaceWithHub.Types, ...WarehouseProduct.Types]
9
+ export const types = [...InterfaceWithHub.Types, ...WarehouseProduct.Types, ...ShippingProvider.Types]
@@ -0,0 +1,8 @@
1
+ import { ShippingProviderList } from './shipping-provider-list'
2
+ import { ShippingProvider } from './shipping-provider'
3
+
4
+ export const Query = `
5
+ shippingProviders(storeId: String!, statuses: [String]): ShippingProviderList @transaction
6
+ `
7
+
8
+ export const Types = [ShippingProviderList, ShippingProvider]
@@ -0,0 +1,7 @@
1
+ import gql from 'graphql-tag'
2
+
3
+ export const ShippingProviderList = gql`
4
+ type ShippingProviderList {
5
+ items: [ShippingProvider]
6
+ }
7
+ `
@@ -0,0 +1,7 @@
1
+ import gql from 'graphql-tag'
2
+
3
+ export const ShippingProvider = gql`
4
+ type ShippingProvider {
5
+ shippingProvider: String
6
+ }
7
+ `
@@ -51,7 +51,7 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
51
51
  Code: 302,
52
52
  Message: 'Validate failed'
53
53
  }
54
- context.response.body = JSON.stringify(resp)
54
+ context.body = JSON.stringify(resp)
55
55
  return
56
56
  }
57
57
 
@@ -93,7 +93,7 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
93
93
  Code: 200,
94
94
  Message: 'Updated'
95
95
  }
96
- context.response.body = JSON.stringify(resp)
96
+ context.body = JSON.stringify(resp)
97
97
  //let orderShipping: MarketplaceOrderShipping = orderItemRepo.find({})
98
98
  //await orderItemRepo.save(orderItem)
99
99
  //await orderShippingRepo.save(orderShipping)
@@ -44,6 +44,7 @@
44
44
  "field.actual_shipping_fee": "actual shipping fee",
45
45
  "field.address_id": "address id",
46
46
  "field.assigned_warehouse_sku": "assigned warehouse sku",
47
+ "field.auto_shipping_fee_subsidy_by_lazada": "auto shipping fee subsidy (by lazada)",
47
48
  "field.available_to_purchase": "available to purchase",
48
49
  "field.available": "available",
49
50
  "field.batch_id": "batch no",
@@ -52,6 +53,7 @@
52
53
  "field.buyer_username": "buyer username",
53
54
  "field.channel_sku": "channel sku",
54
55
  "field.city": "city",
56
+ "field.commission_fee": "commission fee",
55
57
  "field.country": "country",
56
58
  "field.criteria": "criteria",
57
59
  "field.date": "date",
@@ -60,11 +62,16 @@
60
62
  "field.ending_on": "ending on",
61
63
  "field.eta_date": "eta date",
62
64
  "field.from_date": "from date",
65
+ "field.fulfillment_partner": "fulfillment partner",
66
+ "field.grand_total": "grand total",
63
67
  "field.import_cargo": "import cargo",
64
68
  "field.isku": "ISKU",
65
69
  "field.item_count": "item count",
70
+ "field.item_price_credit": "item price credit",
66
71
  "field.item": "item",
67
72
  "field.last_updated": "last updated",
73
+ "field.lazada_bonus": "lazada bonus",
74
+ "field.lazada_bonus_lzd_cofund": "lazada bonus - LZD co-fund",
68
75
  "field.marketplace_product_name": "marketplace product name",
69
76
  "field.marketplace_product_sku": "marketplace product sku",
70
77
  "field.name": "name",
@@ -72,6 +79,10 @@
72
79
  "field.on_hold": "on hold",
73
80
  "field.order_created_date": "order created date",
74
81
  "field.order_no": "order no",
82
+ "field.orders_lazada_fees_total": "orders-lazada fees total",
83
+ "field.orders_logistics_total": "orders-logistics total",
84
+ "field.orders_marketing_fees_total": "orders-marketing fees total",
85
+ "field.orders_sales_total": "orders-sales total",
75
86
  "field.original_price": "original price",
76
87
  "field.own_shipping_carrier": "own shipping carrier",
77
88
  "field.own_tracking_no": "own tracking no",
@@ -93,6 +104,8 @@
93
104
  "field.product_units": "product units",
94
105
  "field.product": "product",
95
106
  "field.promotion_id": "promotion ID",
107
+ "field.promotional_charges_flexi_combo": "promotional charges flexi-combo",
108
+ "field.promotional_charges_vouchers": "promotional charges vouchers",
96
109
  "field.qty": "qty",
97
110
  "field.ref_no": "ref no.",
98
111
  "field.refund_amount": "refund amount",
@@ -106,6 +119,9 @@
106
119
  "field.sender": "sender",
107
120
  "field.shipping_carrier": "shipping carrier",
108
121
  "field.shipping_fee_voucher": "shipping fee voucher",
122
+ "field.shipping_fee_paid_by_customer": "shipping fee (paid by customer)",
123
+ "field.shipping_fee_voucher_by_lazada": "shipping fee voucher (by lazada)",
124
+ "field.shipping_fee_voucher_by_seller": "shipping fee voucher (by seller)",
109
125
  "field.shipping_fee": "shipping fee",
110
126
  "field.shipping_provider": "shipping provider",
111
127
  "field.sku_name": "sku name",
@@ -118,6 +134,7 @@
118
134
  "field.stock": "total stock",
119
135
  "field.store_name": "store name",
120
136
  "field.store": "store",
137
+ "field.tax_amount": "tax amount",
121
138
  "field.to_date": "to date",
122
139
  "field.total_amount": "total amount",
123
140
  "field.total_uom_value": "total UOM value",
@@ -137,6 +154,7 @@
137
154
  "field.variation_selling_price": "variation selling price",
138
155
  "field.variation_sku": "variation sku",
139
156
  "field.variation_uom_value": "variation uom value",
157
+ "field.warehouse_sku": "warehouse SKU",
140
158
  "field.zipcode": "zipcode",
141
159
  "label.address_id": "address id",
142
160
  "label.address_info": "address info",
@@ -44,6 +44,7 @@
44
44
  "field.actual_shipping_fee": "[ko] actual shipping fee",
45
45
  "field.address_id": "[ko] address id",
46
46
  "field.assigned_warehouse_sku": "[ko] assigned warehouse sku",
47
+ "field.auto_shipping_fee_subsidy_by_lazada": "[ko] auto shipping fee subsidy (by lazada)",
47
48
  "field.available_to_purchase": "[ko] available to purchase",
48
49
  "field.available": "[ko] available",
49
50
  "field.batch_id": "[ko] batch no",
@@ -53,6 +54,7 @@
53
54
  "field.channel_sku": "[ko] channel sku",
54
55
  "field.city": "[ko] city",
55
56
  "field.country": "[ko] country",
57
+ "field.commission_fee": "[ko] commission fee",
56
58
  "field.criteria": "[ko] criteria",
57
59
  "field.date": "[ko] date",
58
60
  "field.distributor": "[ko] distributor",
@@ -60,11 +62,16 @@
60
62
  "field.ending_on": "[ko] ending on",
61
63
  "field.eta_date": "[ko] eta date",
62
64
  "field.from_date": "[ko] from date",
65
+ "field.fulfillment_partner": "[ko] fulfillment partner",
66
+ "field.grand_total": "[ko] grand total",
63
67
  "field.import_cargo": "[ko] import cargo",
64
68
  "field.isku": "[ko] ISKU",
65
69
  "field.item_count": "[ko] item count",
70
+ "field.item_price_credit": "[ko] item price credit",
66
71
  "field.item": "[ko] item",
67
72
  "field.last_updated": "[ko] last updated",
73
+ "field.lazada_bonus": "[ko] lazada bonus",
74
+ "field.lazada_bonus_lzd_cofund": "[ko] lazada bonus - LZD co-fund",
68
75
  "field.marketplace_product_name": "[ko] marketplace product name",
69
76
  "field.marketplace_product_sku": "[ko] marketplace product sku",
70
77
  "field.name": "[ko] name",
@@ -72,6 +79,10 @@
72
79
  "field.on_hold": "[ko] on hold",
73
80
  "field.order_created_date": "[ko] order created date",
74
81
  "field.order_no": "[ko] order no",
82
+ "field.orders_lazada_fees_total": "[ko] orders-lazada fees total",
83
+ "field.orders_logistics_total": "[ko] orders-logistics total",
84
+ "field.orders_marketing_fees_total": "[ko] orders-marketing fees total",
85
+ "field.orders_sales_total": "[ko] orders-sales total",
75
86
  "field.original_price": "[ko] original price",
76
87
  "field.own_shipping_carrier": "[ko] own shipping carrier",
77
88
  "field.own_tracking_no": "[ko] own tracking no",
@@ -93,6 +104,8 @@
93
104
  "field.product_units": "[ko] product units",
94
105
  "field.product": "[ko] product",
95
106
  "field.promotion_id": "[ko] promotion ID",
107
+ "field.promotional_charges_flexi_combo": "[ko] promotional charges flexi-combo",
108
+ "field.promotional_charges_vouchers": "[ko] promotional charges vouchers",
96
109
  "field.qty": "[ko] qty",
97
110
  "field.ref_no": "[ko] ref no.",
98
111
  "field.refund_amount": "[ko] refund amount",
@@ -106,6 +119,9 @@
106
119
  "field.sender": "[ko] sender",
107
120
  "field.shipping_carrier": "[ko] shipping carrier",
108
121
  "field.shipping_fee_voucher": "[ko] shipping fee voucher",
122
+ "field.shipping_fee_paid_by_customer": "[ko] shipping fee (paid by customer)",
123
+ "field.shipping_fee_voucher_by_lazada": "[ko] shipping fee voucher (by lazada)",
124
+ "field.shipping_fee_voucher_by_seller": "[ko] shipping fee voucher (by seller)",
109
125
  "field.shipping_fee": "[ko] shipping fee",
110
126
  "field.shipping_provider": "[ko] shipping provider",
111
127
  "field.sku_name": "[ko] sku name",
@@ -118,6 +134,7 @@
118
134
  "field.stock": "[ko] total stock",
119
135
  "field.store_name": "[ko] store name",
120
136
  "field.store": "[ko] store",
137
+ "field.tax_amount": "[ko] tax amount",
121
138
  "field.to_date": "[ko] to date",
122
139
  "field.total_amount": "[ko] total amount",
123
140
  "field.total_uom_value": "[ko] total UOM value",
@@ -137,6 +154,7 @@
137
154
  "field.variation_sku": "[ko] variation sku",
138
155
  "field.variation_uom_value": "[ko] variation uom value",
139
156
  "field.zipcode": "[ko] zipcode",
157
+ "field.warehouse_sku": "[ko] warehouse SKU",
140
158
  "label.address_id": "[ko] address id",
141
159
  "label.address_info": "[ko] address info",
142
160
  "label.address": "[ko] address",