@things-factory/worksheet-base 4.3.42 → 4.3.43

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 (7) hide show
  1. package/dist-server/controllers/render-orientage-do.js +37 -5
  2. package/dist-server/controllers/render-orientage-do.js.map +1 -1
  3. package/dist-server/controllers/render-ro-do.js +109 -40
  4. package/dist-server/controllers/render-ro-do.js.map +1 -1
  5. package/package.json +6 -6
  6. package/server/controllers/render-orientage-do.ts +39 -5
  7. package/server/controllers/render-ro-do.ts +119 -51
package/dist-server/controllers/render-orientage-do.js CHANGED
@@ -240,8 +240,26 @@ async function renderOrientageDO({ doNo }, context) {
240
240
  company_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
241
241
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
242
242
  company_email: foundWarehouseCP.email,
243
- customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) || foundRO.attentionTo || null,
243
+ customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) ||
244
+ foundDO.attentionTo ||
245
+ foundDO.attentionCompany ||
246
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) ||
247
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) ||
248
+ null,
244
249
  customer_delivery_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.address) ||
250
+ [
251
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
252
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
253
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
254
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
255
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
256
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
257
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
258
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
259
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
260
+ ]
261
+ .filter(Boolean)
262
+ .join(', ') ||
245
263
  [
246
264
  foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1,
247
265
  foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2,
@@ -256,13 +274,27 @@ async function renderOrientageDO({ doNo }, context) {
256
274
  .filter(Boolean)
257
275
  .join(', ') ||
258
276
  null,
259
- customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
260
- customer_phone: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.phone) || foundRO.phone1 || null,
277
+ customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.billingAddress) || null,
278
+ customer_phone: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.phone) || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.phone1) || foundRO.phone1 || null,
261
279
  customer_fax: foundCP ? foundCP.fax : null,
262
280
  customer_email: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.email) || foundRO.email || null,
263
- customer_company: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.companyName) || foundRO.attentionCompany || null,
281
+ customer_company: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.companyName) || foundDO.attentionCompany || foundRO.attentionCompany || null,
264
282
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
265
- destination: foundDO.to || '',
283
+ destination: foundDO.to ||
284
+ [
285
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
286
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
287
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
288
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
289
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
290
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
291
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
292
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
293
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
294
+ ]
295
+ .filter(Boolean)
296
+ .join(', ') ||
297
+ '',
266
298
  ref_no: ownRefNo,
267
299
  ref_no1: ownRefNo2 ? ownRefNo2 : '',
268
300
  ref_no2: ownRefNo3 ? ownRefNo3 : '',
package/dist-server/controllers/render-orientage-do.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-orientage-do.js","sourceRoot":"","sources":["../../server/controllers/render-orientage-do.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-orientage-do.js","sourceRoot":"","sources":["../../server/controllers/render-orientage-do.ts"],"names":[],"mappings":"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"}
package/dist-server/controllers/render-ro-do.js CHANGED
@@ -48,7 +48,13 @@ async function renderRODO({ doNo }, context) {
48
48
  const foundRO = foundDO.releaseGood;
49
49
  const partnerBiz = foundDO.bizplace; //customer bizplace
50
50
  const ownRefNo = foundRO.refNo;
51
- let foundInventoryItem = await (0, typeorm_1.getRepository)(warehouse_base_2.InventoryItem).query(`select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`);
51
+ let foundInventoryItem = await (0, typeorm_1.getRepository)(warehouse_base_2.InventoryItem).query(`
52
+ select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number
53
+ from inventory_items ii
54
+ left join products p on ii.product_id = p.id
55
+ where outbound_order_id = '${foundDO.releaseGood.id}'
56
+ group by p.sku,ii.serial_number,p.brand_sku
57
+ `);
52
58
  const partnerDomain = await (0, typeorm_1.getRepository)(auth_base_1.Partner).findOne({
53
59
  where: { partnerDomain: partnerBiz.domain, domain },
54
60
  relations: ['domain']
@@ -80,23 +86,25 @@ async function renderRODO({ doNo }, context) {
80
86
  relations: ['inventory']
81
87
  });
82
88
  const orderInvIds = targetInventories.map((oi) => oi.id);
83
- const foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
84
- where: {
85
- domain,
86
- targetInventory: (0, typeorm_1.In)(orderInvIds),
87
- type: constants_1.WORKSHEET_TYPE.LOADING,
88
- status: (0, typeorm_1.Equal)(constants_1.WORKSHEET_STATUS.DONE)
89
- },
90
- relations: [
91
- 'targetInventory',
92
- 'targetInventory.inventory',
93
- 'targetInventory.inventory.location',
94
- 'targetInventory.inventory.product',
95
- 'targetInventory.inventory.product.productDetails',
96
- 'targetInventory.inventory.reusablePallet',
97
- 'updater'
98
- ]
99
- });
89
+ const wdQb = (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).createQueryBuilder('wd');
90
+ wdQb.leftJoinAndSelect('wd.targetInventory', 'targetInventory')
91
+ .leftJoinAndSelect('targetInventory.inventory', 'inventory')
92
+ .leftJoinAndSelect('inventory.location', 'location')
93
+ .leftJoinAndSelect('inventory.product', 'product')
94
+ .leftJoinAndSelect('product.productDetails', 'productDetails')
95
+ .leftJoinAndSelect('inventory.reusablePallet', 'reusablePallet')
96
+ .leftJoinAndSelect('wd.domain', 'domain')
97
+ .leftJoinAndSelect('wd.creator', 'creator')
98
+ .leftJoinAndSelect('wd.updater', 'updater')
99
+ .where('wd.domain_id = :domainId', { domainId: domain.id })
100
+ .andWhere('wd.target_inventory_id IN (:...orderInvIds) ', { orderInvIds })
101
+ .andWhere('wd.type = :type ', { type: constants_1.WORKSHEET_TYPE.LOADING })
102
+ .andWhere('wd.status = :status ', { status: constants_1.WORKSHEET_STATUS.DONE })
103
+ .orderBy('product.sku')
104
+ .addOrderBy('product.name')
105
+ .addOrderBy('product.description')
106
+ .addOrderBy('inventory.batch_id');
107
+ const foundWSD = await wdQb.getMany();
100
108
  const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
101
109
  where: { domain, category: constants_1.TEMPLATE_TYPE.DO_TEMPLATE }
102
110
  });
@@ -193,10 +201,11 @@ async function renderRODO({ doNo }, context) {
193
201
  });
194
202
  }
195
203
  }, []);
204
+ //** Q: @Oscar, what does this code block does? */
196
205
  let tempFoundInventoryItem = [];
197
206
  const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => (Object.assign({}, p))));
198
- sepProductList.forEach((product) => {
199
- let temp = foundInventoryItem.filter((item) => {
207
+ sepProductList.forEach(product => {
208
+ let temp = foundInventoryItem.filter(item => {
200
209
  return item.sku == product.product_sku;
201
210
  });
202
211
  if (temp.length > 1) {
@@ -236,7 +245,8 @@ async function renderRODO({ doNo }, context) {
236
245
  if (t >= 0)
237
246
  foundInventoryItem[t].totalQuantity = tempTotalQuantity[index];
238
247
  });
239
- foundInventoryItem[0].ref_no = ownRefNo || "";
248
+ foundInventoryItem[0].ref_no = ownRefNo || '';
249
+ //** Q: @Oscar, what does this code block does? */
240
250
  const data = {
241
251
  logo_url: logo,
242
252
  customer_biz: partnerBiz.name,
@@ -254,28 +264,87 @@ async function renderRODO({ doNo }, context) {
254
264
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
255
265
  warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
256
266
  warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
257
- customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
258
- customer_delivery_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.address) || [foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5, foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode, foundRO === null || foundRO === void 0 ? void 0 : foundRO.city, foundRO === null || foundRO === void 0 ? void 0 : foundRO.state, foundRO === null || foundRO === void 0 ? void 0 : foundRO.country].filter(Boolean).join(", ") || null,
259
- customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
260
- new_billing_address: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
261
- new_delivery_address: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1) || null,
262
- new_delivery_address2: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2) || null,
263
- new_delivery_address3: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3) || null,
264
- new_delivery_address4: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4) || null,
265
- new_delivery_address5: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5) || null,
266
- new_delivery_city: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.city) || null,
267
- new_delivery_state: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.state) || null,
268
- new_delivery_postal_code: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode) || null,
269
- new_delivery_country: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.country) || null,
270
- new_attention_to: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || null,
271
- new_attention_company: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
272
- new_phone_no: (foundRO === null || foundRO === void 0 ? void 0 : foundRO.phone1) || null,
273
- customer_phone: foundCP ? foundCP.phone : null,
267
+ customer_name: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.name) ||
268
+ foundDO.attentionTo ||
269
+ foundDO.attentionCompany ||
270
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) ||
271
+ (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) ||
272
+ null,
273
+ customer_delivery_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.address) ||
274
+ [
275
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
276
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
277
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
278
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
279
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
280
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
281
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
282
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
283
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
284
+ ]
285
+ .filter(Boolean)
286
+ .join(', ') ||
287
+ [
288
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1,
289
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2,
290
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3,
291
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4,
292
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5,
293
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode,
294
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.city,
295
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.state,
296
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.country
297
+ ]
298
+ .filter(Boolean)
299
+ .join(', ') ||
300
+ null,
301
+ customer_billing_address: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.billingAddress) || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
302
+ new_billing_address: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.billingAddress) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.billingAddress) || null,
303
+ new_delivery_address: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1) || null,
304
+ new_delivery_address2: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2) || null,
305
+ new_delivery_address3: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3) || null,
306
+ new_delivery_address4: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4) || null,
307
+ new_delivery_address5: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5) || null,
308
+ new_delivery_city: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.city) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.city) || null,
309
+ new_delivery_state: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.state) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.state) || null,
310
+ new_delivery_postal_code: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode) || null,
311
+ new_delivery_country: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.country) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.country) || null,
312
+ new_attention_to: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.attentionTo) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionTo) || null,
313
+ new_attention_company: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.attentionCompany) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.attentionCompany) || null,
314
+ new_phone_no: (foundDO === null || foundDO === void 0 ? void 0 : foundDO.phone1) || (foundRO === null || foundRO === void 0 ? void 0 : foundRO.phone1) || null,
315
+ customer_phone: foundCP ? foundCP.phone : null || (foundDO === null || foundDO === void 0 ? void 0 : foundDO.phone1),
274
316
  customer_fax: foundCP ? foundCP.fax : null,
275
317
  customer_email: foundCP ? foundCP.email : null,
276
- customer_company: foundCP ? foundCP.companyName : null,
318
+ customer_company: foundCP ? foundCP.companyName : null || foundDO.attentionCompany,
277
319
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
278
- destination: foundDO.to || [foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4, foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5, foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode, foundRO === null || foundRO === void 0 ? void 0 : foundRO.city, foundRO === null || foundRO === void 0 ? void 0 : foundRO.state, foundRO === null || foundRO === void 0 ? void 0 : foundRO.country].filter(Boolean).join(", ") || '',
320
+ destination: foundDO.to ||
321
+ [
322
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress1,
323
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress2,
324
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress3,
325
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress4,
326
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.deliveryAddress5,
327
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.postalCode,
328
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.city,
329
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.state,
330
+ foundDO === null || foundDO === void 0 ? void 0 : foundDO.country
331
+ ]
332
+ .filter(Boolean)
333
+ .join(', ') ||
334
+ [
335
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress1,
336
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress2,
337
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress3,
338
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress4,
339
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.deliveryAddress5,
340
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.postalCode,
341
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.city,
342
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.state,
343
+ foundRO === null || foundRO === void 0 ? void 0 : foundRO.country
344
+ ]
345
+ .filter(Boolean)
346
+ .join(', ') ||
347
+ '',
279
348
  ro_no: foundRO.name,
280
349
  ro_created_at: foundRO.createdAt ? foundRO.createdAt : '',
281
350
  ref_no: ownRefNo ? `${foundRO.name} / ${foundRO.refNo}` : `${foundRO.name}`,
package/dist-server/controllers/render-ro-do.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-ro-do.js","sourceRoot":"","sources":["../../server/controllers/render-ro-do.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAsB;AACtB,0DAAgC;AAChC,4DAA8B;AAC9B,qCAAkD;AAElD,qEAAqE;AACrE,yDAAmD;AACnD,uDAAiE;AACjE,6CAA4C;AAE5C,2DAAqG;AACrG,iDAA8C;AAC9C,mEAAkE;AAClE,mEAA8D;AAC9D,4CAA8E;AAC9E,0CAAwD;AACxD,0DAA0D;AAE1D,MAAM,cAAc,GAAG,YAAM,CAAC,GAAG,CAAC,cAAc,EAAE,6CAA6C,CAAC,CAAA;AAEzF,KAAK,UAAU,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE,OAAY;IACrD,MAAM,MAAM,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC;QACzD,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE;KACvC,CAAC,CAAA,CAAC,gBAAgB;IACnB,MAAM,OAAO,GAAkB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;QACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;QAC7B,SAAS,EAAE;YACT,QAAQ;YACR,UAAU;YACV,kBAAkB;YAClB,iBAAiB;YACjB,iBAAiB;YACjB,kBAAkB;YAClB,aAAa;YACb,SAAS;YACT,SAAS;SACV;KACF,CAAC,CAAA,CAAC,kCAAkC;IAErC,MAAM,gBAAgB,GAAY,OAAO,CAAC,aAAa,CAAA;IAEvD,IAAI,OAAO,GAAiB,IAAI,CAAA;IAChC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,EAAE;QAC9B,OAAO,GAAG,MAAM,IAAA,uBAAa,EAAC,uBAAY,CAAC,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,iBAAiB,EAAE;SACjD,CAAC,CAAA;KACH;IAED,MAAM,OAAO,GAAgB,OAAO,CAAC,WAAW,CAAA;IAChD,MAAM,UAAU,GAAa,OAAO,CAAC,QAAQ,CAAA,CAAC,mBAAmB;IACjE,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAA;IAE9B,IAAI,kBAAkB,GAAoB,MAAM,IAAA,uBAAa,EAAC,8BAAa,CAAC,CAAC,KAAK,CAAC;;;;iCAIpD,OAAO,CAAC,WAAW,CAAC,EAAE;;GAEpD,CAAC,CAAA;IAEF,MAAM,aAAa,GAAY,MAAM,IAAA,uBAAa,EAAC,mBAAO,CAAC,CAAC,OAAO,CAAC;QAClE,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE;QACnD,SAAS,EAAE,CAAC,QAAQ,CAAC;KACtB,CAAC,CAAA;IAEF,MAAM,WAAW,GAAW,aAAa,CAAC,MAAM,CAAA;IAEhD,MAAM,cAAc,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;QACrE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;QAC9B,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,+BAA+B;IAC/B,MAAM,gBAAgB,GAAiB,MAAM,IAAA,uBAAa,EAAC,uBAAY,CAAC,CAAC,OAAO,CAAC;QAC/E,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE;KAC/D,CAAC,CAAA;IAEF,MAAM,OAAO,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QAChE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE;QACvC,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,MAAM,cAAc,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QACvE,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,0BAAc,CAAC,OAAO,EAAE;QACrE,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,sBAAsB;IACtB,MAAM,OAAO,GAAa,MAAM,IAAA,uBAAa,EAAC,uBAAM,CAAC,CAAC,IAAI,CAAC;QACzD,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE;KAC5C,CAAC,CAAA;IAEF,+BAA+B;IAC/B,MAAM,iBAAiB,GAAqB,MAAM,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,IAAI,CAAC;QACnF,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE;QACzC,SAAS,EAAE,CAAC,WAAW,CAAC;KACzB,CAAC,CAAA;IACF,MAAM,WAAW,GAAa,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;IAEvE,MAAM,IAAI,GAAG,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;IACpE,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;SAC5D,iBAAiB,CAAC,2BAA2B,EAAE,WAAW,CAAC;SAC3D,iBAAiB,CAAC,oBAAoB,EAAE,UAAU,CAAC;SACnD,iBAAiB,CAAC,mBAAmB,EAAE,SAAS,CAAC;SACjD,iBAAiB,CAAC,wBAAwB,EAAE,gBAAgB,CAAC;SAC7D,iBAAiB,CAAC,0BAA0B,EAAE,gBAAgB,CAAC;SAC/D,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;SACxC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;SAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;SAC1C,KAAK,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;SAC1D,QAAQ,CAAC,8CAA8C,EAAE,EAAE,WAAW,EAAE,CAAC;SACzE,QAAQ,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,0BAAc,CAAC,OAAO,EAAE,CAAC;SAC9D,QAAQ,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,4BAAgB,CAAC,IAAI,EAAE,CAAC;SACnE,OAAO,CAAC,aAAa,CAAC;SACtB,UAAU,CAAC,cAAc,CAAC;SAC1B,UAAU,CAAC,qBAAqB,CAAC;SACjC,UAAU,CAAC,oBAAoB,CAAC,CAAA;IAEnC,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IAExD,MAAM,aAAa,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACxE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAa,CAAC,WAAW,EAAE;KACvD,CAAC,CAAA;IAEF,MAAM,SAAS,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACpE,KAAK,EAAE;YACL,MAAM;YACN,QAAQ,EAAE,yBAAa,CAAC,IAAI;SAC7B;KACF,CAAC,CAAA;IAEF,IAAI,WAAW,GAAQ,IAAI,CAAA;IAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,yBAAY,CAAC,iBAAiB,EAAE;QACrD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE;YAClD,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;SAClC;aAAM;YACL,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAA;SAC3C;KACF;IAED,MAAM,QAAQ,GAAG,MAAM,yBAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACpE,IAAI,IAAI,GAAG,IAAI,CAAA;IACf,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,EAAE;QACnB,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC,QAAQ,GAAG,UAAU,GAAG,CAAC,MAAM,yBAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAA;KACtG;IAED,IAAI,WAAW,GAAU,EAAE,CAAA;IAC3B,WAAW,GAAG,QAAQ;SACnB,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE;;QAC5B,MAAM,eAAe,GAAmB,GAAG,CAAC,eAAe,CAAA;QAC3D,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;QACtD,MAAM,cAAc,GAAoB,SAAS,CAAC,OAAO,CAAC,cAAc,CAAA;QACxE,MAAM,oBAAoB,GAAkB,cAAc,CAAC,IAAI,CAC7D,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,KAAK,SAAS,CAAC,WAAW,CACrE,CAAA;QACD,OAAO;YACL,YAAY,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,CAAC,WAAW,GAAG;YAC5E,YAAY,EAAE,GAAG,CAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,EAAE;YACvD,gBAAgB,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE;YAC7C,WAAW,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE;YACvC,YAAY,EAAE,SAAS,CAAC,WAAW;YACnC,YAAY,EAAE,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW;YAC7F,aAAa,EAAE,SAAS,CAAC,OAAO;YAChC,iBAAiB,EAAE,SAAS,CAAC,UAAU;YACvC,WAAW,EAAE,eAAe,CAAC,UAAU;YACvC,cAAc,EAAE,eAAe,CAAC,aAAa;YAC7C,oBAAoB,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW;YACnD,iBAAiB,EAAE,eAAe,CAAC,eAAe;YAClD,WAAW,EAAE,SAAS,CAAC,GAAG;YAC1B,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,gBAAgB,EAAE,SAAS,CAAC,MAAM;YAClC,aAAa,EAAE,eAAe,CAAC,YAAY;YAC3C,MAAM,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,MAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,0CAAE,IAAI,CAAA,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;SAC1G,CAAA;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACxB,IAAI,SAAS,GAAG,OAAO,CAAC,IAAI,CAC1B,OAAO,CAAC,EAAE,CACR,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY;YAC1C,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa;YAC5C,OAAO,CAAC,iBAAiB,KAAK,IAAI,CAAC,iBAAiB;YACpD,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa;YAC5C,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CACjC,CAAA;QACD,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG;gBACV,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;gBAC/C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,SAAS,EAAE,CAAC;gBACZ,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAA;YAED,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACvB,OAAO,OAAO,CAAA;SACf;aAAM;YACL,OAAO,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACtB,IACE,EAAE,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY;oBACrC,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa;oBACvC,EAAE,CAAC,iBAAiB,KAAK,IAAI,CAAC,iBAAiB;oBAC/C,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,aAAa;oBACvC,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EACzB;oBACA,uCACK,EAAE,KACL,SAAS,EAAE,EAAE,CAAC,SAAS,GAAG,CAAC,EAC3B,WAAW,EAAE,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,EAC9C,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,EACvD,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IACjE;iBACF;qBAAM;oBACL,OAAO,EAAE,CAAA;iBACV;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAER,kDAAkD;IAClD,IAAI,sBAAsB,GAAQ,EAAE,CAAA;IAEpC,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,mBAAM,CAAC,EAAG,CAAC,CAAC,CAAA;IAExG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC/B,IAAI,IAAI,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,WAAW,CAAA;QACxC,CAAC,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;gBAEhB,IAAI,sBAAsB,CAAC,MAAM,IAAI,CAAC,EAAE;oBACtC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iBACjC;qBAAM;oBACL,MAAM,KAAK,GAAG,sBAAsB,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,CAAC,CAAA;oBAE7F,IAAI,CAAC,KAAK,EAAE;wBACV,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;qBACjC;iBACF;gBAED,sBAAsB,GAAG,gBAAC,CAAC,QAAQ,CAAC,sBAAsB,EAAE,gBAAC,CAAC,OAAO,CAAC,CAAA;YACxE,CAAC,CAAC,CAAA;SACH;aAAM;YACL,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;SACxD;IACH,CAAC,CAAC,CAAA;IAEF,kBAAkB,GAAG,sBAAsB,CAAA;IAE3C,MAAM,mBAAmB,GAAG,gBAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAErE,MAAM,YAAY,GAAG,EAAE,CAAA;IAEvB,MAAM,iBAAiB,GAAG,EAAE,CAAA;IAE5B,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC3C,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;YACjD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;QAEF,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QAC7C,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAA;QAE7B,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QAChC,IAAI,CAAC,IAAI,CAAC;YAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC5E,CAAC,CAAC,CAAA;IAEF,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,QAAQ,IAAI,EAAE,CAAA;IAC7C,kDAAkD;IAElD,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,UAAU,CAAC,IAAI;QAC7B,iBAAiB,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI;QAC1C,cAAc,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI;QAC3C,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;QACvC,eAAe,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO;QAC/C,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,KAAK,CAAC,CAAC,CAAC,IAAI;QAChE,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QAC/D,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACrE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACvE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACvE,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;QAC/D,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QACjE,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QACjE,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;QAC7D,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QACjE,aAAa,EACX,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;YACb,OAAO,CAAC,WAAW;YACnB,OAAO,CAAC,gBAAgB;aACxB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA;aACpB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA;YACzB,IAAI;QACN,yBAAyB,EACvB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;YAChB;gBACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU;gBACnB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;gBACb,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;gBACd,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;aACjB;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,IAAI,CAAC;YACb;gBACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU;gBACnB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;gBACb,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;gBACd,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;aACjB;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,IAAI,CAAC;YACb,IAAI;QACN,wBAAwB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,IAAI,IAAI;QAC/G,mBAAmB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,IAAI,IAAI;QAC/E,oBAAoB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,IAAI,IAAI;QACpF,qBAAqB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,IAAI,IAAI;QACrF,qBAAqB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,IAAI,IAAI;QACrF,qBAAqB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,IAAI,IAAI;QACrF,qBAAqB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,IAAI,IAAI;QACrF,iBAAiB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAA,IAAI,IAAI;QACzD,kBAAkB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA,IAAI,IAAI;QAC5D,wBAAwB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAA,IAAI,IAAI;QAC5E,oBAAoB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA,IAAI,IAAI;QAClE,gBAAgB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,IAAI,IAAI;QACtE,qBAAqB,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAA,IAAI,IAAI;QACrF,YAAY,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,IAAI,IAAI;QACxD,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA;QACjE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;QAC1C,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QAC9C,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,gBAAgB;QAClF,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,SAAS,aAAa;QAC1F,WAAW,EACT,OAAO,CAAC,EAAE;YACV;gBACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU;gBACnB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;gBACb,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;gBACd,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;aACjB;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,IAAI,CAAC;YACb;gBACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;gBACzB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU;gBACnB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI;gBACb,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK;gBACd,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO;aACjB;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,IAAI,CAAC;YACb,EAAE;QACJ,KAAK,EAAE,OAAO,CAAC,IAAI;QACnB,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;QACzD,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE;QAC3E,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;QAC/C,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;QAClD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;QAClD,QAAQ,EAAE,OAAO,CAAC,IAAI;QACtB,aAAa,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;QACzC,qBAAqB,EAAE,iCAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;QACrE,eAAe,EAAE,iCAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QAC1D,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,WAAW,EAAE,WAAW,IAAI,EAAE;QAC9B,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QACjC,SAAS,EAAE,OAAO,CAAC,MAAM;QACzB,eAAe,EAAE,OAAO,CAAC,cAAc;QACvC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAClD,YAAY,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,GAAG,EAAE,EAAE;YAC/C,uCACK,IAAI,KACP,OAAO,EAAE,GAAG,GAAG,CAAC,EAChB,iBAAiB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,EAC1F,MAAM,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM;oBAClB,CAAC,CAAC,IAAI,CAAC,MAAM;oBACb,CAAC,CAAC,IAAI,CAAC,aAAa;wBAClB,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;4BAClB,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,kBAAkB;4BACrC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,eAAe,IAAI,CAAC,MAAM,SAAS;wBACxD,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE;4BAClB,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,YAAY;4BAC/B,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,eAAe,IAAI,CAAC,MAAM,GAAG,EACtD,gBAAgB,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gBAAgB,EAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EACrE,YAAY,EAAE,IAAI,CAAC,iBAAiB,IACrC;QACH,CAAC,CAAC;QACF,YAAY,EACV,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,GAAG,EAAE,EAAE;YACxC,uCAAY,IAAI,KAAE,WAAW,EAAE,OAAO,CAAC,EAAE,IAAE;QAC7C,CAAC,CAAC,IAAI,EAAE;KACX,CAAA,CAAC,sBAAsB;IACxB,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAE/B,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACrC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;IAEnD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,cAAc,EAAE;QAC3C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,QAAQ;KACf,CAAC,CAAA;IAEF,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;AAC9B,CAAC;AAvaD,gCAuaC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.42",
3
+ "version": "4.3.43",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -30,15 +30,15 @@
30
30
  "@things-factory/id-rule-base": "^4.3.40",
31
31
  "@things-factory/integration-lmd": "^4.3.40",
32
32
  "@things-factory/integration-marketplace": "^4.3.41",
33
- "@things-factory/integration-sellercraft": "^4.3.42",
33
+ "@things-factory/integration-sellercraft": "^4.3.43",
34
34
  "@things-factory/integration-sftp": "^4.3.40",
35
- "@things-factory/marketplace-base": "^4.3.41",
35
+ "@things-factory/marketplace-base": "^4.3.43",
36
36
  "@things-factory/notification": "^4.3.40",
37
- "@things-factory/sales-base": "^4.3.42",
37
+ "@things-factory/sales-base": "^4.3.43",
38
38
  "@things-factory/setting-base": "^4.3.40",
39
39
  "@things-factory/shell": "^4.3.35",
40
40
  "@things-factory/transport-base": "^4.3.40",
41
- "@things-factory/warehouse-base": "^4.3.42"
41
+ "@things-factory/warehouse-base": "^4.3.43"
42
42
  },
43
- "gitHead": "d2e3d30572c0f968208cd4d8e9b0648986d754c3"
43
+ "gitHead": "45b1a76384731ef43ba872c9867fa56bc3b491ec"
44
44
  }
package/server/controllers/render-orientage-do.ts CHANGED
@@ -274,9 +274,28 @@ export async function renderOrientageDO({ doNo }, context: any) {
274
274
  company_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
275
275
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
276
276
  company_email: foundWarehouseCP.email,
277
- customer_name: foundCP?.name || foundRO.attentionTo || null,
277
+ customer_name:
278
+ foundCP?.name ||
279
+ foundDO.attentionTo ||
280
+ foundDO.attentionCompany ||
281
+ foundRO?.attentionTo ||
282
+ foundRO?.attentionCompany ||
283
+ null,
278
284
  customer_delivery_address:
279
285
  foundCP?.address ||
286
+ [
287
+ foundDO?.deliveryAddress1,
288
+ foundDO?.deliveryAddress2,
289
+ foundDO?.deliveryAddress3,
290
+ foundDO?.deliveryAddress4,
291
+ foundDO?.deliveryAddress5,
292
+ foundDO?.postalCode,
293
+ foundDO?.city,
294
+ foundDO?.state,
295
+ foundDO?.country
296
+ ]
297
+ .filter(Boolean)
298
+ .join(', ') ||
280
299
  [
281
300
  foundRO?.deliveryAddress1,
282
301
  foundRO?.deliveryAddress2,
@@ -291,13 +310,28 @@ export async function renderOrientageDO({ doNo }, context: any) {
291
310
  .filter(Boolean)
292
311
  .join(', ') ||
293
312
  null,
294
- customer_billing_address: foundCP?.billingAddress || foundRO?.billingAddress || null,
295
- customer_phone: foundCP?.phone || foundRO.phone1 || null,
313
+ customer_billing_address: foundCP?.billingAddress || foundDO?.billingAddress || null,
314
+ customer_phone: foundCP?.phone || foundDO?.phone1 || foundRO.phone1 || null,
296
315
  customer_fax: foundCP ? foundCP.fax : null,
297
316
  customer_email: foundCP?.email || foundRO.email || null,
298
- customer_company: foundCP?.companyName || foundRO.attentionCompany || null,
317
+ customer_company: foundCP?.companyName || foundDO.attentionCompany || foundRO.attentionCompany || null,
299
318
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
300
- destination: foundDO.to || '',
319
+ destination:
320
+ foundDO.to ||
321
+ [
322
+ foundDO?.deliveryAddress1,
323
+ foundDO?.deliveryAddress2,
324
+ foundDO?.deliveryAddress3,
325
+ foundDO?.deliveryAddress4,
326
+ foundDO?.deliveryAddress5,
327
+ foundDO?.postalCode,
328
+ foundDO?.city,
329
+ foundDO?.state,
330
+ foundDO?.country
331
+ ]
332
+ .filter(Boolean)
333
+ .join(', ') ||
334
+ '',
301
335
  ref_no: ownRefNo,
302
336
  ref_no1: ownRefNo2 ? ownRefNo2 : '',
303
337
  ref_no2: ownRefNo3 ? ownRefNo3 : '',
package/server/controllers/render-ro-do.ts CHANGED
@@ -50,9 +50,13 @@ export async function renderRODO({ doNo }, context: any) {
50
50
  const partnerBiz: Bizplace = foundDO.bizplace //customer bizplace
51
51
  const ownRefNo = foundRO.refNo
52
52
 
53
- let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
54
- `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`
55
- )
53
+ let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(`
54
+ select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number
55
+ from inventory_items ii
56
+ left join products p on ii.product_id = p.id
57
+ where outbound_order_id = '${foundDO.releaseGood.id}'
58
+ group by p.sku,ii.serial_number,p.brand_sku
59
+ `)
56
60
 
57
61
  const partnerDomain: Partner = await getRepository(Partner).findOne({
58
62
  where: { partnerDomain: partnerBiz.domain, domain },
@@ -93,23 +97,26 @@ export async function renderRODO({ doNo }, context: any) {
93
97
  })
94
98
  const orderInvIds: string[] = targetInventories.map((oi: any) => oi.id)
95
99
 
96
- const foundWSD: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
97
- where: {
98
- domain,
99
- targetInventory: In(orderInvIds),
100
- type: WORKSHEET_TYPE.LOADING,
101
- status: Equal(WORKSHEET_STATUS.DONE)
102
- },
103
- relations: [
104
- 'targetInventory',
105
- 'targetInventory.inventory',
106
- 'targetInventory.inventory.location',
107
- 'targetInventory.inventory.product',
108
- 'targetInventory.inventory.product.productDetails',
109
- 'targetInventory.inventory.reusablePallet',
110
- 'updater'
111
- ]
112
- })
100
+ const wdQb = getRepository(WorksheetDetail).createQueryBuilder('wd')
101
+ wdQb.leftJoinAndSelect('wd.targetInventory', 'targetInventory')
102
+ .leftJoinAndSelect('targetInventory.inventory', 'inventory')
103
+ .leftJoinAndSelect('inventory.location', 'location')
104
+ .leftJoinAndSelect('inventory.product', 'product')
105
+ .leftJoinAndSelect('product.productDetails', 'productDetails')
106
+ .leftJoinAndSelect('inventory.reusablePallet', 'reusablePallet')
107
+ .leftJoinAndSelect('wd.domain', 'domain')
108
+ .leftJoinAndSelect('wd.creator', 'creator')
109
+ .leftJoinAndSelect('wd.updater', 'updater')
110
+ .where('wd.domain_id = :domainId', { domainId: domain.id })
111
+ .andWhere('wd.target_inventory_id IN (:...orderInvIds) ', { orderInvIds })
112
+ .andWhere('wd.type = :type ', { type: WORKSHEET_TYPE.LOADING })
113
+ .andWhere('wd.status = :status ', { status: WORKSHEET_STATUS.DONE })
114
+ .orderBy('product.sku')
115
+ .addOrderBy('product.name')
116
+ .addOrderBy('product.description')
117
+ .addOrderBy('inventory.batch_id')
118
+
119
+ const foundWSD: WorksheetDetail[] = await wdQb.getMany()
113
120
 
114
121
  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
115
122
  where: { domain, category: TEMPLATE_TYPE.DO_TEMPLATE }
@@ -222,15 +229,13 @@ export async function renderRODO({ doNo }, context: any) {
222
229
  }
223
230
  }, [])
224
231
 
225
-
226
-
232
+ //** Q: @Oscar, what does this code block does? */
227
233
  let tempFoundInventoryItem: any = []
228
234
 
229
235
  const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => ({ ...p })))
230
236
 
231
- sepProductList.forEach((product) => {
232
-
233
- let temp = foundInventoryItem.filter((item) => {
237
+ sepProductList.forEach(product => {
238
+ let temp = foundInventoryItem.filter(item => {
234
239
  return item.sku == product.product_sku
235
240
  })
236
241
 
@@ -255,7 +260,7 @@ export async function renderRODO({ doNo }, context: any) {
255
260
  }
256
261
  })
257
262
 
258
- foundInventoryItem = tempFoundInventoryItem;
263
+ foundInventoryItem = tempFoundInventoryItem
259
264
 
260
265
  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
261
266
 
@@ -278,11 +283,11 @@ export async function renderRODO({ doNo }, context: any) {
278
283
  })
279
284
 
280
285
  tempIndexArr.forEach((t, index) => {
281
- if (t >= 0)
282
- foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
286
+ if (t >= 0) foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
283
287
  })
284
288
 
285
- foundInventoryItem[0].ref_no = ownRefNo || ""
289
+ foundInventoryItem[0].ref_no = ownRefNo || ''
290
+ //** Q: @Oscar, what does this code block does? */
286
291
 
287
292
  const data = {
288
293
  logo_url: logo,
@@ -301,28 +306,90 @@ export async function renderRODO({ doNo }, context: any) {
301
306
  warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
302
307
  warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
303
308
  warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
304
- customer_name: foundCP?.name || foundRO?.attentionTo || foundRO?.attentionCompany || null,
305
- customer_delivery_address: foundCP?.address || [foundRO?.deliveryAddress1, foundRO?.deliveryAddress2, foundRO?.deliveryAddress3, foundRO?.deliveryAddress4, foundRO?.deliveryAddress5, foundRO?.postalCode, foundRO?.city, foundRO?.state, foundRO?.country].filter(Boolean).join(", ") || null,
306
- customer_billing_address: foundCP?.billingAddress || foundRO?.billingAddress || null,
307
- new_billing_address: foundRO?.billingAddress || null,
308
- new_delivery_address: foundRO?.deliveryAddress1 || null,
309
- new_delivery_address2: foundRO?.deliveryAddress2 || null,
310
- new_delivery_address3: foundRO?.deliveryAddress3 || null,
311
- new_delivery_address4: foundRO?.deliveryAddress4 || null,
312
- new_delivery_address5: foundRO?.deliveryAddress5 || null,
313
- new_delivery_city: foundRO?.city || null,
314
- new_delivery_state: foundRO?.state || null,
315
- new_delivery_postal_code: foundRO?.postalCode || null,
316
- new_delivery_country: foundRO?.country || null,
317
- new_attention_to: foundRO?.attentionTo || null,
318
- new_attention_company: foundRO?.attentionCompany || null,
319
- new_phone_no: foundRO?.phone1 || null,
320
- customer_phone: foundCP ? foundCP.phone : null,
309
+ customer_name:
310
+ foundCP?.name ||
311
+ foundDO.attentionTo ||
312
+ foundDO.attentionCompany ||
313
+ foundRO?.attentionTo ||
314
+ foundRO?.attentionCompany ||
315
+ null,
316
+ customer_delivery_address:
317
+ foundCP?.address ||
318
+ [
319
+ foundDO?.deliveryAddress1,
320
+ foundDO?.deliveryAddress2,
321
+ foundDO?.deliveryAddress3,
322
+ foundDO?.deliveryAddress4,
323
+ foundDO?.deliveryAddress5,
324
+ foundDO?.postalCode,
325
+ foundDO?.city,
326
+ foundDO?.state,
327
+ foundDO?.country
328
+ ]
329
+ .filter(Boolean)
330
+ .join(', ') ||
331
+ [
332
+ foundRO?.deliveryAddress1,
333
+ foundRO?.deliveryAddress2,
334
+ foundRO?.deliveryAddress3,
335
+ foundRO?.deliveryAddress4,
336
+ foundRO?.deliveryAddress5,
337
+ foundRO?.postalCode,
338
+ foundRO?.city,
339
+ foundRO?.state,
340
+ foundRO?.country
341
+ ]
342
+ .filter(Boolean)
343
+ .join(', ') ||
344
+ null,
345
+ customer_billing_address: foundCP?.billingAddress || foundDO?.billingAddress || foundRO?.billingAddress || null,
346
+ new_billing_address: foundDO?.billingAddress || foundRO?.billingAddress || null,
347
+ new_delivery_address: foundDO?.deliveryAddress1 || foundRO?.deliveryAddress1 || null,
348
+ new_delivery_address2: foundDO?.deliveryAddress2 || foundRO?.deliveryAddress2 || null,
349
+ new_delivery_address3: foundDO?.deliveryAddress3 || foundRO?.deliveryAddress3 || null,
350
+ new_delivery_address4: foundDO?.deliveryAddress4 || foundRO?.deliveryAddress4 || null,
351
+ new_delivery_address5: foundDO?.deliveryAddress5 || foundRO?.deliveryAddress5 || null,
352
+ new_delivery_city: foundDO?.city || foundRO?.city || null,
353
+ new_delivery_state: foundDO?.state || foundRO?.state || null,
354
+ new_delivery_postal_code: foundDO?.postalCode || foundRO?.postalCode || null,
355
+ new_delivery_country: foundDO?.country || foundRO?.country || null,
356
+ new_attention_to: foundDO?.attentionTo || foundRO?.attentionTo || null,
357
+ new_attention_company: foundDO?.attentionCompany || foundRO?.attentionCompany || null,
358
+ new_phone_no: foundDO?.phone1 || foundRO?.phone1 || null,
359
+ customer_phone: foundCP ? foundCP.phone : null || foundDO?.phone1,
321
360
  customer_fax: foundCP ? foundCP.fax : null,
322
361
  customer_email: foundCP ? foundCP.email : null,
323
- customer_company: foundCP ? foundCP.companyName : null,
362
+ customer_company: foundCP ? foundCP.companyName : null || foundDO.attentionCompany,
324
363
  own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
325
- destination: foundDO.to || [foundRO?.deliveryAddress1, foundRO?.deliveryAddress2, foundRO?.deliveryAddress3, foundRO?.deliveryAddress4, foundRO?.deliveryAddress5, foundRO?.postalCode, foundRO?.city, foundRO?.state, foundRO?.country].filter(Boolean).join(", ") || '',
364
+ destination:
365
+ foundDO.to ||
366
+ [
367
+ foundDO?.deliveryAddress1,
368
+ foundDO?.deliveryAddress2,
369
+ foundDO?.deliveryAddress3,
370
+ foundDO?.deliveryAddress4,
371
+ foundDO?.deliveryAddress5,
372
+ foundDO?.postalCode,
373
+ foundDO?.city,
374
+ foundDO?.state,
375
+ foundDO?.country
376
+ ]
377
+ .filter(Boolean)
378
+ .join(', ') ||
379
+ [
380
+ foundRO?.deliveryAddress1,
381
+ foundRO?.deliveryAddress2,
382
+ foundRO?.deliveryAddress3,
383
+ foundRO?.deliveryAddress4,
384
+ foundRO?.deliveryAddress5,
385
+ foundRO?.postalCode,
386
+ foundRO?.city,
387
+ foundRO?.state,
388
+ foundRO?.country
389
+ ]
390
+ .filter(Boolean)
391
+ .join(', ') ||
392
+ '',
326
393
  ro_no: foundRO.name,
327
394
  ro_created_at: foundRO.createdAt ? foundRO.createdAt : '',
328
395
  ref_no: ownRefNo ? `${foundRO.name} / ${foundRO.refNo}` : `${foundRO.name}`,
@@ -358,9 +425,10 @@ export async function renderRODO({ doNo }, context: any) {
358
425
  batch_id_ref: prod.product_batch_ref
359
426
  }
360
427
  }),
361
- serialNumber: foundInventoryItem.map((item: any, idx) => {
362
- return { ...item, delivery_to: foundDO.to }
363
- }) || ''
428
+ serialNumber:
429
+ foundInventoryItem.map((item: any, idx) => {
430
+ return { ...item, delivery_to: foundDO.to }
431
+ }) || ''
364
432
  } //.. make data from do
365
433
  const formData = new FormData()
366
434