@things-factory/operato-mms 4.0.11 → 4.0.16

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/dist-server/graphql/resolvers/index.js +2 -1
  14. package/dist-server/graphql/resolvers/index.js.map +1 -1
  15. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +3 -1
  16. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
  17. package/dist-server/graphql/resolvers/shipping-provider/index.js +6 -0
  18. package/dist-server/graphql/resolvers/shipping-provider/index.js.map +1 -0
  19. package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js +32 -0
  20. package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js.map +1 -0
  21. package/dist-server/graphql/types/index.js +3 -2
  22. package/dist-server/graphql/types/index.js.map +1 -1
  23. package/dist-server/graphql/types/shipping-provider/index.js +10 -0
  24. package/dist-server/graphql/types/shipping-provider/index.js.map +1 -0
  25. package/dist-server/graphql/types/shipping-provider/shipping-provider-list.js +13 -0
  26. package/dist-server/graphql/types/shipping-provider/shipping-provider-list.js.map +1 -0
  27. package/dist-server/graphql/types/shipping-provider/shipping-provider.js +13 -0
  28. package/dist-server/graphql/types/shipping-provider/shipping-provider.js.map +1 -0
  29. package/dist-server/routers/etrax-router.js +2 -2
  30. package/dist-server/routers/etrax-router.js.map +1 -1
  31. package/package.json +61 -61
  32. package/server/graphql/resolvers/index.ts +2 -1
  33. package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +3 -1
  34. package/server/graphql/resolvers/shipping-provider/index.ts +5 -0
  35. package/server/graphql/resolvers/shipping-provider/shipping-providers.ts +37 -0
  36. package/server/graphql/types/index.ts +3 -2
  37. package/server/graphql/types/shipping-provider/index.ts +8 -0
  38. package/server/graphql/types/shipping-provider/shipping-provider-list.ts +7 -0
  39. package/server/graphql/types/shipping-provider/shipping-provider.ts +7 -0
  40. package/server/routers/etrax-router.ts +2 -2
  41. package/things-factory.config.js +13 -1
  42. package/translations/en.json +63 -15
  43. package/translations/ko.json +57 -9
  44. package/translations/ms.json +57 -9
  45. package/translations/zh.json +57 -9
  46. package/config.development.js +0 -54
@@ -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":";;;;;;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;SAC3B,CAAA;QACD,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC5C,OAAM;KACP;IAED,sCAAsC;IACtC,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,+BAA+B;QAC/B,MAAM,SAAS,GAAG,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAA;QACjD,MAAM,aAAa,GAAG,IAAA,uBAAa,EAAC,uCAAoB,CAAC,CAAA;QACzD,MAAM,iBAAiB,GAAG,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAA;QAEjE,IAAI,KAAK,GAAqB,MAAM,SAAS,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE;YAC9B,SAAS,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,gDAAgD,CAAC;SAC3G,CAAC,CAAA;QACF,IAAI,UAAU,GAA2B,KAAK,CAAC,qBAAqB,CAAA;QAEpE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,SAAS,CAAC,wBAAwB,KAAK,IAAI,EAAE;gBAC/C,MAAM,aAAa,GAAG,SAAS,CAAC,wBAAwB,CAAA;gBACxD,MAAM,WAAW,GAAS,IAAI,IAAI,EAAE,CAAA;gBACpC,MAAM,iBAAiB,CAAC,MAAM,CAC5B,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,EACxB,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,CACvE,CAAA;aACF;SACF;QAED,MAAM,OAAO,GAAG,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAA;QACzC,MAAM,gBAAgB,GAAqB,MAAM,kCAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAEtF,iDAAiD;QACjD,IAAI,gBAAgB,CAAC,QAAQ,KAAK,aAAa,EAAE;YAC/C,MAAM,IAAI,GAAG,6DAA6D,GAAG,UAAU,CAAA;YACvF,MAAM,SAAS,GAAG,MAAM,kCAAQ,CAAC,eAAe,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;SAClG;QAED,MAAM,IAAI,GAAG;YACX,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,SAAS;SACnB,CAAA;QACD,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC5C,sEAAsE;QACtE,qCAAqC;QACrC,6CAA6C;KAC9C;AACH,CAAC,CAAC,CAAA"}
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.11",
3
+ "version": "4.0.16",
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.35",
45
- "@operato/scene-chartjs": "^0.0.10",
46
- "@operato/scene-clock": "^0.0.10",
47
- "@operato/scene-clone": "^0.0.10",
48
- "@operato/scene-integration": "^0.0.10",
49
- "@operato/scene-progressbar": "^0.0.10",
50
- "@operato/scene-random": "^0.0.10",
51
- "@operato/scene-switch": "^0.0.10",
52
- "@things-factory/apptool-ui": "^4.0.11",
53
- "@things-factory/attachment-base": "^4.0.11",
54
- "@things-factory/auth-ui": "^4.0.11",
55
- "@things-factory/biz-base": "^4.0.11",
56
- "@things-factory/board-service": "^4.0.11",
57
- "@things-factory/board-ui": "^4.0.11",
58
- "@things-factory/code-ui": "^4.0.11",
59
- "@things-factory/context-ui": "^4.0.11",
60
- "@things-factory/dashboard": "^4.0.11",
61
- "@things-factory/export-ui": "^4.0.11",
62
- "@things-factory/export-ui-csv": "^4.0.11",
63
- "@things-factory/export-ui-excel": "^4.0.11",
64
- "@things-factory/geography": "^4.0.11",
65
- "@things-factory/grist-ui": "^4.0.11",
66
- "@things-factory/help": "^4.0.11",
67
- "@things-factory/i18n-ui": "^4.0.11",
68
- "@things-factory/integration-fulfillment": "^4.0.11",
69
- "@things-factory/integration-lmd": "^4.0.11",
70
- "@things-factory/lite-menu": "^4.0.11",
71
- "@things-factory/marketplace-base": "^4.0.11",
72
- "@things-factory/more-ui": "^4.0.11",
73
- "@things-factory/notification": "^4.0.11",
74
- "@things-factory/oauth2-client": "^4.0.11",
75
- "@things-factory/pdf": "^4.0.11",
76
- "@things-factory/product-base": "^4.0.11",
77
- "@things-factory/resource-ui": "^4.0.11",
78
- "@things-factory/scene-compass": "^4.0.11",
79
- "@things-factory/scene-data-transform": "^4.0.11",
80
- "@things-factory/scene-excel": "^4.0.11",
81
- "@things-factory/scene-firebase": "^4.0.11",
82
- "@things-factory/scene-form": "^4.0.11",
83
- "@things-factory/scene-gauge": "^4.0.11",
84
- "@things-factory/scene-google-map": "^4.0.11",
85
- "@things-factory/scene-graphql": "^4.0.11",
86
- "@things-factory/scene-grist": "^4.0.11",
44
+ "@operato/ghost-print": "^0.2.47",
45
+ "@operato/scene-chartjs": "^0.0.20",
46
+ "@operato/scene-clock": "^0.0.20",
47
+ "@operato/scene-clone": "^0.0.20",
48
+ "@operato/scene-compass": "^0.0.20",
49
+ "@operato/scene-gauge": "^0.0.20",
50
+ "@operato/scene-grist": "^0.0.20",
51
+ "@operato/scene-indoor-map": "^0.0.20",
52
+ "@operato/scene-integration": "^0.0.20",
53
+ "@operato/scene-legend": "^0.0.20",
54
+ "@operato/scene-progressbar": "^0.0.20",
55
+ "@operato/scene-random": "^0.0.20",
56
+ "@operato/scene-switch": "^0.0.20",
57
+ "@operato/scene-table": "^0.0.20",
58
+ "@operato/scene-timer": "^0.0.20",
59
+ "@operato/scene-wheel-sorter": "^0.0.20",
60
+ "@things-factory/apptool-ui": "^4.0.16",
61
+ "@things-factory/attachment-base": "^4.0.16",
62
+ "@things-factory/auth-ui": "^4.0.16",
63
+ "@things-factory/biz-base": "^4.0.16",
64
+ "@things-factory/board-service": "^4.0.16",
65
+ "@things-factory/board-ui": "^4.0.16",
66
+ "@things-factory/code-ui": "^4.0.16",
67
+ "@things-factory/context-ui": "^4.0.16",
68
+ "@things-factory/dashboard": "^4.0.16",
69
+ "@things-factory/export-ui": "^4.0.16",
70
+ "@things-factory/export-ui-csv": "^4.0.16",
71
+ "@things-factory/export-ui-excel": "^4.0.16",
72
+ "@things-factory/geography": "^4.0.16",
73
+ "@things-factory/grist-ui": "^4.0.16",
74
+ "@things-factory/help": "^4.0.16",
75
+ "@things-factory/i18n-ui": "^4.0.16",
76
+ "@things-factory/integration-fulfillment": "^4.0.16",
77
+ "@things-factory/integration-lmd": "^4.0.16",
78
+ "@things-factory/lite-menu": "^4.0.16",
79
+ "@things-factory/marketplace-base": "^4.0.16",
80
+ "@things-factory/more-ui": "^4.0.16",
81
+ "@things-factory/notification": "^4.0.16",
82
+ "@things-factory/oauth2-client": "^4.0.16",
83
+ "@things-factory/pdf": "^4.0.16",
84
+ "@things-factory/product-base": "^4.0.16",
85
+ "@things-factory/resource-ui": "^4.0.16",
86
+ "@things-factory/scene-data-transform": "^4.0.16",
87
+ "@things-factory/scene-excel": "^4.0.16",
88
+ "@things-factory/scene-firebase": "^4.0.16",
89
+ "@things-factory/scene-form": "^4.0.16",
90
+ "@things-factory/scene-google-map": "^4.0.16",
91
+ "@things-factory/scene-graphql": "^4.0.16",
87
92
  "@things-factory/scene-half-roundrect": "^4.0.9",
88
- "@things-factory/scene-indoor-map": "^4.0.11",
89
- "@things-factory/scene-label": "^4.0.11",
90
- "@things-factory/scene-legend": "^4.0.11",
91
- "@things-factory/scene-marker": "^4.0.11",
92
- "@things-factory/scene-mqtt": "^4.0.11",
93
- "@things-factory/scene-news-ticker": "^4.0.11",
94
- "@things-factory/scene-restful": "^4.0.11",
95
- "@things-factory/scene-tab": "^4.0.11",
96
- "@things-factory/scene-table": "^4.0.11",
97
- "@things-factory/scene-timer": "^4.0.11",
98
- "@things-factory/scene-visualizer": "^4.0.11",
99
- "@things-factory/scene-wheel-sorter": "^4.0.11",
100
- "@things-factory/setting-ui": "^4.0.11",
101
- "@things-factory/system-ui": "^4.0.11",
102
- "@things-factory/warehouse-base": "^4.0.11"
93
+ "@things-factory/scene-label": "^4.0.16",
94
+ "@things-factory/scene-marker": "^4.0.16",
95
+ "@things-factory/scene-mqtt": "^4.0.16",
96
+ "@things-factory/scene-news-ticker": "^4.0.16",
97
+ "@things-factory/scene-restful": "^4.0.16",
98
+ "@things-factory/scene-tab": "^4.0.16",
99
+ "@things-factory/scene-visualizer": "^4.0.16",
100
+ "@things-factory/setting-ui": "^4.0.16",
101
+ "@things-factory/system-ui": "^4.0.16",
102
+ "@things-factory/warehouse-base": "^4.0.16"
103
103
  },
104
104
  "devDependencies": {
105
- "@things-factory/builder": "^4.0.11",
105
+ "@things-factory/builder": "^4.0.16",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "47745d8cdbe99f11d8d69bbcab3901c9771525a0"
108
+ "gitHead": "5a56e53e09d5b0a47b7446dbb2fa696232ad5414"
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
@@ -1,4 +1,14 @@
1
1
  {
2
+ "field.variation_id": "variation id",
3
+ "field.voucher_amt": "voucher amt",
4
+ "field.shipping_rebate": "shipping rebate",
5
+ "field.shipping_mode": "shipping mode",
6
+ "field.service_fee": "service fee",
7
+ "field.transaction_fee": "transaction fee",
8
+ "field.total_released_amt": "total release amt",
9
+ "field.voucher_code": "voucher code",
10
+ "field.comission_fee": "comission fee",
11
+ "field.fulfilment_center": "fulfilment center",
2
12
  "button.add_product": "add product",
3
13
  "button.add": "add",
4
14
  "button.airway_bill": "airway bill",
@@ -28,60 +38,92 @@
28
38
  "button.to_confirm_receive": "to confirm receive",
29
39
  "button.update_marketplace_qty": "update marketplace quantity",
30
40
  "button.update_qty": "update quantity",
31
- "error.unable to verify webhook origin": "unable to verify webhook origin",
32
41
  "error.unable to find store account": "unable to find store account",
42
+ "error.unable to verify webhook origin": "unable to verify webhook origin",
33
43
  "field.actions": "actions",
44
+ "field.actual_shipping_fee": "actual shipping fee",
34
45
  "field.address_id": "address id",
35
46
  "field.assigned_warehouse_sku": "assigned warehouse sku",
47
+ "field.auto_shipping_fee_subsidy_by_lazada": "auto shipping fee subsidy (by lazada)",
36
48
  "field.available_to_purchase": "available to purchase",
37
49
  "field.available": "available",
38
50
  "field.batch_id": "batch no",
39
51
  "field.branch_id": "branch id",
40
52
  "field.branch": "branch",
53
+ "field.buyer_username": "buyer username",
41
54
  "field.channel_sku": "channel sku",
42
55
  "field.city": "city",
56
+ "field.commission_fee": "commission fee",
43
57
  "field.country": "country",
44
58
  "field.criteria": "criteria",
45
59
  "field.date": "date",
60
+ "field.distributor": "distributor",
46
61
  "field.district": "district",
47
62
  "field.ending_on": "ending on",
48
63
  "field.eta_date": "eta date",
64
+ "field.from_date": "from date",
65
+ "field.fulfillment_partner": "fulfillment partner",
66
+ "field.grand_total": "grand total",
49
67
  "field.import_cargo": "import cargo",
50
68
  "field.isku": "ISKU",
51
69
  "field.item_count": "item count",
70
+ "field.item_price_credit": "item price credit",
52
71
  "field.item": "item",
53
72
  "field.last_updated": "last updated",
73
+ "field.lazada_bonus": "lazada bonus",
74
+ "field.lazada_bonus_lzd_cofund": "lazada bonus - LZD co-fund",
54
75
  "field.marketplace_product_name": "marketplace product name",
55
76
  "field.marketplace_product_sku": "marketplace product sku",
56
77
  "field.name": "name",
57
78
  "field.not_assigned": "not assigned",
58
79
  "field.on_hold": "on hold",
80
+ "field.order_created_date": "order created date",
59
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",
86
+ "field.original_price": "original price",
60
87
  "field.own_shipping_carrier": "own shipping carrier",
61
88
  "field.own_tracking_no": "own tracking no",
62
89
  "field.pack_qty": "pack qty",
63
90
  "field.pack_weight": "pack weight",
64
91
  "field.packing_type": "packing type",
92
+ "field.paid_price": "paid price",
65
93
  "field.pallet_qty": "pallet qty",
94
+ "field.pay_time": "pay time",
95
+ "field.payment_fee": "payment fee",
66
96
  "field.pickup_date": "pickup date",
67
97
  "field.pickup_time_id": "pickup time id",
68
98
  "field.post_code": "post code",
69
99
  "field.price": "price",
100
+ "field.product_discount": "product discount",
70
101
  "field.product_info": "product info",
71
102
  "field.product_name": "product name",
72
103
  "field.product_sku": "product sku",
73
104
  "field.product_units": "product units",
74
105
  "field.product": "product",
106
+ "field.promotion_id": "promotion ID",
107
+ "field.promotional_charges_flexi_combo": "promotional charges flexi-combo",
108
+ "field.promotional_charges_vouchers": "promotional charges vouchers",
75
109
  "field.qty": "qty",
76
110
  "field.ref_no": "ref no.",
111
+ "field.refund_amount": "refund amount",
77
112
  "field.remark": "remark",
78
113
  "field.required_branch": "required branch",
79
114
  "field.required_sender": "required sender",
80
115
  "field.required_tracking": "required tracking",
81
116
  "field.ro_created": "ro created",
82
117
  "field.save": "save",
118
+ "field.seller_shipping_fee_voucher": "seller shipping fee voucher",
83
119
  "field.sender": "sender",
84
120
  "field.shipping_carrier": "shipping carrier",
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)",
125
+ "field.shipping_fee": "shipping fee",
126
+ "field.shipping_provider": "shipping provider",
85
127
  "field.sku_name": "sku name",
86
128
  "field.sku": "sku",
87
129
  "field.sold_stock": "sold stock",
@@ -91,10 +133,13 @@
91
133
  "field.stock_buffer": "buffer stock",
92
134
  "field.stock": "total stock",
93
135
  "field.store_name": "store name",
136
+ "field.store": "store",
137
+ "field.tax_amount": "tax amount",
138
+ "field.to_date": "to date",
94
139
  "field.total_amount": "total amount",
95
140
  "field.total_uom_value": "total UOM value",
96
- "field.total_weight": "total weight",
97
141
  "field.total_volume": "total volume",
142
+ "field.total_weight": "total weight",
98
143
  "field.town": "town",
99
144
  "field.tracking_no": "tracking no",
100
145
  "field.type": "type",
@@ -109,10 +154,11 @@
109
154
  "field.variation_selling_price": "variation selling price",
110
155
  "field.variation_sku": "variation sku",
111
156
  "field.variation_uom_value": "variation uom value",
157
+ "field.warehouse_sku": "warehouse SKU",
112
158
  "field.zipcode": "zipcode",
113
- "label.address": "address",
114
159
  "label.address_id": "address id",
115
160
  "label.address_info": "address info",
161
+ "label.address": "address",
116
162
  "label.attention_to": "attention to",
117
163
  "label.available_stock": "available stock",
118
164
  "label.branch_id": "branch id",
@@ -179,10 +225,10 @@
179
225
  "label.order_status_rejected": "rejected",
180
226
  "label.order_status_shipped": "shipped",
181
227
  "label.order_status_to_confirm_receive": "to confirm receive",
228
+ "label.oversell_will_happen_with_all_full_allocation": "oversell will happen with all 100% allocation",
182
229
  "label.own_shipping_provider": "own shipping provider",
183
230
  "label.own_tracking_no": "own tracking no",
184
231
  "label.own_transport": "own transport",
185
- "label.oversell_will_happen_with_all_full_allocation": "oversell will happen with all 100% allocation",
186
232
  "label.packed": "packed",
187
233
  "label.parent_sku": "parent SKU",
188
234
  "label.pending": "pending",
@@ -205,11 +251,11 @@
205
251
  "label.select_parent_sku": "select parent SKU",
206
252
  "label.selling_price": "selling price",
207
253
  "label.shipped": "shipped",
208
- "label.shipping": "shipping",
209
254
  "label.shipping_provider": "shipping provider",
255
+ "label.shipping": "shipping",
256
+ "label.sku": "sku",
210
257
  "label.stock_allocation_qty": "stock allocation qty",
211
258
  "label.storage_type": "storage type",
212
- "label.sku": "sku",
213
259
  "label.threshold_value": "threshold value",
214
260
  "label.timeslot_info": "timeslot",
215
261
  "label.to_confirm_receive": "to confirm receive",
@@ -226,16 +272,16 @@
226
272
  "text.address_is_empty": "address is empty",
227
273
  "text.airway_bill_has_been_generated": "airway bill has been generated",
228
274
  "text.are_you_sure": "are you sure",
229
- "text.document_has_been_generated": "document has been generated",
230
275
  "text.batch_init_type_not_selected": "batch init type not selected",
231
276
  "text.branch_is_not_selected": "branch is not selected",
232
- "text.create_a_draft_product": "create a draft product",
233
- "text.create_new_variation_draft": "create new variation draft",
234
277
  "text.completed": "completed",
235
278
  "text.confirm_stock_replenishment": "confirm stock replenishment",
279
+ "text.create_a_draft_product": "create a draft product",
280
+ "text.create_new_variation_draft": "create new variation draft",
236
281
  "text.data_updated_successfully": "data updated successfully",
237
282
  "text.delivery_type_is_empty": "delivery type is empty",
238
283
  "text.do_you_want_to_update_x": "do you want to update {x}",
284
+ "text.document_has_been_generated": "document has been generated",
239
285
  "text.draft_product_has_been_updated_successfully": "draft product has been updated successfully",
240
286
  "text.form_is_incomplete": "form is incomplete",
241
287
  "text.initialise_logistics": "initialise logistics",
@@ -245,13 +291,13 @@
245
291
  "text.kindly_select_at_least_one_store_account": "kindly select at least one store account",
246
292
  "text.linking_process_is_completed": "linking process is completed",
247
293
  "text.marketplace_qty_updated": "marketplace quantity updated",
294
+ "text.no_document_available": "no document available",
248
295
  "text.no_order_is_selected": "no order is selected",
249
296
  "text.no_orders_selected": "no orders selected",
250
297
  "text.no_selection_in_type": "no selection in type",
251
- "text.no_document_available": "no document available",
252
298
  "text.order_has_been_deleted": "order has been deleted",
253
- "text.order_has_been_updated": "order has been updated",
254
299
  "text.order_has_been_initiated_for_warehouse_fulfilment": "order has been initiated for warehouse fulfillment",
300
+ "text.order_has_been_updated": "order has been updated",
255
301
  "text.order_init_batch": "order init batch",
256
302
  "text.order_list_has_been_updated": "order list has been updated",
257
303
  "text.package_height_is_empty": "package height is empty",
@@ -267,16 +313,16 @@
267
313
  "text.product_stock_is_empty": "product is empty",
268
314
  "text.product_weight_is_empty": "product weight is empty",
269
315
  "text.reason_x": "reason: {x}",
270
- "text.select_courier": "select courier",
271
316
  "text.select_a_delivery_type": "select a delivery type",
272
317
  "text.select_a_logistics_type": "select a logistics type",
273
318
  "text.select_a_shipping_provider": "select a shipping provider",
274
319
  "text.select_address": "select address",
320
+ "text.select_courier": "select courier",
275
321
  "text.select_pickup_date": "select pickup date",
276
322
  "text.set_order_to_ready_to_ship": "set order to ready to ship",
277
323
  "text.shipping_provider_is_empty": "shipping provider is empty",
278
- "text.stock_allocation_warning": "stock allocation warning",
279
324
  "text.stock_allocation_value_should_be_between_1_to_100": "stock allocation value should be between 1 to 100",
325
+ "text.stock_allocation_warning": "stock allocation warning",
280
326
  "text.stock_replenishment_form_invalid": "stock replenishment form invalid",
281
327
  "text.stock_replenishment_order_created": "stock replenishment order created",
282
328
  "text.store_is_not_available": "store is not available",
@@ -284,8 +330,8 @@
284
330
  "text.successfully_fetch_latest_data": "successfully fetch latest data",
285
331
  "text.tracking_no_is_empty": "tracking no is empty",
286
332
  "text.update_draft_product": "update draft product",
287
- "text.update_stock_allocation_ratio": "update stock allocation ratio",
288
333
  "text.update_marketplace_order_max_weight": "update marketplace order maximum weight",
334
+ "text.update_stock_allocation_ratio": "update stock allocation ratio",
289
335
  "text.you_wont_be_able_to_revert_this": "you won't be able to revert this",
290
336
  "title.are_you_sure": "are you sure",
291
337
  "title.attachment": "attachment",
@@ -302,8 +348,9 @@
302
348
  "title.group_product_variants": "group product variants",
303
349
  "title.inventories": "inventories",
304
350
  "title.inventory_by_product": "inventory by product",
305
- "title.link_product_configuration": "link product configuration",
306
351
  "title.inventory_details": "inventory details",
352
+ "title.lazada_sales_report": "lazada sales report",
353
+ "title.link_product_configuration": "link product configuration",
307
354
  "title.marketplace_setting": "marketplace setting",
308
355
  "title.onhand_inventory": "onhand inventory",
309
356
  "title.order_by_store": "order by store",
@@ -319,6 +366,7 @@
319
366
  "title.range_of_date_order": "range of date order",
320
367
  "title.select_product_type": "select product type",
321
368
  "title.select_store_account": "select store account",
369
+ "title.shopee_sales_report": "shopee sales report",
322
370
  "title.sr_no": "replenishment no.",
323
371
  "title.stock_replenishment_detail": "stock replenishment detail",
324
372
  "title.stock_replenishment_list": "stock replenishment list",