@things-factory/operato-mms 4.0.9 → 4.0.13

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 (46) hide show
  1. package/client/menu.js +40 -2
  2. package/client/pages/catalogue-variation/product-variations.js +1 -1
  3. package/client/pages/order/logistics/lazada-order-init-batch-popup.js +1 -2
  4. package/client/pages/order/logistics/request-ro-popup.js +69 -4
  5. package/client/pages/order/logistics/shopee-order-init-batch-popup.js +1 -2
  6. package/client/pages/order/order-by-store.js +71 -3
  7. package/client/pages/reports/sales-by-platform/home.js +144 -0
  8. package/client/pages/reports/sales-by-platform/index.js +3 -0
  9. package/client/pages/reports/sales-by-platform/lazada-sales-report.js +504 -0
  10. package/client/pages/reports/sales-by-platform/shopee-sales-report.js +496 -0
  11. package/client/pages/setting/marketplace-setting.js +9 -6
  12. package/client/route.js +13 -0
  13. package/config.development.js +88 -0
  14. package/dist-server/graphql/resolvers/index.js +2 -1
  15. package/dist-server/graphql/resolvers/index.js.map +1 -1
  16. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +3 -1
  17. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
  18. package/dist-server/graphql/resolvers/shipping-provider/index.js +6 -0
  19. package/dist-server/graphql/resolvers/shipping-provider/index.js.map +1 -0
  20. package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js +32 -0
  21. package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js.map +1 -0
  22. package/dist-server/graphql/types/index.js +3 -2
  23. package/dist-server/graphql/types/index.js.map +1 -1
  24. package/dist-server/graphql/types/shipping-provider/index.js +10 -0
  25. package/dist-server/graphql/types/shipping-provider/index.js.map +1 -0
  26. package/dist-server/graphql/types/shipping-provider/shipping-provider-list.js +13 -0
  27. package/dist-server/graphql/types/shipping-provider/shipping-provider-list.js.map +1 -0
  28. package/dist-server/graphql/types/shipping-provider/shipping-provider.js +13 -0
  29. package/dist-server/graphql/types/shipping-provider/shipping-provider.js.map +1 -0
  30. package/dist-server/routers/etrax-router.js +2 -2
  31. package/dist-server/routers/etrax-router.js.map +1 -1
  32. package/package.json +61 -61
  33. package/server/graphql/resolvers/index.ts +2 -1
  34. package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +3 -1
  35. package/server/graphql/resolvers/shipping-provider/index.ts +5 -0
  36. package/server/graphql/resolvers/shipping-provider/shipping-providers.ts +37 -0
  37. package/server/graphql/types/index.ts +3 -2
  38. package/server/graphql/types/shipping-provider/index.ts +8 -0
  39. package/server/graphql/types/shipping-provider/shipping-provider-list.ts +7 -0
  40. package/server/graphql/types/shipping-provider/shipping-provider.ts +7 -0
  41. package/server/routers/etrax-router.ts +2 -2
  42. package/things-factory.config.js +13 -1
  43. package/translations/en.json +63 -15
  44. package/translations/ko.json +57 -9
  45. package/translations/ms.json +57 -9
  46. package/translations/zh.json +57 -9
@@ -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": "4.0.9",
3
+ "version": "4.0.13",
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.2.31",
45
- "@operato/scene-switch": "^0.0.9",
46
- "@things-factory/apptool-ui": "^4.0.9",
47
- "@things-factory/attachment-base": "^4.0.9",
48
- "@things-factory/auth-ui": "^4.0.9",
49
- "@things-factory/biz-base": "^4.0.9",
50
- "@things-factory/board-service": "^4.0.9",
51
- "@things-factory/board-ui": "^4.0.9",
52
- "@things-factory/code-ui": "^4.0.9",
53
- "@things-factory/context-ui": "^4.0.9",
54
- "@things-factory/dashboard": "^4.0.9",
55
- "@things-factory/export-ui": "^4.0.9",
56
- "@things-factory/export-ui-csv": "^4.0.9",
57
- "@things-factory/export-ui-excel": "^4.0.9",
58
- "@things-factory/geography": "^4.0.9",
59
- "@things-factory/grist-ui": "^4.0.9",
60
- "@things-factory/help": "^4.0.9",
61
- "@things-factory/i18n-ui": "^4.0.9",
62
- "@things-factory/integration-fulfillment": "^4.0.9",
63
- "@things-factory/integration-lmd": "^4.0.9",
64
- "@things-factory/lite-menu": "^4.0.9",
65
- "@things-factory/marketplace-base": "^4.0.9",
66
- "@things-factory/more-ui": "^4.0.9",
67
- "@things-factory/notification": "^4.0.9",
68
- "@things-factory/oauth2-client": "^4.0.9",
69
- "@things-factory/pdf": "^4.0.9",
70
- "@things-factory/product-base": "^4.0.9",
71
- "@things-factory/resource-ui": "^4.0.9",
72
- "@things-factory/scene-chartjs": "^4.0.9",
73
- "@things-factory/scene-clock": "^4.0.9",
74
- "@things-factory/scene-clone": "^4.0.9",
75
- "@things-factory/scene-compass": "^4.0.9",
76
- "@things-factory/scene-data-transform": "^4.0.9",
77
- "@things-factory/scene-excel": "^4.0.9",
78
- "@things-factory/scene-firebase": "^4.0.9",
79
- "@things-factory/scene-form": "^4.0.9",
80
- "@things-factory/scene-gauge": "^4.0.9",
81
- "@things-factory/scene-google-map": "^4.0.9",
82
- "@things-factory/scene-graphql": "^4.0.9",
83
- "@things-factory/scene-grist": "^4.0.9",
44
+ "@operato/ghost-print": "^0.2.43",
45
+ "@operato/scene-chartjs": "^0.0.17",
46
+ "@operato/scene-clock": "^0.0.17",
47
+ "@operato/scene-clone": "^0.0.17",
48
+ "@operato/scene-compass": "^0.0.17",
49
+ "@operato/scene-gauge": "^0.0.17",
50
+ "@operato/scene-grist": "^0.0.17",
51
+ "@operato/scene-indoor-map": "^0.0.17",
52
+ "@operato/scene-integration": "^0.0.17",
53
+ "@operato/scene-legend": "^0.0.17",
54
+ "@operato/scene-progressbar": "^0.0.17",
55
+ "@operato/scene-random": "^0.0.17",
56
+ "@operato/scene-switch": "^0.0.17",
57
+ "@operato/scene-table": "^0.0.17",
58
+ "@operato/scene-timer": "^0.0.17",
59
+ "@operato/scene-wheel-sorter": "^0.0.17",
60
+ "@things-factory/apptool-ui": "^4.0.13",
61
+ "@things-factory/attachment-base": "^4.0.13",
62
+ "@things-factory/auth-ui": "^4.0.13",
63
+ "@things-factory/biz-base": "^4.0.13",
64
+ "@things-factory/board-service": "^4.0.13",
65
+ "@things-factory/board-ui": "^4.0.13",
66
+ "@things-factory/code-ui": "^4.0.13",
67
+ "@things-factory/context-ui": "^4.0.13",
68
+ "@things-factory/dashboard": "^4.0.13",
69
+ "@things-factory/export-ui": "^4.0.13",
70
+ "@things-factory/export-ui-csv": "^4.0.13",
71
+ "@things-factory/export-ui-excel": "^4.0.13",
72
+ "@things-factory/geography": "^4.0.13",
73
+ "@things-factory/grist-ui": "^4.0.13",
74
+ "@things-factory/help": "^4.0.13",
75
+ "@things-factory/i18n-ui": "^4.0.13",
76
+ "@things-factory/integration-fulfillment": "^4.0.13",
77
+ "@things-factory/integration-lmd": "^4.0.13",
78
+ "@things-factory/lite-menu": "^4.0.13",
79
+ "@things-factory/marketplace-base": "^4.0.13",
80
+ "@things-factory/more-ui": "^4.0.13",
81
+ "@things-factory/notification": "^4.0.13",
82
+ "@things-factory/oauth2-client": "^4.0.13",
83
+ "@things-factory/pdf": "^4.0.13",
84
+ "@things-factory/product-base": "^4.0.13",
85
+ "@things-factory/resource-ui": "^4.0.13",
86
+ "@things-factory/scene-data-transform": "^4.0.13",
87
+ "@things-factory/scene-excel": "^4.0.13",
88
+ "@things-factory/scene-firebase": "^4.0.13",
89
+ "@things-factory/scene-form": "^4.0.13",
90
+ "@things-factory/scene-google-map": "^4.0.13",
91
+ "@things-factory/scene-graphql": "^4.0.13",
84
92
  "@things-factory/scene-half-roundrect": "^4.0.9",
85
- "@things-factory/scene-indoor-map": "^4.0.9",
86
- "@things-factory/scene-integration": "^4.0.9",
87
- "@things-factory/scene-label": "^4.0.9",
88
- "@things-factory/scene-legend": "^4.0.9",
89
- "@things-factory/scene-marker": "^4.0.9",
90
- "@things-factory/scene-mqtt": "^4.0.9",
91
- "@things-factory/scene-news-ticker": "^4.0.9",
92
- "@things-factory/scene-progressbar": "^4.0.9",
93
- "@things-factory/scene-random": "^4.0.9",
94
- "@things-factory/scene-restful": "^4.0.9",
95
- "@things-factory/scene-tab": "^4.0.9",
96
- "@things-factory/scene-table": "^4.0.9",
97
- "@things-factory/scene-timer": "^4.0.9",
98
- "@things-factory/scene-visualizer": "^4.0.9",
99
- "@things-factory/scene-wheel-sorter": "^4.0.9",
100
- "@things-factory/setting-ui": "^4.0.9",
101
- "@things-factory/system-ui": "^4.0.9",
102
- "@things-factory/warehouse-base": "^4.0.9"
93
+ "@things-factory/scene-label": "^4.0.13",
94
+ "@things-factory/scene-marker": "^4.0.13",
95
+ "@things-factory/scene-mqtt": "^4.0.13",
96
+ "@things-factory/scene-news-ticker": "^4.0.13",
97
+ "@things-factory/scene-restful": "^4.0.13",
98
+ "@things-factory/scene-tab": "^4.0.13",
99
+ "@things-factory/scene-visualizer": "^4.0.13",
100
+ "@things-factory/setting-ui": "^4.0.13",
101
+ "@things-factory/system-ui": "^4.0.13",
102
+ "@things-factory/warehouse-base": "^4.0.13"
103
103
  },
104
104
  "devDependencies": {
105
- "@things-factory/builder": "^4.0.9",
105
+ "@things-factory/builder": "^4.0.13",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "81c8ae24487cfe79da62717f12bb6752761911ae"
108
+ "gitHead": "a542fdd4e7c447c3b571fe91c92f5919561bdc2c"
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)
@@ -1,5 +1,5 @@
1
- import route from './client/route'
2
1
  import bootstrap from './client/bootstrap'
2
+ import route from './client/route'
3
3
 
4
4
  export default {
5
5
  route,
@@ -95,6 +95,18 @@ export default {
95
95
  {
96
96
  tagname: 'mms-report-custom',
97
97
  page: 'mms-report-custom'
98
+ },
99
+ {
100
+ tagname: 'mms-report-sales-by-platform-home',
101
+ page: 'mms-report-sales-by-platform-home'
102
+ },
103
+ {
104
+ tagname: 'lazada-sales-report',
105
+ page: 'lazada-sales-report'
106
+ },
107
+ {
108
+ tagname: 'shopee-sales-report',
109
+ page: 'shopee-sales-report'
98
110
  }
99
111
  ],
100
112
  bootstrap