@things-factory/operato-mms 3.8.28 → 3.8.29

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.
@@ -5,6 +5,7 @@ const typeorm_1 = require("typeorm");
5
5
  const biz_base_1 = require("@things-factory/biz-base");
6
6
  const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
7
7
  const marketplace_base_1 = require("@things-factory/marketplace-base");
8
+ const product_base_1 = require("@things-factory/product-base");
8
9
  const shell_1 = require("@things-factory/shell");
9
10
  exports.addReleaseOrderResolver = {
10
11
  async addReleaseOrder(_, { marketplaceOrderIds, warehouseId }, context) {
@@ -20,11 +21,14 @@ exports.addReleaseOrderResolver = {
20
21
  relations: [
21
22
  'marketplaceOrderItems',
22
23
  'marketplaceOrderItems.marketplaceProductVariation',
23
- 'marketplaceOrderItems.marketplaceOrderShipping'
24
+ 'marketplaceOrderItems.marketplaceOrderShipping',
25
+ 'marketplaceStore'
24
26
  ]
25
27
  });
26
- const marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
27
- where: { orderNoRef: marketplaceOrder.orderNo, domain }
28
+ let marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
29
+ where: { orderNoRef: marketplaceOrder.orderNo, domain },
30
+ order: { subOrderNoRef: 'ASC' },
31
+ relations: ['marketplaceOrderItems']
28
32
  });
29
33
  for (var j = 0; j < marketplaceOrderShippings.length; j++) {
30
34
  let marketplaceOrderShipping = marketplaceOrderShippings[j];
@@ -84,6 +88,70 @@ exports.addReleaseOrderResolver = {
84
88
  customerBizplaceId,
85
89
  releaseOrder: newReleaseOrder
86
90
  });
91
+ var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
92
+ let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
93
+ where: { domain, sku: oi.product.sku }
94
+ });
95
+ if (!product) {
96
+ product = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
97
+ where: { domain, sku: oi.product.sku }
98
+ });
99
+ }
100
+ let moi = marketplaceOrder.marketplaceOrderItems.find(moi => moi.marketplaceProductVariation.sku === product.sku);
101
+ return {
102
+ sku: product.sku,
103
+ name: product.name,
104
+ description: product.description,
105
+ product: { sku: product.sku },
106
+ qty: oi.releaseQty,
107
+ unitPrice: moi.originalPrice / moi.qty,
108
+ paidPrice: moi.paidPrice / moi.qty
109
+ };
110
+ }));
111
+ let newInvoice = {
112
+ invoiceProducts,
113
+ releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
114
+ refNo1: newReleaseOrder.refNo.toString(),
115
+ refNo2: newReleaseOrder.refNo2.toString(),
116
+ issuedOn: new Date(),
117
+ from: marketplaceOrder.marketplaceStore.storeName,
118
+ fromContactPhone: '-',
119
+ fromAddress1: '-',
120
+ fromAddress2: null,
121
+ fromAddress3: null,
122
+ fromAddress4: null,
123
+ fromAddress5: null,
124
+ fromPostcode: null,
125
+ fromCity: null,
126
+ fromState: null,
127
+ fromCountry: null,
128
+ deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
129
+ deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
130
+ deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
131
+ deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
132
+ deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
133
+ deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
134
+ deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
135
+ deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
136
+ deliveryCity: newReleaseOrder.deliverTo.city || '-',
137
+ deliveryState: newReleaseOrder.deliverTo.state || '-',
138
+ deliveryCountry: newReleaseOrder.deliverTo.country || '-',
139
+ billTo: newReleaseOrder.deliverTo.attentionTo || '-',
140
+ billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
141
+ billingAddress1: releaseOrder.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
142
+ billingAddress2: null,
143
+ billingAddress3: null,
144
+ billingAddress4: null,
145
+ billingAddress5: null,
146
+ billingPostcode: '-',
147
+ billingCity: '-',
148
+ billingState: '-',
149
+ billingCountry: '-'
150
+ };
151
+ var invoice = await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
152
+ customerBizplaceId,
153
+ invoice: newInvoice
154
+ });
87
155
  marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
88
156
  marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
89
157
  await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
@@ -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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"}
@@ -30,7 +30,8 @@ exports.autoAddReleaseOrderResolver = {
30
30
  for (var i = 0; i < marketplaceOrders.length; i++) {
31
31
  const marketplaceOrder = marketplaceOrders[i];
32
32
  const marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
33
- where: { orderNoRef: marketplaceOrder.orderNo, domain }
33
+ where: { orderNoRef: marketplaceOrder.orderNo, domain },
34
+ order: { subOrderNoRef: 'ASC' }
34
35
  });
35
36
  for (var j = 0; j < marketplaceOrderShippings.length; j++) {
36
37
  let marketplaceOrderShipping = marketplaceOrderShippings[j];
@@ -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":";;;AAAA,qCAA+E;AAE/E,uDAAyE;AACzE,qFAAwE;AACxE,uEAA6F;AAC7F,iDAA8C;AAEjC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAO,EAAE,EAAE,WAAW,EAA2B,EAAE,OAAY;QACvF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,MAAM,EAAE,GAAyC,IAAA,4BAAkB,EAAC,mCAAgB,EAAE,IAAI,CAAC,CAAA;QAC3F,MAAM,iBAAiB,GAAuB,MAAM,EAAE;aACnD,iBAAiB,CAAC,0BAA0B,EAAE,KAAK,CAAC;aACpD,iBAAiB,CAAC,8BAA8B,EAAE,KAAK,CAAC;aACxD,iBAAiB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC3D,iBAAiB,CAAC,qBAAqB,EAAE,KAAK,CAAC;aAC/C,KAAK,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACvD,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,2BAA2B,EAAE;YACrC,MAAM,EAAE,CAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,CAAC;SACjE,CAAC;aACD,QAAQ,CAAC,iCAAiC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC;aAC5E,OAAO,EAAE,CAAA;QAEZ,IAAI,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC7E,IAAI,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAEhD,IAAI,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACrG,IAAI,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;QAC/E,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,IAAI,CACvD,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CACrE,CAAC,EAAE,CAAA;QAEJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;YAE7C,MAAM,yBAAyB,GAA+B,MAAM,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAC,IAAI,CAAC;gBAC/G,KAAK,EAAE,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE;gBACvD,KAAK,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE;aAChC,CAAC,CAAA;YAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,yBAAyB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzD,IAAI,wBAAwB,GAA6B,yBAAyB,CAAC,CAAC,CAAC,CAAA;gBAErF,IAAI,CAAC,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,cAAc,CAAA,EAAE;oBAC7C,MAAM,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;oBAC7B,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;yBAC/D,QAAQ,EAAE;yBACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAA;oBAEnE,MAAM,mBAAmB,GAAQ;wBAC/B,WAAW;wBACX,IAAI,EAAE,KAAK;wBACX,WAAW,EAAE,gBAAgB,CAAC,gBAAgB;wBAC9C,UAAU,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,aAAa;4BACjD,CAAC,CAAC,wBAAwB,CAAC,aAAa;4BACxC,CAAC,CAAC,wBAAwB,CAAC,UAAU;wBACvC,aAAa,EAAE,IAAI;wBACnB,YAAY,EAAE,KAAK;wBACnB,YAAY,EAAE,IAAI;wBAClB,aAAa,EAAE,IAAI;wBACnB,iBAAiB,EAAE,gBAAgB,CAAC,OAAO;wBAC3C,KAAK,EAAE,gBAAgB,CAAC,OAAO;wBAC/B,MAAM,EACJ,yBAAyB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO;wBAC3G,SAAS,EAAE;4BACT,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;4BACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;4BACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;4BACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;4BACnD,gBAAgB,EAAE,wBAAwB,CAAC,QAAQ;4BACnD,WAAW,EAAE,wBAAwB,CAAC,WAAW;4BACjD,IAAI,EAAE,wBAAwB,CAAC,IAAI;4BACnC,UAAU,EAAE,wBAAwB,CAAC,QAAQ;4BAC7C,OAAO,EAAE,wBAAwB,CAAC,OAAO;4BACzC,KAAK,EAAE,wBAAwB,CAAC,KAAK;4BACrC,MAAM,EAAE,wBAAwB,CAAC,MAAM;4BACvC,MAAM,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,MAAM,EAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;yBAClF;wBACD,sBAAsB,EAAE,gBAAgB,CAAC,MAAM;wBAC/C,UAAU,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,UAAU,EAAC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;wBAC7F,OAAO,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,OAAO,EAAC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;wBACpF,gBAAgB,EAAE,gBAAgB,CAAC,qBAAqB;6BACrD,MAAM,CAAC,IAAI,CAAC,EAAE;4BACb,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE,KAAK,wBAAwB,CAAC,EAAE,EAAE;gCACpE,OAAO,IAAI,CAAA;6BACZ;wBACH,CAAC,CAAC;6BACD,GAAG,CAAC,CAAC,SAAc,EAAE,EAAE;4BACtB,MAAM,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,GAAQ,SAAS,CAAA;4BACxE,OAAO;gCACL,OAAO,EAAE;oCACP,GAAG,EAAE,gBAAgB,CAAC,GAAG;iCAC1B;gCACD,UAAU,EAAE,SAAS,CAAC,GAAG;6BAC1B,CAAA;wBACH,CAAC,CAAC;qBACL,CAAA;oBAED,IAAI,YAAY,GAAQ,MAAM,wCAAc,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;wBACjF,kBAAkB;wBAClB,YAAY,EAAE,mBAAmB;qBAClC,CAAC,CAAA;oBAEF,wBAAwB,CAAC,cAAc,GAAG,YAAY,CAAC,EAAE,CAAA;oBACzD,wBAAwB,CAAC,iBAAiB,GAAG,gBAAgB,CAAA;oBAC7D,MAAM,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;iBAC7E;aACF;YAED,IAAI,YAAY,KAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,EAAE,CAAA,EAAE;gBACpC,gBAAgB,CAAC,cAAc,GAAG,YAAY,CAAC,EAAE,CAAA;gBACjD,gBAAgB,CAAC,iBAAiB,GAAG,gBAAgB,CAAA;gBACrD,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;aAC7D;SACF;IACH,CAAC;CACF,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-mms",
3
- "version": "3.8.28",
3
+ "version": "3.8.29",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -45,7 +45,7 @@
45
45
  "@things-factory/apptool-ui": "^3.8.0",
46
46
  "@things-factory/attachment-base": "^3.8.0",
47
47
  "@things-factory/auth-ui": "^3.8.0",
48
- "@things-factory/biz-base": "^3.8.26",
48
+ "@things-factory/biz-base": "^3.8.29",
49
49
  "@things-factory/board-service": "^3.8.0",
50
50
  "@things-factory/board-ui": "^3.8.0",
51
51
  "@things-factory/code-ui": "^3.8.0",
@@ -58,15 +58,15 @@
58
58
  "@things-factory/grist-ui": "^3.7.5",
59
59
  "@things-factory/help": "^3.8.0",
60
60
  "@things-factory/i18n-ui": "^3.8.0",
61
- "@things-factory/integration-fulfillment": "^3.8.26",
62
- "@things-factory/integration-lmd": "^3.8.26",
61
+ "@things-factory/integration-fulfillment": "^3.8.29",
62
+ "@things-factory/integration-lmd": "^3.8.29",
63
63
  "@things-factory/lite-menu": "^3.8.0",
64
- "@things-factory/marketplace-base": "^3.8.28",
64
+ "@things-factory/marketplace-base": "^3.8.29",
65
65
  "@things-factory/more-ui": "^3.8.0",
66
66
  "@things-factory/notification": "^3.8.0",
67
67
  "@things-factory/oauth2-client": "^3.8.0",
68
68
  "@things-factory/pdf": "^3.7.5",
69
- "@things-factory/product-base": "^3.8.26",
69
+ "@things-factory/product-base": "^3.8.29",
70
70
  "@things-factory/resource-ui": "^3.8.0",
71
71
  "@things-factory/scene-chartjs": "^3.7.5",
72
72
  "@things-factory/scene-clock": "^3.7.5",
@@ -99,11 +99,11 @@
99
99
  "@things-factory/scene-wheel-sorter": "^3.7.5",
100
100
  "@things-factory/setting-ui": "^3.8.19",
101
101
  "@things-factory/system-ui": "^3.8.0",
102
- "@things-factory/warehouse-base": "^3.8.28"
102
+ "@things-factory/warehouse-base": "^3.8.29"
103
103
  },
104
104
  "devDependencies": {
105
105
  "@things-factory/builder": "^3.7.5",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "8bc0e8adad38cec375d701d66f2f198bceafd644"
108
+ "gitHead": "aab48875c1a169b2d75f9fe8aa6af029c3d5b3dd"
109
109
  }
@@ -2,7 +2,8 @@ import { getRepository } from 'typeorm'
2
2
 
3
3
  import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
4
4
  import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
5
- import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
5
+ import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
6
+ import { Product, ProductBundle } from '@things-factory/product-base'
6
7
  import { Domain } from '@things-factory/shell'
7
8
 
8
9
  export const addReleaseOrderResolver = {
@@ -30,12 +31,15 @@ export const addReleaseOrderResolver = {
30
31
  relations: [
31
32
  'marketplaceOrderItems',
32
33
  'marketplaceOrderItems.marketplaceProductVariation',
33
- 'marketplaceOrderItems.marketplaceOrderShipping'
34
+ 'marketplaceOrderItems.marketplaceOrderShipping',
35
+ 'marketplaceStore'
34
36
  ]
35
37
  })
36
38
 
37
- const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
38
- where: { orderNoRef: marketplaceOrder.orderNo, domain }
39
+ let marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
40
+ where: { orderNoRef: marketplaceOrder.orderNo, domain },
41
+ order: { subOrderNoRef: 'ASC' },
42
+ relations: ['marketplaceOrderItems']
39
43
  })
40
44
 
41
45
  for (var j = 0; j < marketplaceOrderShippings.length; j++) {
@@ -101,6 +105,80 @@ export const addReleaseOrderResolver = {
101
105
  releaseOrder: newReleaseOrder
102
106
  })
103
107
 
108
+ var invoiceProducts = await Promise.all(
109
+ newReleaseOrder.orderInventories.map(async oi => {
110
+ let product: Product = await getRepository(Product).findOne({
111
+ where: { domain, sku: oi.product.sku }
112
+ })
113
+
114
+ if (!product) {
115
+ product = await getRepository(ProductBundle).findOne({
116
+ where: { domain, sku: oi.product.sku }
117
+ })
118
+ }
119
+
120
+ let moi: MarketplaceOrderItem = marketplaceOrder.marketplaceOrderItems.find(
121
+ moi => moi.marketplaceProductVariation.sku === product.sku
122
+ )
123
+
124
+ return {
125
+ sku: product.sku,
126
+ name: product.name,
127
+ description: product.description,
128
+ product: { sku: product.sku },
129
+ qty: oi.releaseQty,
130
+ unitPrice: moi.originalPrice / moi.qty,
131
+ paidPrice: moi.paidPrice / moi.qty
132
+ }
133
+ })
134
+ )
135
+
136
+ let newInvoice = {
137
+ invoiceProducts,
138
+ releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
139
+ refNo1: newReleaseOrder.refNo.toString(),
140
+ refNo2: newReleaseOrder.refNo2.toString(),
141
+ issuedOn: new Date(),
142
+ from: marketplaceOrder.marketplaceStore.storeName,
143
+ fromContactPhone: '-',
144
+ fromAddress1: '-',
145
+ fromAddress2: null,
146
+ fromAddress3: null,
147
+ fromAddress4: null,
148
+ fromAddress5: null,
149
+ fromPostcode: null,
150
+ fromCity: null,
151
+ fromState: null,
152
+ fromCountry: null,
153
+ deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
154
+ deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
155
+ deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
156
+ deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
157
+ deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
158
+ deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
159
+ deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
160
+ deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
161
+ deliveryCity: newReleaseOrder.deliverTo.city || '-',
162
+ deliveryState: newReleaseOrder.deliverTo.state || '-',
163
+ deliveryCountry: newReleaseOrder.deliverTo.country || '-',
164
+ billTo: newReleaseOrder.deliverTo.attentionTo || '-',
165
+ billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
166
+ billingAddress1: releaseOrder.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
167
+ billingAddress2: null,
168
+ billingAddress3: null,
169
+ billingAddress4: null,
170
+ billingAddress5: null,
171
+ billingPostcode: '-',
172
+ billingCity: '-',
173
+ billingState: '-',
174
+ billingCountry: '-'
175
+ }
176
+
177
+ var invoice: any = await FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
178
+ customerBizplaceId,
179
+ invoice: newInvoice
180
+ })
181
+
104
182
  marketplaceOrderShipping.releaseOrderId = releaseOrder.id
105
183
  marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
106
184
  await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
@@ -36,7 +36,8 @@ export const autoAddReleaseOrderResolver = {
36
36
  const marketplaceOrder = marketplaceOrders[i]
37
37
 
38
38
  const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
39
- where: { orderNoRef: marketplaceOrder.orderNo, domain }
39
+ where: { orderNoRef: marketplaceOrder.orderNo, domain },
40
+ order: { subOrderNoRef: 'ASC' }
40
41
  })
41
42
 
42
43
  for (var j = 0; j < marketplaceOrderShippings.length; j++) {