@things-factory/operato-mms 4.3.588 → 4.3.591
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.
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +99 -75
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +177 -143
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/package.json +45 -45
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +109 -80
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +187 -151
|
@@ -11,7 +11,7 @@ const product_base_1 = require("@things-factory/product-base");
|
|
|
11
11
|
const shell_1 = require("@things-factory/shell");
|
|
12
12
|
exports.addReleaseOrderResolver = {
|
|
13
13
|
async addReleaseOrder(_, { marketplaceOrderIds, warehouseId }, context) {
|
|
14
|
-
var _a, _b;
|
|
14
|
+
var _a, _b, _c;
|
|
15
15
|
const { domain } = context.state;
|
|
16
16
|
const fulfilmentCenter = await integration_fulfillment_1.FulfillmentAPI.getFulfillmentCenter(warehouseId);
|
|
17
17
|
const centerId = fulfilmentCenter.centerId;
|
|
@@ -30,15 +30,19 @@ exports.addReleaseOrderResolver = {
|
|
|
30
30
|
]
|
|
31
31
|
});
|
|
32
32
|
const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
33
|
+
const qt = (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrderShipping, 'MOS');
|
|
34
|
+
let marketplaceOrderShippings = await qt
|
|
35
|
+
.leftJoinAndSelect('MOS.marketplaceOrderShippingItems', 'MOSI')
|
|
36
|
+
.leftJoinAndSelect('MOSI.product', 'P')
|
|
37
|
+
.leftJoinAndSelect('MOSI.marketplaceOrderItem', 'MOI')
|
|
38
|
+
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
39
|
+
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
40
|
+
.andWhere('MOS.releaseOrderId IS NULL')
|
|
41
|
+
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
42
|
+
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
43
|
+
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
44
|
+
.addOrderBy('MOS.createdAt', 'ASC')
|
|
45
|
+
.getMany();
|
|
42
46
|
for (let j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
43
47
|
let marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
44
48
|
let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
|
|
@@ -92,10 +96,14 @@ exports.addReleaseOrderResolver = {
|
|
|
92
96
|
})
|
|
93
97
|
};
|
|
94
98
|
try {
|
|
95
|
-
|
|
99
|
+
let releaseOrder = await integration_fulfillment_1.FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
|
|
96
100
|
customerBizplaceId,
|
|
97
101
|
releaseOrder: newReleaseOrder
|
|
98
102
|
});
|
|
103
|
+
//if release order is not created, throw error
|
|
104
|
+
if (!(releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
105
|
+
throw new Error('Failed to create release order');
|
|
106
|
+
}
|
|
99
107
|
// deduct reserve qty
|
|
100
108
|
if ((_b = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore) === null || _b === void 0 ? void 0 : _b.reserveEnabled) {
|
|
101
109
|
try {
|
|
@@ -108,77 +116,93 @@ exports.addReleaseOrderResolver = {
|
|
|
108
116
|
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
109
117
|
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
110
118
|
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
111
|
-
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
112
|
-
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
113
|
-
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
114
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
115
|
-
}
|
|
116
119
|
}
|
|
117
|
-
catch (e) {
|
|
120
|
+
catch (e) {
|
|
121
|
+
console.error(e);
|
|
122
|
+
}
|
|
118
123
|
}
|
|
119
124
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
125
|
+
//fetch the latest updated of marketplaceOrderShipping
|
|
126
|
+
const marketplaceOrderShipping = await qt
|
|
127
|
+
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
128
|
+
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
129
|
+
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
130
|
+
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
131
|
+
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
132
|
+
.addOrderBy('MOS.createdAt', 'ASC')
|
|
133
|
+
.getMany();
|
|
134
|
+
//validation to prevent creating invoice if there is any failed creation order
|
|
135
|
+
if (marketplaceOrderShipping.some(mos => mos.releaseOrderId === null || mos.releaseOrderId === '')) {
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
if (marketplaceOrderShipping.length > 0 && ((_c = marketplaceOrderShipping[0]) === null || _c === void 0 ? void 0 : _c.releaseOrderId)) {
|
|
139
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).update(marketplaceOrder.id, {
|
|
140
|
+
releaseOrderId: marketplaceOrderShipping[0].releaseOrderId,
|
|
141
|
+
fulfillmentCenter: fulfilmentCenter
|
|
123
142
|
});
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
143
|
+
}
|
|
144
|
+
try {
|
|
145
|
+
var invoiceProducts = await Promise.all(marketplaceOrderItems.map(async (mi) => {
|
|
146
|
+
let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
|
|
127
147
|
where: { domain, sku: mi.marketplaceProductVariation.sku }
|
|
128
148
|
});
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
149
|
+
let productBundle;
|
|
150
|
+
if (!product) {
|
|
151
|
+
productBundle = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
|
|
152
|
+
where: { domain, sku: mi.marketplaceProductVariation.sku }
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
return {
|
|
156
|
+
sku: product ? product.sku : productBundle.sku,
|
|
157
|
+
name: product ? product.name : productBundle.name,
|
|
158
|
+
description: product ? product.description : productBundle.description,
|
|
159
|
+
qty: mi.qty,
|
|
160
|
+
unitPrice: ((mi === null || mi === void 0 ? void 0 : mi.originalPrice) || 0) / mi.qty,
|
|
161
|
+
paidPrice: ((mi === null || mi === void 0 ? void 0 : mi.paidPrice) || 0) / mi.qty,
|
|
162
|
+
discount: (mi === null || mi === void 0 ? void 0 : mi.discount) || 0,
|
|
163
|
+
shippingFeePaidByCustomer: (mi === null || mi === void 0 ? void 0 : mi.shippingFeePaidByCustomer) || 0
|
|
164
|
+
};
|
|
165
|
+
}));
|
|
166
|
+
let newInvoice = {
|
|
167
|
+
invoiceProducts,
|
|
168
|
+
name: '-',
|
|
169
|
+
refNo1: newReleaseOrder.refNo.toString(),
|
|
170
|
+
refNo2: newReleaseOrder.refNo2.toString(),
|
|
171
|
+
issuedOn: new Date(),
|
|
172
|
+
from: marketplaceOrder.marketplaceStore.storeName,
|
|
173
|
+
fromContactPhone: '-',
|
|
174
|
+
fromAddress1: '-',
|
|
175
|
+
fromAddress2: null,
|
|
176
|
+
fromAddress3: null,
|
|
177
|
+
fromAddress4: null,
|
|
178
|
+
fromAddress5: null,
|
|
179
|
+
fromPostcode: null,
|
|
180
|
+
fromCity: null,
|
|
181
|
+
fromState: null,
|
|
182
|
+
fromCountry: null,
|
|
183
|
+
deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
184
|
+
deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
185
|
+
deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
186
|
+
deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
|
|
187
|
+
deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
|
|
188
|
+
deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
|
|
189
|
+
deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
|
|
190
|
+
deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
|
|
191
|
+
deliveryCity: newReleaseOrder.deliverTo.city || '-',
|
|
192
|
+
deliveryState: newReleaseOrder.deliverTo.state || '-',
|
|
193
|
+
deliveryCountry: newReleaseOrder.deliverTo.country || '-',
|
|
194
|
+
billTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
195
|
+
billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
196
|
+
billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
197
|
+
billingAddress2: null,
|
|
198
|
+
billingAddress3: null,
|
|
199
|
+
billingAddress4: null,
|
|
200
|
+
billingAddress5: null,
|
|
201
|
+
billingPostcode: '-',
|
|
202
|
+
billingCity: '-',
|
|
203
|
+
billingState: '-',
|
|
204
|
+
billingCountry: '-'
|
|
139
205
|
};
|
|
140
|
-
}));
|
|
141
|
-
let newInvoice = {
|
|
142
|
-
invoiceProducts,
|
|
143
|
-
name: '-',
|
|
144
|
-
refNo1: newReleaseOrder.refNo.toString(),
|
|
145
|
-
refNo2: newReleaseOrder.refNo2.toString(),
|
|
146
|
-
issuedOn: new Date(),
|
|
147
|
-
from: marketplaceOrder.marketplaceStore.storeName,
|
|
148
|
-
fromContactPhone: '-',
|
|
149
|
-
fromAddress1: '-',
|
|
150
|
-
fromAddress2: null,
|
|
151
|
-
fromAddress3: null,
|
|
152
|
-
fromAddress4: null,
|
|
153
|
-
fromAddress5: null,
|
|
154
|
-
fromPostcode: null,
|
|
155
|
-
fromCity: null,
|
|
156
|
-
fromState: null,
|
|
157
|
-
fromCountry: null,
|
|
158
|
-
deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
159
|
-
deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
160
|
-
deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
161
|
-
deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
|
|
162
|
-
deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
|
|
163
|
-
deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
|
|
164
|
-
deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
|
|
165
|
-
deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
|
|
166
|
-
deliveryCity: newReleaseOrder.deliverTo.city || '-',
|
|
167
|
-
deliveryState: newReleaseOrder.deliverTo.state || '-',
|
|
168
|
-
deliveryCountry: newReleaseOrder.deliverTo.country || '-',
|
|
169
|
-
billTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
170
|
-
billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
171
|
-
billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
172
|
-
billingAddress2: null,
|
|
173
|
-
billingAddress3: null,
|
|
174
|
-
billingAddress4: null,
|
|
175
|
-
billingAddress5: null,
|
|
176
|
-
billingPostcode: '-',
|
|
177
|
-
billingCity: '-',
|
|
178
|
-
billingState: '-',
|
|
179
|
-
billingCountry: '-'
|
|
180
|
-
};
|
|
181
|
-
try {
|
|
182
206
|
await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
|
|
183
207
|
customerBizplaceId,
|
|
184
208
|
invoice: newInvoice
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":";;;AAAA,
|
|
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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"}
|
|
@@ -10,7 +10,7 @@ const product_base_1 = require("@things-factory/product-base");
|
|
|
10
10
|
const shell_1 = require("@things-factory/shell");
|
|
11
11
|
exports.autoAddReleaseOrderResolver = {
|
|
12
12
|
async autoAddReleaseOrder(_, { warehouseId }, context) {
|
|
13
|
-
var _a;
|
|
13
|
+
var _a, _b;
|
|
14
14
|
const { domain } = context.state;
|
|
15
15
|
const qb = (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrder, 'MO');
|
|
16
16
|
const marketplaceOrders = await qb
|
|
@@ -31,154 +31,188 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
31
31
|
var warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
|
|
32
32
|
var customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
|
|
33
33
|
const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id === domain.id).id;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
'
|
|
42
|
-
'
|
|
43
|
-
'
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
releaseDate,
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
:
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
34
|
+
try {
|
|
35
|
+
for (var i = 0; i < marketplaceOrders.length; i++) {
|
|
36
|
+
const marketplaceOrder = marketplaceOrders[i];
|
|
37
|
+
const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
|
|
38
|
+
const qt = (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrderShipping, 'MOS');
|
|
39
|
+
const marketplaceOrderShippings = await qt
|
|
40
|
+
.leftJoinAndSelect('MOS.marketplaceOrderShippingItems', 'MOSI')
|
|
41
|
+
.leftJoinAndSelect('MOSI.product', 'P')
|
|
42
|
+
.leftJoinAndSelect('MOSI.marketplaceOrderItem', 'MOI')
|
|
43
|
+
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
44
|
+
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
45
|
+
.andWhere('MOS.releaseOrderId IS NULL')
|
|
46
|
+
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
47
|
+
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
48
|
+
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
49
|
+
.addOrderBy('MOS.createdAt', 'ASC')
|
|
50
|
+
.getMany();
|
|
51
|
+
for (let j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
52
|
+
let marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
53
|
+
let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
|
|
54
|
+
if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
|
|
55
|
+
const date = new Date();
|
|
56
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
|
|
57
|
+
.getDate()
|
|
58
|
+
.toString()
|
|
59
|
+
.padStart(2, '0')}`;
|
|
60
|
+
var newReleaseOrder = {
|
|
61
|
+
releaseDate,
|
|
62
|
+
type: 'b2c',
|
|
63
|
+
source: auth_base_1.ApplicationType.MMS,
|
|
64
|
+
transporter: marketplaceOrder.shippingProvider,
|
|
65
|
+
trackingNo: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.ownTrackingNo)
|
|
66
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
67
|
+
: marketplaceOrderShipping.trackingNo,
|
|
68
|
+
packingOption: true,
|
|
69
|
+
exportOption: false,
|
|
70
|
+
ownTransport: true,
|
|
71
|
+
courierOption: true,
|
|
72
|
+
lmdOption: ((_a = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore) === null || _a === void 0 ? void 0 : _a.lmdOption) || false,
|
|
73
|
+
collectionOrderNo: marketplaceOrder.orderNo,
|
|
74
|
+
refNo: marketplaceOrder.orderNo,
|
|
75
|
+
refNo2: marketplaceOrderShippings.length > 1
|
|
76
|
+
? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.subOrderNoRef
|
|
77
|
+
: marketplaceOrder.orderNo,
|
|
78
|
+
deliverTo: {
|
|
79
|
+
deliveryAddress1: marketplaceOrderShipping.address1,
|
|
80
|
+
deliveryAddress2: marketplaceOrderShipping.address2,
|
|
81
|
+
deliveryAddress3: marketplaceOrderShipping.address3,
|
|
82
|
+
deliveryAddress4: marketplaceOrderShipping.address4,
|
|
83
|
+
deliveryAddress5: marketplaceOrderShipping.address5,
|
|
84
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
85
|
+
city: marketplaceOrderShipping.city,
|
|
86
|
+
postalCode: marketplaceOrderShipping.postCode,
|
|
87
|
+
country: marketplaceOrderShipping.country,
|
|
88
|
+
state: marketplaceOrderShipping.state,
|
|
89
|
+
phone1: marketplaceOrderShipping.phone1,
|
|
90
|
+
phone2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.phone2) ? marketplaceOrderShipping.phone2 : null
|
|
91
|
+
},
|
|
92
|
+
marketplaceOrderStatus: marketplaceOrder.status,
|
|
93
|
+
airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
|
|
94
|
+
invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
|
|
95
|
+
orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
|
|
96
|
+
return {
|
|
97
|
+
product: {
|
|
98
|
+
sku: marketplaceOrderShippingItem.product.sku
|
|
99
|
+
},
|
|
100
|
+
releaseQty: marketplaceOrderShippingItem.qty
|
|
101
|
+
};
|
|
102
|
+
})
|
|
103
|
+
};
|
|
104
|
+
try {
|
|
105
|
+
let releaseOrder = await integration_fulfillment_1.FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
|
|
106
|
+
customerBizplaceId,
|
|
107
|
+
releaseOrder: newReleaseOrder
|
|
108
|
+
});
|
|
109
|
+
//if release order is not created, throw error
|
|
110
|
+
if (!(releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
111
|
+
throw new Error('Failed to create release order');
|
|
112
|
+
}
|
|
113
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
114
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
115
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
116
|
+
}
|
|
117
|
+
catch (e) {
|
|
118
|
+
console.error(e);
|
|
109
119
|
}
|
|
110
120
|
}
|
|
111
|
-
catch (e) { }
|
|
112
121
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
+
//fetch the latest updated of marketplaceOrderShipping
|
|
123
|
+
const marketplaceOrderShipping = await qt
|
|
124
|
+
.where('MOS.domain = :domainId', { domainId: domain.id })
|
|
125
|
+
.andWhere('MOS.orderNoRef = :orderNoRef', { orderNoRef: marketplaceOrder.orderNo })
|
|
126
|
+
.distinctOn(['MOS.subOrderNoRef', 'MOS.orderNoRef'])
|
|
127
|
+
.orderBy('MOS.subOrderNoRef', 'ASC')
|
|
128
|
+
.addOrderBy('MOS.orderNoRef', 'ASC')
|
|
129
|
+
.addOrderBy('MOS.createdAt', 'ASC')
|
|
130
|
+
.getMany();
|
|
131
|
+
//validation to prevent creating invoice if there is any failed release order
|
|
132
|
+
if (marketplaceOrderShipping.some(mos => mos.releaseOrderId === null || mos.releaseOrderId === '')) {
|
|
133
|
+
continue;
|
|
134
|
+
}
|
|
135
|
+
//update marketplaceOrder with releaseOrderId if all ro is created
|
|
136
|
+
if (marketplaceOrderShipping.length > 0 && ((_b = marketplaceOrderShipping[0]) === null || _b === void 0 ? void 0 : _b.releaseOrderId)) {
|
|
137
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).update(marketplaceOrder.id, {
|
|
138
|
+
releaseOrderId: marketplaceOrderShipping[0].releaseOrderId,
|
|
139
|
+
fulfillmentCenter: fulfilmentCenter
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
try {
|
|
143
|
+
var invoiceProducts = await Promise.all(marketplaceOrderItems.map(async (mi) => {
|
|
144
|
+
let product = await (0, typeorm_1.getRepository)(product_base_1.Product).findOne({
|
|
145
|
+
where: { domain, sku: mi.marketplaceProductVariation.sku }
|
|
146
|
+
});
|
|
147
|
+
let productBundle;
|
|
148
|
+
if (!product) {
|
|
149
|
+
productBundle = await (0, typeorm_1.getRepository)(product_base_1.ProductBundle).findOne({
|
|
150
|
+
where: { domain, sku: mi.marketplaceProductVariation.sku }
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
return {
|
|
154
|
+
sku: product ? product.sku : productBundle.sku,
|
|
155
|
+
name: product ? product.name : productBundle.name,
|
|
156
|
+
description: product ? product.description : productBundle.description,
|
|
157
|
+
qty: mi.qty,
|
|
158
|
+
unitPrice: ((mi === null || mi === void 0 ? void 0 : mi.originalPrice) || 0) / mi.qty,
|
|
159
|
+
paidPrice: ((mi === null || mi === void 0 ? void 0 : mi.paidPrice) || 0) / mi.qty,
|
|
160
|
+
discount: (mi === null || mi === void 0 ? void 0 : mi.discount) || 0,
|
|
161
|
+
shippingFeePaidByCustomer: (mi === null || mi === void 0 ? void 0 : mi.shippingFeePaidByCustomer) || 0
|
|
162
|
+
};
|
|
163
|
+
}));
|
|
164
|
+
let newInvoice = {
|
|
165
|
+
invoiceProducts,
|
|
166
|
+
name: '-',
|
|
167
|
+
refNo1: newReleaseOrder.refNo.toString(),
|
|
168
|
+
refNo2: newReleaseOrder.refNo2.toString(),
|
|
169
|
+
issuedOn: new Date(),
|
|
170
|
+
from: marketplaceOrder.marketplaceStore.storeName,
|
|
171
|
+
fromContactPhone: '-',
|
|
172
|
+
fromAddress1: '-',
|
|
173
|
+
fromAddress2: null,
|
|
174
|
+
fromAddress3: null,
|
|
175
|
+
fromAddress4: null,
|
|
176
|
+
fromAddress5: null,
|
|
177
|
+
fromPostcode: null,
|
|
178
|
+
fromCity: null,
|
|
179
|
+
fromState: null,
|
|
180
|
+
fromCountry: null,
|
|
181
|
+
deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
182
|
+
deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
183
|
+
deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
184
|
+
deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
|
|
185
|
+
deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
|
|
186
|
+
deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
|
|
187
|
+
deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
|
|
188
|
+
deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
|
|
189
|
+
deliveryCity: newReleaseOrder.deliverTo.city || '-',
|
|
190
|
+
deliveryState: newReleaseOrder.deliverTo.state || '-',
|
|
191
|
+
deliveryCountry: newReleaseOrder.deliverTo.country || '-',
|
|
192
|
+
billTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
193
|
+
billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
194
|
+
billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
195
|
+
billingAddress2: null,
|
|
196
|
+
billingAddress3: null,
|
|
197
|
+
billingAddress4: null,
|
|
198
|
+
billingAddress5: null,
|
|
199
|
+
billingPostcode: '-',
|
|
200
|
+
billingCity: '-',
|
|
201
|
+
billingState: '-',
|
|
202
|
+
billingCountry: '-'
|
|
203
|
+
};
|
|
204
|
+
await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
|
|
205
|
+
customerBizplaceId,
|
|
206
|
+
invoice: newInvoice
|
|
122
207
|
});
|
|
123
208
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
description: product ? product.description : productBundle.description,
|
|
128
|
-
qty: mi.qty,
|
|
129
|
-
unitPrice: ((mi === null || mi === void 0 ? void 0 : mi.originalPrice) || 0) / mi.qty,
|
|
130
|
-
paidPrice: ((mi === null || mi === void 0 ? void 0 : mi.paidPrice) || 0) / mi.qty,
|
|
131
|
-
discount: (mi === null || mi === void 0 ? void 0 : mi.discount) || 0,
|
|
132
|
-
shippingFeePaidByCustomer: (mi === null || mi === void 0 ? void 0 : mi.shippingFeePaidByCustomer) || 0
|
|
133
|
-
};
|
|
134
|
-
}));
|
|
135
|
-
let newInvoice = {
|
|
136
|
-
invoiceProducts,
|
|
137
|
-
name: '-',
|
|
138
|
-
refNo1: newReleaseOrder.refNo.toString(),
|
|
139
|
-
refNo2: newReleaseOrder.refNo2.toString(),
|
|
140
|
-
issuedOn: new Date(),
|
|
141
|
-
from: marketplaceOrder.marketplaceStore.storeName,
|
|
142
|
-
fromContactPhone: '-',
|
|
143
|
-
fromAddress1: '-',
|
|
144
|
-
fromAddress2: null,
|
|
145
|
-
fromAddress3: null,
|
|
146
|
-
fromAddress4: null,
|
|
147
|
-
fromAddress5: null,
|
|
148
|
-
fromPostcode: null,
|
|
149
|
-
fromCity: null,
|
|
150
|
-
fromState: null,
|
|
151
|
-
fromCountry: null,
|
|
152
|
-
deliverTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
153
|
-
deliverToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
154
|
-
deliveryAddress1: newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
155
|
-
deliveryAddress2: newReleaseOrder.deliverTo.deliveryAddress2,
|
|
156
|
-
deliveryAddress3: newReleaseOrder.deliverTo.deliveryAddress3,
|
|
157
|
-
deliveryAddress4: newReleaseOrder.deliverTo.deliveryAddress4,
|
|
158
|
-
deliveryAddress5: newReleaseOrder.deliverTo.deliveryAddress5,
|
|
159
|
-
deliveryPostcode: newReleaseOrder.deliverTo.postalCode || '-',
|
|
160
|
-
deliveryCity: newReleaseOrder.deliverTo.city || '-',
|
|
161
|
-
deliveryState: newReleaseOrder.deliverTo.state || '-',
|
|
162
|
-
deliveryCountry: newReleaseOrder.deliverTo.country || '-',
|
|
163
|
-
billTo: newReleaseOrder.deliverTo.attentionTo || '-',
|
|
164
|
-
billToPhone: newReleaseOrder.deliverTo.phone1 || '-',
|
|
165
|
-
billingAddress1: newReleaseOrder.deliverTo.billingAddress || newReleaseOrder.deliverTo.deliveryAddress1 || '-',
|
|
166
|
-
billingAddress2: null,
|
|
167
|
-
billingAddress3: null,
|
|
168
|
-
billingAddress4: null,
|
|
169
|
-
billingAddress5: null,
|
|
170
|
-
billingPostcode: '-',
|
|
171
|
-
billingCity: '-',
|
|
172
|
-
billingState: '-',
|
|
173
|
-
billingCountry: '-'
|
|
174
|
-
};
|
|
175
|
-
try {
|
|
176
|
-
await integration_fulfillment_1.FulfillmentAPI.createSalesInvoice(fulfilmentCenter, {
|
|
177
|
-
customerBizplaceId,
|
|
178
|
-
invoice: newInvoice
|
|
179
|
-
});
|
|
209
|
+
catch (e) {
|
|
210
|
+
console.error(e);
|
|
211
|
+
}
|
|
180
212
|
}
|
|
181
|
-
|
|
213
|
+
}
|
|
214
|
+
catch (e) {
|
|
215
|
+
console.error(e);
|
|
182
216
|
}
|
|
183
217
|
}
|
|
184
218
|
};
|