@things-factory/operato-mms 5.0.0-alpha.2 → 5.0.0-alpha.22

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 (14) hide show
  1. package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +70 -69
  2. package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
  3. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +70 -69
  4. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
  5. package/dist-server/routers/etrax-router.js +8 -9
  6. package/dist-server/routers/etrax-router.js.map +1 -1
  7. package/package.json +62 -62
  8. package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +73 -75
  9. package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +73 -75
  10. package/server/routers/etrax-router.ts +10 -11
  11. package/translations/en.json +2 -0
  12. package/translations/ko.json +2 -0
  13. package/translations/ms.json +2 -0
  14. package/translations/zh.json +2 -0
package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js CHANGED
@@ -26,6 +26,7 @@ exports.addReleaseOrderResolver = {
26
26
  'marketplaceStore'
27
27
  ]
28
28
  });
29
+ const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
29
30
  let marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
30
31
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
31
32
  order: { subOrderNoRef: 'ASC' },
@@ -44,7 +45,7 @@ exports.addReleaseOrderResolver = {
44
45
  .getDate()
45
46
  .toString()
46
47
  .padStart(2, '0')}`;
47
- const newReleaseOrder = {
48
+ var newReleaseOrder = {
48
49
  releaseDate,
49
50
  type: 'b2c',
50
51
  transporter: marketplaceOrder.shippingProvider,
@@ -99,76 +100,76 @@ exports.addReleaseOrderResolver = {
99
100
  }
100
101
  }
101
102
  catch (e) { }
102
- var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
103
- let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
104
- where: { domain, sku: oi.product.sku }
105
- });
106
- if (!product) {
107
- product = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
108
- where: { domain, sku: oi.product.sku }
109
- });
110
- }
111
- let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
112
- let moi = mosis[0].marketplaceOrderItem;
113
- return {
114
- sku: product.sku,
115
- name: product.name,
116
- description: product.description,
117
- product: { sku: product.sku },
118
- qty: oi.releaseQty,
119
- unitPrice: ((moi === null || moi === void 0 ? void 0 : moi.originalPrice) || 0) / moi.qty,
120
- paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
121
- };
122
- }));
123
- let newInvoice = {
124
- invoiceProducts,
125
- releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
126
- refNo1: newReleaseOrder.refNo.toString(),
127
- refNo2: newReleaseOrder.refNo2.toString(),
128
- issuedOn: new Date(),
129
- from: marketplaceOrder.marketplaceStore.storeName,
130
- fromContactPhone: '-',
131
- fromAddress1: '-',
132
- fromAddress2: null,
133
- fromAddress3: null,
134
- fromAddress4: null,
135
- fromAddress5: null,
136
- fromPostcode: null,
137
- fromCity: null,
138
- fromState: null,
139
- fromCountry: null,
140
- deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
141
- deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
142
- deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
143
- deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
144
- deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
145
- deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
146
- deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
147
- deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
148
- deliveryCity: newReleaseOrder.deliverTo.city || '-',
149
- deliveryState: newReleaseOrder.deliverTo.state || '-',
150
- deliveryCountry: newReleaseOrder.deliverTo.country || '-',
151
- billTo: newReleaseOrder.deliverTo.attentionTo || '-',
152
- billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
153
- billingAddress1: releaseOrder.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
154
- billingAddress2: null,
155
- billingAddress3: null,
156
- billingAddress4: null,
157
- billingAddress5: null,
158
- billingPostcode: '-',
159
- billingCity: '-',
160
- billingState: '-',
161
- billingCountry: '-'
162
- };
163
- try {
164
- await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
165
- customerBizplaceId,
166
- invoice: newInvoice
167
- });
168
- }
169
- catch (e) { }
170
103
  }
171
104
  }
105
+ var invoiceProducts = await Promise.all(marketplaceOrderItems.map(async (mi) => {
106
+ let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
107
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
108
+ });
109
+ let productBundle;
110
+ if (!product) {
111
+ productBundle = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
112
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
113
+ });
114
+ }
115
+ return {
116
+ sku: product ? product.sku : productBundle.sku,
117
+ name: product ? product.name : productBundle.name,
118
+ description: product ? product.description : productBundle.description,
119
+ qty: mi.qty,
120
+ unitPrice: ((mi === null || mi === void 0 ? void 0 : mi.originalPrice) || 0) / mi.qty,
121
+ paidPrice: ((mi === null || mi === void 0 ? void 0 : mi.paidPrice) || 0) / mi.qty,
122
+ discount: (mi === null || mi === void 0 ? void 0 : mi.discount) || 0,
123
+ shippingFeePaidByCustomer: (mi === null || mi === void 0 ? void 0 : mi.shippingFeePaidByCustomer) || 0
124
+ };
125
+ }));
126
+ let newInvoice = {
127
+ invoiceProducts,
128
+ name: '-',
129
+ refNo1: newReleaseOrder.refNo.toString(),
130
+ refNo2: newReleaseOrder.refNo2.toString(),
131
+ issuedOn: new Date(),
132
+ from: marketplaceOrder.marketplaceStore.storeName,
133
+ fromContactPhone: '-',
134
+ fromAddress1: '-',
135
+ fromAddress2: null,
136
+ fromAddress3: null,
137
+ fromAddress4: null,
138
+ fromAddress5: null,
139
+ fromPostcode: null,
140
+ fromCity: null,
141
+ fromState: null,
142
+ fromCountry: null,
143
+ deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
144
+ deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
145
+ deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
146
+ deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
147
+ deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
148
+ deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
149
+ deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
150
+ deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
151
+ deliveryCity: newReleaseOrder.deliverTo.city || '-',
152
+ deliveryState: newReleaseOrder.deliverTo.state || '-',
153
+ deliveryCountry: newReleaseOrder.deliverTo.country || '-',
154
+ billTo: newReleaseOrder.deliverTo.attentionTo || '-',
155
+ billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
156
+ billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
157
+ billingAddress2: null,
158
+ billingAddress3: null,
159
+ billingAddress4: null,
160
+ billingAddress5: null,
161
+ billingPostcode: '-',
162
+ billingCity: '-',
163
+ billingState: '-',
164
+ billingCountry: '-'
165
+ };
166
+ try {
167
+ await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
168
+ customerBizplaceId,
169
+ invoice: newInvoice
170
+ });
171
+ }
172
+ catch (e) { }
172
173
  }
173
174
  }
174
175
  };
package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js CHANGED
@@ -31,6 +31,7 @@ exports.autoAddReleaseOrderResolver = {
31
31
  const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id === domain.id).id;
32
32
  for (var i = 0; i < marketplaceOrders.length; i++) {
33
33
  const marketplaceOrder = marketplaceOrders[i];
34
+ const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
34
35
  const marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
35
36
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
36
37
  order: { subOrderNoRef: 'ASC' },
@@ -49,7 +50,7 @@ exports.autoAddReleaseOrderResolver = {
49
50
  .getDate()
50
51
  .toString()
51
52
  .padStart(2, '0')}`;
52
- const newReleaseOrder = {
53
+ var newReleaseOrder = {
53
54
  releaseDate,
54
55
  type: 'b2c',
55
56
  transporter: marketplaceOrder.shippingProvider,
@@ -104,76 +105,76 @@ exports.autoAddReleaseOrderResolver = {
104
105
  }
105
106
  }
106
107
  catch (e) { }
107
- var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
108
- let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
109
- where: { domain, sku: oi.product.sku }
110
- });
111
- if (!product) {
112
- product = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
113
- where: { domain, sku: oi.product.sku }
114
- });
115
- }
116
- let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
117
- let moi = mosis[0].marketplaceOrderItem;
118
- return {
119
- sku: product.sku,
120
- name: product.name,
121
- description: product.description,
122
- product: { sku: product.sku },
123
- qty: oi.releaseQty,
124
- unitPrice: ((moi === null || moi === void 0 ? void 0 : moi.originalPrice) || 0) / moi.qty,
125
- paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
126
- };
127
- }));
128
- let newInvoice = {
129
- invoiceProducts,
130
- releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
131
- refNo1: newReleaseOrder.refNo.toString(),
132
- refNo2: newReleaseOrder.refNo2.toString(),
133
- issuedOn: new Date(),
134
- from: marketplaceOrder.marketplaceStore.storeName,
135
- fromContactPhone: '-',
136
- fromAddress1: '-',
137
- fromAddress2: null,
138
- fromAddress3: null,
139
- fromAddress4: null,
140
- fromAddress5: null,
141
- fromPostcode: null,
142
- fromCity: null,
143
- fromState: null,
144
- fromCountry: null,
145
- deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
146
- deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
147
- deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
148
- deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
149
- deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
150
- deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
151
- deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
152
- deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
153
- deliveryCity: newReleaseOrder.deliverTo.city || '-',
154
- deliveryState: newReleaseOrder.deliverTo.state || '-',
155
- deliveryCountry: newReleaseOrder.deliverTo.country || '-',
156
- billTo: newReleaseOrder.deliverTo.attentionTo || '-',
157
- billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
158
- billingAddress1: releaseOrder.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
159
- billingAddress2: null,
160
- billingAddress3: null,
161
- billingAddress4: null,
162
- billingAddress5: null,
163
- billingPostcode: '-',
164
- billingCity: '-',
165
- billingState: '-',
166
- billingCountry: '-'
167
- };
168
- try {
169
- await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
170
- customerBizplaceId,
171
- invoice: newInvoice
172
- });
173
- }
174
- catch (e) { }
175
108
  }
176
109
  }
110
+ var invoiceProducts = await Promise.all(marketplaceOrderItems.map(async (mi) => {
111
+ let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
112
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
113
+ });
114
+ let productBundle;
115
+ if (!product) {
116
+ productBundle = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
117
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
118
+ });
119
+ }
120
+ return {
121
+ sku: product ? product.sku : productBundle.sku,
122
+ name: product ? product.name : productBundle.name,
123
+ description: product ? product.description : productBundle.description,
124
+ qty: mi.qty,
125
+ unitPrice: ((mi === null || mi === void 0 ? void 0 : mi.originalPrice) || 0) / mi.qty,
126
+ paidPrice: ((mi === null || mi === void 0 ? void 0 : mi.paidPrice) || 0) / mi.qty,
127
+ discount: (mi === null || mi === void 0 ? void 0 : mi.discount) || 0,
128
+ shippingFeePaidByCustomer: (mi === null || mi === void 0 ? void 0 : mi.shippingFeePaidByCustomer) || 0
129
+ };
130
+ }));
131
+ let newInvoice = {
132
+ invoiceProducts,
133
+ name: '-',
134
+ refNo1: newReleaseOrder.refNo.toString(),
135
+ refNo2: newReleaseOrder.refNo2.toString(),
136
+ issuedOn: new Date(),
137
+ from: marketplaceOrder.marketplaceStore.storeName,
138
+ fromContactPhone: '-',
139
+ fromAddress1: '-',
140
+ fromAddress2: null,
141
+ fromAddress3: null,
142
+ fromAddress4: null,
143
+ fromAddress5: null,
144
+ fromPostcode: null,
145
+ fromCity: null,
146
+ fromState: null,
147
+ fromCountry: null,
148
+ deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
149
+ deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
150
+ deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
151
+ deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
152
+ deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
153
+ deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
154
+ deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
155
+ deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
156
+ deliveryCity: newReleaseOrder.deliverTo.city || '-',
157
+ deliveryState: newReleaseOrder.deliverTo.state || '-',
158
+ deliveryCountry: newReleaseOrder.deliverTo.country || '-',
159
+ billTo: newReleaseOrder.deliverTo.attentionTo || '-',
160
+ billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
161
+ billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
162
+ billingAddress2: null,
163
+ billingAddress3: null,
164
+ billingAddress4: null,
165
+ billingAddress5: null,
166
+ billingPostcode: '-',
167
+ billingCity: '-',
168
+ billingState: '-',
169
+ billingCountry: '-'
170
+ };
171
+ try {
172
+ await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
173
+ customerBizplaceId,
174
+ invoice: newInvoice
175
+ });
176
+ }
177
+ catch (e) { }
177
178
  }
178
179
  }
179
180
  };
package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map CHANGED
@@ -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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"}
package/dist-server/routers/etrax-router.js CHANGED
@@ -71,21 +71,21 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
71
71
  ]
72
72
  });
73
73
  let orderItems = order.marketplaceOrderItems;
74
+ const marketplaceStore = order.marketplaceStore;
75
+ const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
76
+ where: { marketplaceStore },
77
+ relations: ['pickupTransporter']
78
+ });
74
79
  for (const orderItem of orderItems) {
75
80
  if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
76
81
  const orderShippingItems = orderItem.marketplaceOrderShippingItems;
77
82
  const orderShipping = orderShippingItems[0].marketplaceOrderShipping;
78
83
  const fulfillmentCenter = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.fulfillmentCenter;
79
- const marketplaceStore = order.marketplaceStore;
80
84
  const currentDate = new Date();
81
85
  const centerId = fulfillmentCenter.centerId;
82
86
  const warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
83
87
  const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
84
88
  const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id == (order === null || order === void 0 ? void 0 : order.domain.id)).id;
85
- const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
86
- where: { marketplaceStore },
87
- relations: ['pickupTransporter']
88
- });
89
89
  let patch = {
90
90
  id: orderShipping.releaseOrderId,
91
91
  trackingNo: trackingNo,
@@ -96,11 +96,9 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
96
96
  releaseOrder: Object.assign({}, patch),
97
97
  shippingOrder: null
98
98
  });
99
- await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate });
99
+ await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: (marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name) || orderShipping.transporter });
100
100
  }
101
101
  }
102
- const storeId = order.marketplaceStore.id;
103
- const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
104
102
  // to-do update tracking no to every marketplaces
105
103
  if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
106
104
  const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
@@ -115,7 +113,8 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
115
113
  trackingUrl: note,
116
114
  trackingNo,
117
115
  order: orderInfo,
118
- note
116
+ note,
117
+ transporter: marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name
119
118
  });
120
119
  if (marketplaceStore.platform === 'woocommerce') {
121
120
  await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
package/dist-server/routers/etrax-router.js.map CHANGED
@@ -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": "5.0.0-alpha.2",
3
+ "version": "5.0.0-alpha.22",
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.4.3",
45
- "@operato/scene-chartjs": "^0.1.5",
46
- "@operato/scene-clock": "^0.1.5",
47
- "@operato/scene-clone": "^0.1.5",
48
- "@operato/scene-compass": "^0.1.5",
49
- "@operato/scene-gauge": "^0.1.5",
50
- "@operato/scene-grist": "^0.1.5",
51
- "@operato/scene-half-roundrect": "^0.1.5",
52
- "@operato/scene-indoor-map": "^0.1.5",
53
- "@operato/scene-integration": "^0.1.5",
54
- "@operato/scene-legend": "^0.1.5",
55
- "@operato/scene-news-ticker": "^0.1.5",
56
- "@operato/scene-progressbar": "^0.1.5",
57
- "@operato/scene-random": "^0.1.5",
58
- "@operato/scene-switch": "^0.1.5",
59
- "@operato/scene-tab": "^0.1.5",
60
- "@operato/scene-table": "^0.1.5",
61
- "@operato/scene-timer": "^0.1.5",
62
- "@operato/scene-wheel-sorter": "^0.1.5",
63
- "@things-factory/apptool-ui": "^5.0.0-alpha.2",
64
- "@things-factory/attachment-base": "^5.0.0-alpha.2",
65
- "@things-factory/auth-ui": "^5.0.0-alpha.2",
66
- "@things-factory/biz-base": "^5.0.0-alpha.2",
67
- "@things-factory/board-service": "^5.0.0-alpha.2",
68
- "@things-factory/board-ui": "^5.0.0-alpha.2",
69
- "@things-factory/code-ui": "^5.0.0-alpha.2",
70
- "@things-factory/context-ui": "^5.0.0-alpha.2",
71
- "@things-factory/dashboard": "^5.0.0-alpha.2",
72
- "@things-factory/export-ui": "^5.0.0-alpha.2",
73
- "@things-factory/export-ui-csv": "^5.0.0-alpha.2",
74
- "@things-factory/export-ui-excel": "^5.0.0-alpha.2",
75
- "@things-factory/geography": "^5.0.0-alpha.2",
76
- "@things-factory/grist-ui": "^5.0.0-alpha.2",
77
- "@things-factory/help": "^5.0.0-alpha.2",
78
- "@things-factory/i18n-base": "^5.0.0-alpha.2",
79
- "@things-factory/integration-fulfillment": "^5.0.0-alpha.2",
80
- "@things-factory/integration-lmd": "^5.0.0-alpha.2",
81
- "@things-factory/lite-menu": "^5.0.0-alpha.2",
82
- "@things-factory/marketplace-base": "^5.0.0-alpha.2",
83
- "@things-factory/more-ui": "^5.0.0-alpha.2",
84
- "@things-factory/notification": "^5.0.0-alpha.2",
85
- "@things-factory/oauth2-client": "^5.0.0-alpha.2",
86
- "@things-factory/pdf": "^5.0.0-alpha.2",
87
- "@things-factory/product-base": "^5.0.0-alpha.2",
88
- "@things-factory/resource-ui": "^5.0.0-alpha.2",
89
- "@things-factory/scene-data-transform": "^5.0.0-alpha.2",
90
- "@things-factory/scene-excel": "^5.0.0-alpha.2",
91
- "@things-factory/scene-firebase": "^5.0.0-alpha.2",
92
- "@things-factory/scene-form": "^5.0.0-alpha.2",
93
- "@things-factory/scene-google-map": "^5.0.0-alpha.2",
94
- "@things-factory/scene-graphql": "^5.0.0-alpha.2",
95
- "@things-factory/scene-label": "^5.0.0-alpha.2",
96
- "@things-factory/scene-marker": "^5.0.0-alpha.2",
97
- "@things-factory/scene-mqtt": "^5.0.0-alpha.2",
98
- "@things-factory/scene-restful": "^5.0.0-alpha.2",
99
- "@things-factory/scene-visualizer": "^5.0.0-alpha.2",
100
- "@things-factory/setting-ui": "^5.0.0-alpha.2",
101
- "@things-factory/system-ui": "^5.0.0-alpha.2",
102
- "@things-factory/warehouse-base": "^5.0.0-alpha.2"
44
+ "@operato/ghost-print": "1.0.0-alpha.45",
45
+ "@operato/scene-chartjs": "^1.0.0-alpha.4",
46
+ "@operato/scene-clock": "^1.0.0-alpha.4",
47
+ "@operato/scene-clone": "^1.0.0-alpha.4",
48
+ "@operato/scene-compass": "^1.0.0-alpha.4",
49
+ "@operato/scene-gauge": "^1.0.0-alpha.4",
50
+ "@operato/scene-grist": "^1.0.0-alpha.4",
51
+ "@operato/scene-half-roundrect": "^1.0.0-alpha.4",
52
+ "@operato/scene-indoor-map": "^1.0.0-alpha.4",
53
+ "@operato/scene-integration": "^1.0.0-alpha.4",
54
+ "@operato/scene-legend": "^1.0.0-alpha.4",
55
+ "@operato/scene-news-ticker": "^1.0.0-alpha.4",
56
+ "@operato/scene-progressbar": "^1.0.0-alpha.4",
57
+ "@operato/scene-random": "^1.0.0-alpha.4",
58
+ "@operato/scene-switch": "^1.0.0-alpha.4",
59
+ "@operato/scene-tab": "^1.0.0-alpha.4",
60
+ "@operato/scene-table": "^1.0.0-alpha.4",
61
+ "@operato/scene-timer": "^1.0.0-alpha.4",
62
+ "@operato/scene-wheel-sorter": "^1.0.0-alpha.4",
63
+ "@things-factory/apptool-ui": "^5.0.0-alpha.22",
64
+ "@things-factory/attachment-base": "^5.0.0-alpha.22",
65
+ "@things-factory/auth-ui": "^5.0.0-alpha.22",
66
+ "@things-factory/biz-base": "^5.0.0-alpha.22",
67
+ "@things-factory/board-service": "^5.0.0-alpha.22",
68
+ "@things-factory/board-ui": "^5.0.0-alpha.22",
69
+ "@things-factory/code-ui": "^5.0.0-alpha.22",
70
+ "@things-factory/context-ui": "^5.0.0-alpha.22",
71
+ "@things-factory/dashboard": "^5.0.0-alpha.22",
72
+ "@things-factory/export-ui": "^5.0.0-alpha.22",
73
+ "@things-factory/export-ui-csv": "^5.0.0-alpha.22",
74
+ "@things-factory/export-ui-excel": "^5.0.0-alpha.22",
75
+ "@things-factory/geography": "^5.0.0-alpha.22",
76
+ "@things-factory/grist-ui": "^5.0.0-alpha.22",
77
+ "@things-factory/help": "^5.0.0-alpha.22",
78
+ "@things-factory/i18n-base": "^5.0.0-alpha.22",
79
+ "@things-factory/integration-fulfillment": "^5.0.0-alpha.22",
80
+ "@things-factory/integration-lmd": "^5.0.0-alpha.22",
81
+ "@things-factory/lite-menu": "^5.0.0-alpha.22",
82
+ "@things-factory/marketplace-base": "^5.0.0-alpha.22",
83
+ "@things-factory/more-ui": "^5.0.0-alpha.22",
84
+ "@things-factory/notification": "^5.0.0-alpha.22",
85
+ "@things-factory/oauth2-client": "^5.0.0-alpha.22",
86
+ "@things-factory/pdf": "^5.0.0-alpha.22",
87
+ "@things-factory/product-base": "^5.0.0-alpha.22",
88
+ "@things-factory/resource-ui": "^5.0.0-alpha.22",
89
+ "@things-factory/scene-data-transform": "^5.0.0-alpha.22",
90
+ "@things-factory/scene-excel": "^5.0.0-alpha.22",
91
+ "@things-factory/scene-firebase": "^5.0.0-alpha.22",
92
+ "@things-factory/scene-form": "^5.0.0-alpha.22",
93
+ "@things-factory/scene-google-map": "^5.0.0-alpha.22",
94
+ "@things-factory/scene-graphql": "^5.0.0-alpha.22",
95
+ "@things-factory/scene-label": "^5.0.0-alpha.22",
96
+ "@things-factory/scene-marker": "^5.0.0-alpha.22",
97
+ "@things-factory/scene-mqtt": "^5.0.0-alpha.22",
98
+ "@things-factory/scene-restful": "^5.0.0-alpha.22",
99
+ "@things-factory/scene-visualizer": "^5.0.0-alpha.22",
100
+ "@things-factory/setting-ui": "^5.0.0-alpha.22",
101
+ "@things-factory/system-ui": "^5.0.0-alpha.22",
102
+ "@things-factory/warehouse-base": "^5.0.0-alpha.22"
103
103
  },
104
104
  "devDependencies": {
105
- "@things-factory/builder": "^5.0.0-alpha.2",
105
+ "@things-factory/builder": "^5.0.0-alpha.22",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "055536f981d229d51ae63f46585036b35fa86602"
108
+ "gitHead": "8e06de9c59237f1800b2ff4f1c53162a0228342a"
109
109
  }
package/server/graphql/resolvers/interface-with-hub/add-release-order.ts CHANGED
@@ -42,6 +42,8 @@ export const addReleaseOrderResolver = {
42
42
  ]
43
43
  })
44
44
 
45
+ const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
46
+
45
47
  let marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
46
48
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
47
49
  order: { subOrderNoRef: 'ASC' },
@@ -64,7 +66,7 @@ export const addReleaseOrderResolver = {
64
66
  .toString()
65
67
  .padStart(2, '0')}`
66
68
 
67
- const newReleaseOrder: any = {
69
+ var newReleaseOrder: any = {
68
70
  releaseDate,
69
71
  type: 'b2c',
70
72
  transporter: marketplaceOrder.shippingProvider,
@@ -122,86 +124,82 @@ export const addReleaseOrderResolver = {
122
124
  await getRepository(MarketplaceOrder).save(marketplaceOrder)
123
125
  }
124
126
  } catch (e) {}
127
+ }
128
+ }
125
129
 
126
- var invoiceProducts = await Promise.all(
127
- newReleaseOrder.orderInventories.map(async oi => {
128
- let product: Product = await getRepository(Product).findOne({
129
- where: { domain, sku: oi.product.sku }
130
- })
131
-
132
- if (!product) {
133
- product = await getRepository(ProductBundle).findOne({
134
- where: { domain, sku: oi.product.sku }
135
- })
136
- }
137
-
138
- let mosis: MarketplaceOrderShippingItem[] = marketplaceOrderShippingItems.filter(
139
- mosi => mosi.product.sku === product.sku
140
- )
141
-
142
- let moi: MarketplaceOrderItem = mosis[0].marketplaceOrderItem
130
+ var invoiceProducts = await Promise.all(
131
+ marketplaceOrderItems.map(async mi => {
132
+ let product: Product = await getRepository(Product).findOne({
133
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
134
+ })
143
135
 
144
- return {
145
- sku: product.sku,
146
- name: product.name,
147
- description: product.description,
148
- product: { sku: product.sku },
149
- qty: oi.releaseQty,
150
- unitPrice: (moi?.originalPrice || 0) / moi.qty,
151
- paidPrice: (moi?.paidPrice || 0) / moi.qty
152
- }
136
+ let productBundle: ProductBundle
137
+ if (!product) {
138
+ productBundle = await getRepository(ProductBundle).findOne({
139
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
153
140
  })
154
- )
155
-
156
- let newInvoice = {
157
- invoiceProducts,
158
- releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
159
- refNo1: newReleaseOrder.refNo.toString(),
160
- refNo2: newReleaseOrder.refNo2.toString(),
161
- issuedOn: new Date(),
162
- from: marketplaceOrder.marketplaceStore.storeName,
163
- fromContactPhone: '-',
164
- fromAddress1: '-',
165
- fromAddress2: null,
166
- fromAddress3: null,
167
- fromAddress4: null,
168
- fromAddress5: null,
169
- fromPostcode: null,
170
- fromCity: null,
171
- fromState: null,
172
- fromCountry: null,
173
- deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
174
- deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
175
- deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
176
- deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
177
- deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
178
- deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
179
- deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
180
- deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
181
- deliveryCity: newReleaseOrder.deliverTo.city || '-',
182
- deliveryState: newReleaseOrder.deliverTo.state || '-',
183
- deliveryCountry: newReleaseOrder.deliverTo.country || '-',
184
- billTo: newReleaseOrder.deliverTo.attentionTo || '-',
185
- billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
186
- billingAddress1: releaseOrder.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
187
- billingAddress2: null,
188
- billingAddress3: null,
189
- billingAddress4: null,
190
- billingAddress5: null,
191
- billingPostcode: '-',
192
- billingCity: '-',
193
- billingState: '-',
194
- billingCountry: '-'
195
141
  }
196
142
 
197
- try {
198
- await FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
199
- customerBizplaceId,
200
- invoice: newInvoice
201
- })
202
- } catch (e) {}
203
- }
143
+ return {
144
+ sku: product ? product.sku : productBundle.sku,
145
+ name: product ? product.name : productBundle.name,
146
+ description: product ? product.description : productBundle.description,
147
+ qty: mi.qty,
148
+ unitPrice: (mi?.originalPrice || 0) / mi.qty,
149
+ paidPrice: (mi?.paidPrice || 0) / mi.qty,
150
+ discount: mi?.discount || 0,
151
+ shippingFeePaidByCustomer: mi?.shippingFeePaidByCustomer || 0
152
+ }
153
+ })
154
+ )
155
+
156
+ let newInvoice = {
157
+ invoiceProducts,
158
+ name: '-',
159
+ refNo1: newReleaseOrder.refNo.toString(),
160
+ refNo2: newReleaseOrder.refNo2.toString(),
161
+ issuedOn: new Date(),
162
+ from: marketplaceOrder.marketplaceStore.storeName,
163
+ fromContactPhone: '-',
164
+ fromAddress1: '-',
165
+ fromAddress2: null,
166
+ fromAddress3: null,
167
+ fromAddress4: null,
168
+ fromAddress5: null,
169
+ fromPostcode: null,
170
+ fromCity: null,
171
+ fromState: null,
172
+ fromCountry: null,
173
+ deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
174
+ deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
175
+ deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
176
+ deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
177
+ deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
178
+ deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
179
+ deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
180
+ deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
181
+ deliveryCity: newReleaseOrder.deliverTo.city || '-',
182
+ deliveryState: newReleaseOrder.deliverTo.state || '-',
183
+ deliveryCountry: newReleaseOrder.deliverTo.country || '-',
184
+ billTo: newReleaseOrder.deliverTo.attentionTo || '-',
185
+ billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
186
+ billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
187
+ billingAddress2: null,
188
+ billingAddress3: null,
189
+ billingAddress4: null,
190
+ billingAddress5: null,
191
+ billingPostcode: '-',
192
+ billingCity: '-',
193
+ billingState: '-',
194
+ billingCountry: '-'
204
195
  }
196
+
197
+ try {
198
+ await FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
199
+ customerBizplaceId,
200
+ invoice: newInvoice
201
+ })
202
+ } catch (e) {}
205
203
  }
206
204
  }
207
205
  }
package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts CHANGED
@@ -42,6 +42,8 @@ export const autoAddReleaseOrderResolver = {
42
42
  for (var i = 0; i < marketplaceOrders.length; i++) {
43
43
  const marketplaceOrder = marketplaceOrders[i]
44
44
 
45
+ const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
46
+
45
47
  const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
46
48
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
47
49
  order: { subOrderNoRef: 'ASC' },
@@ -64,7 +66,7 @@ export const autoAddReleaseOrderResolver = {
64
66
  .toString()
65
67
  .padStart(2, '0')}`
66
68
 
67
- const newReleaseOrder: any = {
69
+ var newReleaseOrder: any = {
68
70
  releaseDate,
69
71
  type: 'b2c',
70
72
  transporter: marketplaceOrder.shippingProvider,
@@ -122,86 +124,82 @@ export const autoAddReleaseOrderResolver = {
122
124
  await getRepository(MarketplaceOrder).save(marketplaceOrder)
123
125
  }
124
126
  } catch (e) {}
127
+ }
128
+ }
125
129
 
126
- var invoiceProducts = await Promise.all(
127
- newReleaseOrder.orderInventories.map(async oi => {
128
- let product: Product = await getRepository(Product).findOne({
129
- where: { domain, sku: oi.product.sku }
130
- })
131
-
132
- if (!product) {
133
- product = await getRepository(ProductBundle).findOne({
134
- where: { domain, sku: oi.product.sku }
135
- })
136
- }
137
-
138
- let mosis: MarketplaceOrderShippingItem[] = marketplaceOrderShippingItems.filter(
139
- mosi => mosi.product.sku === product.sku
140
- )
141
-
142
- let moi: MarketplaceOrderItem = mosis[0].marketplaceOrderItem
130
+ var invoiceProducts = await Promise.all(
131
+ marketplaceOrderItems.map(async mi => {
132
+ let product: Product = await getRepository(Product).findOne({
133
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
134
+ })
143
135
 
144
- return {
145
- sku: product.sku,
146
- name: product.name,
147
- description: product.description,
148
- product: { sku: product.sku },
149
- qty: oi.releaseQty,
150
- unitPrice: (moi?.originalPrice || 0) / moi.qty,
151
- paidPrice: (moi?.paidPrice || 0) / moi.qty
152
- }
136
+ let productBundle: ProductBundle
137
+ if (!product) {
138
+ productBundle = await getRepository(ProductBundle).findOne({
139
+ where: { domain, sku: mi.marketplaceProductVariation.sku }
153
140
  })
154
- )
155
-
156
- let newInvoice = {
157
- invoiceProducts,
158
- releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
159
- refNo1: newReleaseOrder.refNo.toString(),
160
- refNo2: newReleaseOrder.refNo2.toString(),
161
- issuedOn: new Date(),
162
- from: marketplaceOrder.marketplaceStore.storeName,
163
- fromContactPhone: '-',
164
- fromAddress1: '-',
165
- fromAddress2: null,
166
- fromAddress3: null,
167
- fromAddress4: null,
168
- fromAddress5: null,
169
- fromPostcode: null,
170
- fromCity: null,
171
- fromState: null,
172
- fromCountry: null,
173
- deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
174
- deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
175
- deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
176
- deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
177
- deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
178
- deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
179
- deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
180
- deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
181
- deliveryCity: newReleaseOrder.deliverTo.city || '-',
182
- deliveryState: newReleaseOrder.deliverTo.state || '-',
183
- deliveryCountry: newReleaseOrder.deliverTo.country || '-',
184
- billTo: newReleaseOrder.deliverTo.attentionTo || '-',
185
- billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
186
- billingAddress1: releaseOrder.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
187
- billingAddress2: null,
188
- billingAddress3: null,
189
- billingAddress4: null,
190
- billingAddress5: null,
191
- billingPostcode: '-',
192
- billingCity: '-',
193
- billingState: '-',
194
- billingCountry: '-'
195
141
  }
196
142
 
197
- try {
198
- await FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
199
- customerBizplaceId,
200
- invoice: newInvoice
201
- })
202
- } catch (e) {}
203
- }
143
+ return {
144
+ sku: product ? product.sku : productBundle.sku,
145
+ name: product ? product.name : productBundle.name,
146
+ description: product ? product.description : productBundle.description,
147
+ qty: mi.qty,
148
+ unitPrice: (mi?.originalPrice || 0) / mi.qty,
149
+ paidPrice: (mi?.paidPrice || 0) / mi.qty,
150
+ discount: mi?.discount || 0,
151
+ shippingFeePaidByCustomer: mi?.shippingFeePaidByCustomer || 0
152
+ }
153
+ })
154
+ )
155
+
156
+ let newInvoice = {
157
+ invoiceProducts,
158
+ name: '-',
159
+ refNo1: newReleaseOrder.refNo.toString(),
160
+ refNo2: newReleaseOrder.refNo2.toString(),
161
+ issuedOn: new Date(),
162
+ from: marketplaceOrder.marketplaceStore.storeName,
163
+ fromContactPhone: '-',
164
+ fromAddress1: '-',
165
+ fromAddress2: null,
166
+ fromAddress3: null,
167
+ fromAddress4: null,
168
+ fromAddress5: null,
169
+ fromPostcode: null,
170
+ fromCity: null,
171
+ fromState: null,
172
+ fromCountry: null,
173
+ deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
174
+ deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
175
+ deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
176
+ deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
177
+ deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
178
+ deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
179
+ deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
180
+ deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
181
+ deliveryCity: newReleaseOrder.deliverTo.city || '-',
182
+ deliveryState: newReleaseOrder.deliverTo.state || '-',
183
+ deliveryCountry: newReleaseOrder.deliverTo.country || '-',
184
+ billTo: newReleaseOrder.deliverTo.attentionTo || '-',
185
+ billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
186
+ billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
187
+ billingAddress2: null,
188
+ billingAddress3: null,
189
+ billingAddress4: null,
190
+ billingAddress5: null,
191
+ billingPostcode: '-',
192
+ billingCity: '-',
193
+ billingState: '-',
194
+ billingCountry: '-'
204
195
  }
196
+
197
+ try {
198
+ await FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
199
+ customerBizplaceId,
200
+ invoice: newInvoice
201
+ })
202
+ } catch (e) {}
205
203
  }
206
204
  }
207
205
  }
package/server/routers/etrax-router.ts CHANGED
@@ -82,12 +82,18 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
82
82
  })
83
83
  let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
84
84
 
85
+ const marketplaceStore: MarketplaceStore = order.marketplaceStore
86
+
87
+ const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
88
+ where: { marketplaceStore },
89
+ relations: ['pickupTransporter']
90
+ })
91
+
85
92
  for (const orderItem of orderItems) {
86
93
  if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
87
94
  const orderShippingItems: MarketplaceOrderShippingItem[] = orderItem.marketplaceOrderShippingItems
88
95
  const orderShipping: MarketplaceOrderShipping = orderShippingItems[0].marketplaceOrderShipping
89
96
  const fulfillmentCenter: FulfillmentCenter = orderShipping?.fulfillmentCenter
90
- const marketplaceStore: MarketplaceStore = order.marketplaceStore
91
97
 
92
98
  const currentDate: Date = new Date()
93
99
 
@@ -98,11 +104,6 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
98
104
  customerBizplace => customerBizplace.company.domain.id == order?.domain.id
99
105
  ).id
100
106
 
101
- const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
102
- where: { marketplaceStore },
103
- relations: ['pickupTransporter']
104
- })
105
-
106
107
  let patch = {
107
108
  id: orderShipping.releaseOrderId,
108
109
  trackingNo: trackingNo,
@@ -117,14 +118,11 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
117
118
 
118
119
  await orderShippingRepo.update(
119
120
  { id: orderShipping.id },
120
- { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate }
121
+ { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: marketplaceTransporter?.pickupTransporter.name || orderShipping.transporter }
121
122
  )
122
123
  }
123
124
  }
124
125
 
125
- const storeId = order.marketplaceStore.id
126
- const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
127
-
128
126
  // to-do update tracking no to every marketplaces
129
127
  if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
130
128
  const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
@@ -139,7 +137,8 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
139
137
  trackingUrl: note,
140
138
  trackingNo,
141
139
  order: orderInfo,
142
- note
140
+ note,
141
+ transporter: marketplaceTransporter?.pickupTransporter.name
143
142
  })
144
143
 
145
144
  if (marketplaceStore.platform === 'woocommerce') {
package/translations/en.json CHANGED
@@ -114,6 +114,7 @@
114
114
  "field.required_branch": "required branch",
115
115
  "field.required_sender": "required sender",
116
116
  "field.required_tracking": "required tracking",
117
+ "field.reserve_enabled": "reserve enabled",
117
118
  "field.reserve_qty": "reserve qty",
118
119
  "field.ro_created": "ro created",
119
120
  "field.save": "save",
@@ -145,6 +146,7 @@
145
146
  "field.town": "town",
146
147
  "field.tracking_no": "tracking no",
147
148
  "field.tracking_url": "tracking URL",
149
+ "field.transporter": "transporter",
148
150
  "field.type": "type",
149
151
  "field.unit": "unit",
150
152
  "field.uom_value": "UOM value",
package/translations/ko.json CHANGED
@@ -114,6 +114,7 @@
114
114
  "field.required_branch": "[ko] required branch",
115
115
  "field.required_sender": "[ko] required sender",
116
116
  "field.required_tracking": "[ko] required tracking",
117
+ "field.reserve_enabled": "[ko] reserve enabled",
117
118
  "field.reserve_qty": "[ko] reserve qty",
118
119
  "field.ro_created": "[ko] ro created",
119
120
  "field.save": "[ko] save",
@@ -144,6 +145,7 @@
144
145
  "field.town": "[ko] town",
145
146
  "field.tracking_no": "[ko] tracking no",
146
147
  "field.tracking_url": "[ko] tracking URL",
148
+ "field.transporter": "[ko] transporter",
147
149
  "field.type": "[ko] type",
148
150
  "field.unit": "[ko] unit",
149
151
  "field.uom_value": "[ko] UOM value",
package/translations/ms.json CHANGED
@@ -114,6 +114,7 @@
114
114
  "field.required_branch": "[ms] required branch",
115
115
  "field.required_sender": "[ms] required sender",
116
116
  "field.required_tracking": "[ms] required tracking",
117
+ "field.reserve_enabled": "[ms] reserve enabled",
117
118
  "field.reserve_qty": "[ms] reserve qty",
118
119
  "field.ro_created": "[ms] ro created",
119
120
  "field.save": "[ms] save",
@@ -144,6 +145,7 @@
144
145
  "field.town": "[ms] town",
145
146
  "field.tracking_no": "[ms] tracking no",
146
147
  "field.tracking_url": "[ms] tracking URL",
148
+ "field.transporter": "[ms] transporter",
147
149
  "field.type": "[ms] type",
148
150
  "field.unit": "[ms] unit",
149
151
  "field.uom_value": "[ms] UOM value",
package/translations/zh.json CHANGED
@@ -114,6 +114,7 @@
114
114
  "field.required_branch": "[zh] required branch",
115
115
  "field.required_sender": "[zh] required sender",
116
116
  "field.required_tracking": "[zh] required tracking",
117
+ "field.reserve_enabled": "[zh] reserve enabled",
117
118
  "field.reserve_qty": "[zh] reserve qty",
118
119
  "field.ro_created": "[zh] ro created",
119
120
  "field.save": "[zh] save",
@@ -144,6 +145,7 @@
144
145
  "field.town": "[zh] town",
145
146
  "field.tracking_no": "[zh] tracking no",
146
147
  "field.tracking_url": "[zh] tracking URL",
148
+ "field.transporter": "[zh] transporter",
147
149
  "field.type": "[zh] type",
148
150
  "field.unit": "[zh] unit",
149
151
  "field.uom_value": "[zh] UOM value",