@things-factory/integration-marketplace 4.3.267 → 4.3.269

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.
@@ -179,6 +179,13 @@ class MarketplaceStores extends localize(i18next)(PageView) {
179
179
  record: { editable: true },
180
180
  width: 100
181
181
  },
182
+ {
183
+ type: 'boolean',
184
+ name: 'lmdOption',
185
+ header: i18next.t('field.lmd_option'),
186
+ record: { editable: true },
187
+ width: 100
188
+ },
182
189
  {
183
190
  type: 'string',
184
191
  name: 'status',
@@ -239,6 +246,7 @@ class MarketplaceStores extends localize(i18next)(PageView) {
239
246
  isAutoUpdateStockQty
240
247
  isAutoUpdateShipment
241
248
  isOwnTransport
249
+ lmdOption
242
250
  storeId
243
251
  countryCode
244
252
  status
@@ -293,7 +301,7 @@ class MarketplaceStores extends localize(i18next)(PageView) {
293
301
  if (patches && patches.length) {
294
302
  const response = await client.mutate({
295
303
  mutation: gql`
296
- mutation($patches: [MarketplaceStorePatch]!) {
304
+ mutation ($patches: [MarketplaceStorePatch]!) {
297
305
  updateMultipleMarketplaceStore(patches: $patches) {
298
306
  name
299
307
  }
@@ -329,7 +337,7 @@ class MarketplaceStores extends localize(i18next)(PageView) {
329
337
  if (names && names.length > 0) {
330
338
  const response = await client.mutate({
331
339
  mutation: gql`
332
- mutation($names: [String]!) {
340
+ mutation ($names: [String]!) {
333
341
  deleteMarketplaceStores(names: $names)
334
342
  }
335
343
  `,
@@ -89,7 +89,7 @@ function getStoreOrders() {
89
89
  city,
90
90
  country: country_id === 'MY' ? 'Malaysia' : country_id,
91
91
  collectionCurrency: order.order_currency_code,
92
- attentionTo: `${firstname} ${middlename} ${lastname}`
92
+ attentionTo: `${firstname} ${middlename || ''} ${lastname || ''}`
93
93
  };
94
94
  result.orderShipping = orderShipping;
95
95
  // For SC mapping
@@ -1 +1 @@
1
- {"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/magento/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
@@ -105,6 +105,10 @@ __decorate([
105
105
  (0, typeorm_1.Column)({ default: false }),
106
106
  __metadata("design:type", Boolean)
107
107
  ], MarketplaceStore.prototype, "reserveEnabled", void 0);
108
+ __decorate([
109
+ (0, typeorm_1.Column)({ default: false }),
110
+ __metadata("design:type", Boolean)
111
+ ], MarketplaceStore.prototype, "lmdOption", void 0);
108
112
  __decorate([
109
113
  (0, typeorm_1.OneToMany)(type => entities_1.MarketplaceDistributor, marketplaceDistributor => marketplaceDistributor.marketplaceStore),
110
114
  __metadata("design:type", Array)
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../server/entities/marketplace-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../server/entities/marketplace-store.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,7 @@ exports.MarketplaceStorePatch = (0, graphql_tag_1.default) `
20
20
  webhookKey: String
21
21
  eTrax: Boolean
22
22
  reserveEnabled: Boolean
23
+ lmdOption: Boolean
23
24
  distributor: String
24
25
  cuFlag: String
25
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-store-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;CAkBvC,CAAA"}
1
+ {"version":3,"file":"marketplace-store-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;CAmBvC,CAAA"}
@@ -24,6 +24,7 @@ exports.MarketplaceStore = (0, graphql_tag_1.default) `
24
24
  isOwnTransport: Boolean
25
25
  eTrax: Boolean
26
26
  reserveEnabled: Boolean
27
+ lmdOption: Boolean
27
28
  distributor: String
28
29
  updater: User
29
30
  creator: User
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;CAyBlC,CAAA"}
1
+ {"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BlC,CAAA"}
@@ -19,6 +19,7 @@ exports.NewMarketplaceStore = (0, graphql_tag_1.default) `
19
19
  reserveEnabled: Boolean
20
20
  isAutoUpdateStockQty: Boolean
21
21
  isAutoUpdateShipment: Boolean
22
+ lmdOption: Boolean
22
23
  distributor: String
23
24
  }
24
25
  `;
@@ -1 +1 @@
1
- {"version":3,"file":"new-marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/new-marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,mBAAmB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;CAgBrC,CAAA"}
1
+ {"version":3,"file":"new-marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/new-marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,mBAAmB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;CAiBrC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-marketplace",
3
- "version": "4.3.267",
3
+ "version": "4.3.269",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,19 +24,19 @@
24
24
  "test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/apptool-ui": "^4.3.253",
28
- "@things-factory/auth-ui": "^4.3.253",
29
- "@things-factory/biz-base": "^4.3.262",
30
- "@things-factory/code-ui": "^4.3.253",
31
- "@things-factory/context-ui": "^4.3.253",
32
- "@things-factory/grist-ui": "^4.3.253",
33
- "@things-factory/i18n-base": "^4.3.253",
34
- "@things-factory/integration-lmd": "^4.3.267",
35
- "@things-factory/integration-ui": "^4.3.253",
36
- "@things-factory/more-ui": "^4.3.253",
37
- "@things-factory/resource-ui": "^4.3.253",
38
- "@things-factory/setting-ui": "^4.3.253",
39
- "@things-factory/system-ui": "^4.3.253",
27
+ "@things-factory/apptool-ui": "^4.3.269",
28
+ "@things-factory/auth-ui": "^4.3.269",
29
+ "@things-factory/biz-base": "^4.3.269",
30
+ "@things-factory/code-ui": "^4.3.269",
31
+ "@things-factory/context-ui": "^4.3.269",
32
+ "@things-factory/grist-ui": "^4.3.269",
33
+ "@things-factory/i18n-base": "^4.3.269",
34
+ "@things-factory/integration-lmd": "^4.3.269",
35
+ "@things-factory/integration-ui": "^4.3.269",
36
+ "@things-factory/more-ui": "^4.3.269",
37
+ "@things-factory/resource-ui": "^4.3.269",
38
+ "@things-factory/setting-ui": "^4.3.269",
39
+ "@things-factory/system-ui": "^4.3.269",
40
40
  "debug": "^4.1.1",
41
41
  "node-fetch": "^2.6.0",
42
42
  "querystring": "^0.2.1"
@@ -51,5 +51,5 @@
51
51
  "nock": "^13.0.2",
52
52
  "should": "^13.2.3"
53
53
  },
54
- "gitHead": "4a13b0ed23951e75c858c0e7a1cda65d51b9bcfa"
54
+ "gitHead": "a1317b08841c213b338e5fd060be1ae295cb7022"
55
55
  }
@@ -63,7 +63,16 @@ export function getStoreOrders() {
63
63
  let docRefNo = orderNo
64
64
 
65
65
  let orderItems = items.map(item => {
66
- var { item_id: name, product_id, qty_ordered: qty, price, original_price, price, tax_amount, tax_invoiced } = item
66
+ var {
67
+ item_id: name,
68
+ product_id,
69
+ qty_ordered: qty,
70
+ price,
71
+ original_price,
72
+ price,
73
+ tax_amount,
74
+ tax_invoiced
75
+ } = item
67
76
 
68
77
  return {
69
78
  name,
@@ -93,16 +102,8 @@ export function getStoreOrders() {
93
102
  }
94
103
 
95
104
  if (order?.extension_attributes?.shipping_assignments) {
96
- const {
97
- street,
98
- telephone,
99
- postcode,
100
- city,
101
- country_id,
102
- firstname,
103
- lastname,
104
- middlename
105
- } = order.extension_attributes.shipping_assignments[0].shipping.address
105
+ const { street, telephone, postcode, city, country_id, firstname, lastname, middlename } =
106
+ order.extension_attributes.shipping_assignments[0].shipping.address
106
107
 
107
108
  var orderShipping = {
108
109
  address1: street,
@@ -116,7 +117,7 @@ export function getStoreOrders() {
116
117
  city,
117
118
  country: country_id === 'MY' ? 'Malaysia' : country_id,
118
119
  collectionCurrency: order.order_currency_code,
119
- attentionTo: `${firstname} ${middlename} ${lastname}`
120
+ attentionTo: `${firstname} ${middlename || ''} ${lastname || ''}`
120
121
  }
121
122
 
122
123
  result.orderShipping = orderShipping
@@ -83,6 +83,9 @@ export class MarketplaceStore {
83
83
  @Column({ default: false })
84
84
  reserveEnabled: Boolean
85
85
 
86
+ @Column({ default: false })
87
+ lmdOption: Boolean
88
+
86
89
  @OneToMany(type => MarketplaceDistributor, marketplaceDistributor => marketplaceDistributor.marketplaceStore)
87
90
  marketplaceDistributors: MarketplaceDistributor[]
88
91
 
@@ -15,6 +15,7 @@ export const MarketplaceStorePatch = gql`
15
15
  webhookKey: String
16
16
  eTrax: Boolean
17
17
  reserveEnabled: Boolean
18
+ lmdOption: Boolean
18
19
  distributor: String
19
20
  cuFlag: String
20
21
  }
@@ -19,6 +19,7 @@ export const MarketplaceStore = gql`
19
19
  isOwnTransport: Boolean
20
20
  eTrax: Boolean
21
21
  reserveEnabled: Boolean
22
+ lmdOption: Boolean
22
23
  distributor: String
23
24
  updater: User
24
25
  creator: User
@@ -14,6 +14,7 @@ export const NewMarketplaceStore = gql`
14
14
  reserveEnabled: Boolean
15
15
  isAutoUpdateStockQty: Boolean
16
16
  isAutoUpdateShipment: Boolean
17
+ lmdOption: Boolean
17
18
  distributor: String
18
19
  }
19
20
  `
@@ -3,12 +3,13 @@
3
3
  "field.auto_update_stock": "auto update selling qty",
4
4
  "field.country-code": "country",
5
5
  "field.etrax": "eTrax",
6
+ "field.lmd_option": "lmd option",
6
7
  "field.own_transport": "own transport",
7
8
  "field.platform": "platform",
8
9
  "field.status": "status",
9
10
  "field.store-id": "store id",
10
- "title.magento": "magento",
11
11
  "field.store_name": "store name",
12
+ "title.magento": "magento",
12
13
  "title.marketplace_stores": "marketplace stores",
13
14
  "title.marketplace_store_info": "marketplace store info",
14
15
  "title.create_marketplace_store": "create marketplace store",
@@ -3,12 +3,13 @@
3
3
  "field.auto_update_stock": "[jp] auto update selling qty",
4
4
  "field.country-code": "[jp] country",
5
5
  "field.etrax": "[jp] eTrax",
6
+ "field.lmd_option": "[jp] lmd option",
6
7
  "field.own_transport": "[jp] own transport",
7
8
  "field.platform": "[jp] platform",
8
9
  "field.status": "[jp] status",
9
10
  "field.store-id": "[jp] store id",
10
- "title.magento": "[jp] magento",
11
11
  "field.store_name": "[jp] store name",
12
+ "title.magento": "[jp] magento",
12
13
  "title.marketplace_stores": "[jp] marketplace stores",
13
14
  "title.marketplace_store_info": "[jp] marketplace store info",
14
15
  "title.create_marketplace_store": "[jp] create marketplace store",
@@ -3,12 +3,13 @@
3
3
  "field.auto_update_stock": "[ko] auto update selling qty",
4
4
  "field.country-code": "[ko] country",
5
5
  "field.etrax": "[ko] eTrax",
6
+ "field.lmd_option": "[ko] lmd option",
6
7
  "field.own_transport": "[ko] own transport",
7
8
  "field.platform": "[ko] platform",
8
9
  "field.status": "[ko] status",
9
10
  "field.store-id": "[ko] store id",
10
- "title.magento": "[ko] magento",
11
11
  "field.store_name": "[ko] store name",
12
+ "title.magento": "[ko] magento",
12
13
  "title.marketplace_stores": "[ko] marketplace stores",
13
14
  "title.marketplace_store_info": "[ko] marketplace store info",
14
15
  "title.create_marketplace_store": "[ko] create marketplace store",
@@ -3,12 +3,13 @@
3
3
  "field.auto_update_stock": "[ms] auto update selling qty",
4
4
  "field.country-code": "[ms] country",
5
5
  "field.etrax": "[ms] eTrax",
6
+ "field.lmd_option": "[ms] lmd option",
6
7
  "field.own_transport": "[ms] own transport",
7
8
  "field.platform": "[ms] platform",
8
9
  "field.status": "[ms] status",
9
10
  "field.store-id": "[ms] store id",
10
- "title.magento": "[ms] magento",
11
11
  "field.store_name": "[ms] store name",
12
+ "title.magento": "[ms] magento",
12
13
  "title.marketplace_stores": "[ms] marketplace stores",
13
14
  "title.marketplace_store_info": "[ms] marketplace store info",
14
15
  "title.create_marketplace_store": "[ms] create marketplace store",
@@ -3,12 +3,13 @@
3
3
  "field.auto_update_stock": "[zh] auto update selling qty",
4
4
  "field.country-code": "[zh] country",
5
5
  "field.etrax": "[zh] eTrax",
6
+ "field.lmd_option": "[zh] lmd option",
6
7
  "field.own_transport": "[zh] own transport",
7
8
  "field.platform": "[zh] platform",
8
9
  "field.status": "[zh] status",
9
10
  "field.store-id": "[zh] store id",
10
- "title.magento": "[zh] magento",
11
11
  "field.store_name": "[zh] store name",
12
+ "title.magento": "[zh] magento",
12
13
  "title.marketplace_stores": "[zh] marketplace stores",
13
14
  "title.marketplace_store_info": "[zh] marketplace store info",
14
15
  "title.create_marketplace_store": "[zh] create marketplace store",