@things-factory/integration-accounting 4.3.544 → 4.3.562

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 (13) hide show
  1. package/dist-server/controllers/xilnex/apis/sales-order/create-sales-order.js +32 -21
  2. package/dist-server/controllers/xilnex/apis/sales-order/create-sales-order.js.map +1 -1
  3. package/dist-server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.js +1 -1
  4. package/dist-server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.js.map +1 -1
  5. package/dist-server/controllers/xilnex/apis/shipment/create-shipment.js +5 -2
  6. package/dist-server/controllers/xilnex/apis/shipment/create-shipment.js.map +1 -1
  7. package/dist-server/controllers/xilnex/xilnex.js +11 -6
  8. package/dist-server/controllers/xilnex/xilnex.js.map +1 -1
  9. package/package.json +3 -3
  10. package/server/controllers/xilnex/apis/sales-order/create-sales-order.ts +33 -20
  11. package/server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.ts +1 -1
  12. package/server/controllers/xilnex/apis/shipment/create-shipment.ts +5 -2
  13. package/server/controllers/xilnex/xilnex.ts +17 -6
package/dist-server/controllers/xilnex/apis/sales-order/create-sales-order.js CHANGED
@@ -4,26 +4,45 @@ exports.createSalesOrder = void 0;
4
4
  function createSalesOrder() {
5
5
  return {
6
6
  method: 'post',
7
- path: '/salesorder',
7
+ path: '/salesorder?disableRounding=true',
8
8
  denormalize(req, { accounting }) {
9
9
  var _a;
10
10
  const { releaseGood, orderProducts } = req;
11
11
  let accountInfo = (accounting === null || accounting === void 0 ? void 0 : accounting.accountInfo) ? JSON.parse(accounting.accountInfo) : {};
12
- const matchedClient = accountInfo.clients.filter(client => client.clientPlatform == releaseGood.platformCode && client.clientCountry == releaseGood.platformCountry);
12
+ let { outlet, clients } = accountInfo;
13
+ let xilnexSetting = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.xilnexSetting) ? JSON.parse(releaseGood.xilnexSetting) : null;
14
+ const matchedClient = clients.filter(client => client.clientPlatform == releaseGood.platformCode && client.clientCountry == releaseGood.platformCountry);
15
+ let salesOrderType = (xilnexSetting === null || xilnexSetting === void 0 ? void 0 : xilnexSetting.salesType) || ((_a = matchedClient[0]) === null || _a === void 0 ? void 0 : _a.salesType) || 'InvoiceSales';
16
+ let outletName = (xilnexSetting === null || xilnexSetting === void 0 ? void 0 : xilnexSetting.outletName) || outlet || 'MAIN BRANCH';
17
+ let clientId = (xilnexSetting === null || xilnexSetting === void 0 ? void 0 : xilnexSetting.clientId) || matchedClient[0].clientId || '';
18
+ let clientPayment = (xilnexSetting === null || xilnexSetting === void 0 ? void 0 : xilnexSetting.clientPayment) || matchedClient[0].clientPayment || '';
19
+ let paidAmt = 0;
20
+ let salesOrderItems = orderProducts.map(op => {
21
+ var _a;
22
+ let sellingPrice = Math.round(((op === null || op === void 0 ? void 0 : op.sellingPrice) || 0) * 100) / 100;
23
+ let unitPrice = sellingPrice / (op === null || op === void 0 ? void 0 : op.releaseQty);
24
+ let enterPrice = Math.round(unitPrice * 100) / 100;
25
+ paidAmt += enterPrice * op.releaseQty;
26
+ return {
27
+ itemCode: (_a = op === null || op === void 0 ? void 0 : op.product) === null || _a === void 0 ? void 0 : _a.sku,
28
+ enterPrice: enterPrice,
29
+ quantity: op === null || op === void 0 ? void 0 : op.releaseQty
30
+ // discountPercentage
31
+ };
32
+ });
13
33
  let discountAmt = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.discountAmount)
14
34
  ? parseFloat(releaseGood.discountAmount.toString().replace('-', ''))
15
35
  : 0;
16
36
  let promotionAmt = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.promotionAmount) || 0;
17
37
  let taxAmt = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.taxAmount) || 0;
18
38
  let shippingFee = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.shippingFee) || 0;
19
- let paidAmt = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.paidAmount) || 0;
20
39
  let totalAmount = paidAmt + shippingFee + taxAmt + promotionAmt + discountAmt;
21
40
  let discountPercentage = (discountAmt / totalAmount) * 100;
22
41
  let taxPercentage = (taxAmt / totalAmount) * 100;
23
42
  taxPercentage = Math.round(taxPercentage * 100) / 100;
24
43
  let salesOrder = {
25
44
  dateTime: new Date(),
26
- clientId: ((_a = matchedClient[0]) === null || _a === void 0 ? void 0 : _a.clientId) || '',
45
+ clientId: clientId,
27
46
  billingAddress: {
28
47
  street: releaseGood.billingAddress,
29
48
  city: null,
@@ -41,32 +60,24 @@ function createSalesOrder() {
41
60
  customField1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.refNo) || '-',
42
61
  integrationCustomField1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.refNo) || '-',
43
62
  status: 'CONFIRMED',
44
- outlet: (accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.outlet) || 'MAIN BRANCH',
45
- confirmOutlet: (accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.outlet) || 'MAIN BRANCH',
63
+ outlet: outletName,
64
+ confirmOutlet: outletName,
46
65
  remark: releaseGood.remark,
47
- type: 'InvoiceSales',
66
+ type: salesOrderType,
48
67
  taxPercentage,
49
68
  collections: [
50
69
  {
51
- amount: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.paidAmount) || 0,
52
- cardType: matchedClient[0].clientPayment,
53
- reference: matchedClient[0].clientPayment,
54
- remark: matchedClient[0].clientPayment,
70
+ amount: Math.round((paidAmt || 0) * 100) / 100,
71
+ cardType: clientPayment,
72
+ reference: clientPayment,
73
+ remark: clientPayment,
55
74
  method: 'other'
56
75
  }
57
76
  ],
58
- salesOrderItems: orderProducts.map(op => {
59
- var _a;
60
- return {
61
- itemCode: (_a = op === null || op === void 0 ? void 0 : op.product) === null || _a === void 0 ? void 0 : _a.sku,
62
- enterPrice: (op === null || op === void 0 ? void 0 : op.sellingPrice) / (op === null || op === void 0 ? void 0 : op.releaseQty),
63
- quantity: op === null || op === void 0 ? void 0 : op.releaseQty
64
- // discountPercentage
65
- };
66
- })
77
+ salesOrderItems: salesOrderItems
67
78
  };
68
79
  return {
69
- payload: { salesOrder }
80
+ payload: { salesOrder, releaseGoodId: releaseGood.id }
70
81
  };
71
82
  },
72
83
  normalize(res) {
package/dist-server/controllers/xilnex/apis/sales-order/create-sales-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-sales-order.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/sales-order/create-sales-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-sales-order.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/sales-order/create-sales-order.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,kCAAkC;QACxC,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;;YAC7B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC1C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAA;YAErC,IAAI,aAAa,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAC7F,MAAM,aAAa,GAAQ,OAAO,CAAC,MAAM,CACvC,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,cAAc,IAAI,WAAW,CAAC,YAAY,IAAI,MAAM,CAAC,aAAa,IAAI,WAAW,CAAC,eAAe,CAC3G,CAAA;YAED,IAAI,cAAc,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,MAAI,MAAA,aAAa,CAAC,CAAC,CAAC,0CAAE,SAAS,CAAA,IAAI,cAAc,CAAA;YAC9F,IAAI,UAAU,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,KAAI,MAAM,IAAI,aAAa,CAAA;YACrE,IAAI,QAAQ,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,KAAI,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAA;YACzE,IAAI,aAAa,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,aAAa,KAAI,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,EAAE,CAAA;YACxF,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,IAAI,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;;gBAC3C,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,KAAI,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;gBAClE,IAAI,SAAS,GAAG,YAAY,IAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,UAAU,CAAA,CAAA;gBAC7C,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;gBAClD,OAAO,IAAI,UAAU,GAAG,EAAE,CAAC,UAAU,CAAA;gBACrC,OAAO;oBACL,QAAQ,EAAE,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAE,GAAG;oBAC1B,UAAU,EAAE,UAAU;oBACtB,QAAQ,EAAE,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,UAAU;oBACxB,qBAAqB;iBACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,WAAW,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,cAAc;gBAC3C,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACpE,CAAC,CAAC,CAAC,CAAA;YACL,IAAI,YAAY,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,KAAI,CAAC,CAAA;YACpD,IAAI,MAAM,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,KAAI,CAAC,CAAA;YACxC,IAAI,WAAW,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,WAAW,KAAI,CAAC,CAAA;YAC/C,IAAI,WAAW,GAAG,OAAO,GAAG,WAAW,GAAG,MAAM,GAAG,YAAY,GAAG,WAAW,CAAA;YAC7E,IAAI,kBAAkB,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,GAAG,CAAA;YAC1D,IAAI,aAAa,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,GAAG,CAAA;YAChD,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;YAErD,IAAI,UAAU,GAAQ;gBACpB,QAAQ,EAAE,IAAI,IAAI,EAAE;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,cAAc,EAAE;oBACd,MAAM,EAAE,WAAW,CAAC,cAAc;oBAClC,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,IAAI;iBACd;gBACD,cAAc,EAAE;oBACd,MAAM,EAAE,WAAW,CAAC,gBAAgB;oBACpC,IAAI,EAAE,WAAW,CAAC,IAAI;oBACtB,KAAK,EAAE,WAAW,CAAC,KAAK;oBACxB,OAAO,EAAE,WAAW,CAAC,UAAU;oBAC/B,OAAO,EAAE,WAAW,CAAC,OAAO;iBAC7B;gBACD,YAAY,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,KAAI,GAAG;gBACvC,uBAAuB,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,KAAI,GAAG;gBAClD,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,UAAU;gBAClB,aAAa,EAAE,UAAU;gBACzB,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,IAAI,EAAE,cAAc;gBACpB,aAAa;gBACb,WAAW,EAAE;oBACX;wBACE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG;wBAC9C,QAAQ,EAAE,aAAa;wBACvB,SAAS,EAAE,aAAa;wBACxB,MAAM,EAAE,aAAa;wBACrB,MAAM,EAAE,OAAO;qBAChB;iBACF;gBACD,eAAe,EAAE,eAAe;aACjC,CAAA;YAED,OAAO;gBACL,OAAO,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE;aACvD,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAC,IAAI,CAAC,UAAU,CAAA;QAC5B,CAAC;KACF,CAAA;AACH,CAAC;AAzFD,4CAyFC"}
package/dist-server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.js CHANGED
@@ -5,7 +5,7 @@ const accounting_api_1 = require("../../../accounting-api");
5
5
  function postSalesOrderToSalesInvoice() {
6
6
  return {
7
7
  method: 'post',
8
- path: '/salesorder/{orderId}/invoice/{outlet}',
8
+ path: '/salesorder/{orderId}/invoice/{outlet}?disableRounding=true',
9
9
  denormalize(req, { accounting }) {
10
10
  let accountInfo = (accounting === null || accounting === void 0 ? void 0 : accounting.accountInfo) ? JSON.parse(accounting.accountInfo) : {};
11
11
  return {
package/dist-server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"post-sales-order-to-sales-invoice.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.ts"],"names":[],"mappings":";;;AAAA,4DAAuD;AAEvD,SAAgB,4BAA4B;IAC1C,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,wCAAwC;QAC9C,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YAC7B,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,OAAO;gBACL,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa,EAAE;aACjF,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YACjC,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;YAEnB,MAAM,IAAI,GAAG,MAAM,8BAAa,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YAC/E,IAAI,CAAC,IAAI,qBAAQ,IAAI,CAAC,IAAI,CAAE,CAAA;YAE5B,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;AACH,CAAC;AAnBD,oEAmBC"}
1
+ {"version":3,"file":"post-sales-order-to-sales-invoice.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.ts"],"names":[],"mappings":";;;AAAA,4DAAuD;AAEvD,SAAgB,4BAA4B;IAC1C,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,6DAA6D;QACnE,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YAC7B,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,OAAO;gBACL,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa,EAAE;aACjF,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YACjC,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;YAEnB,MAAM,IAAI,GAAG,MAAM,8BAAa,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YAC/E,IAAI,CAAC,IAAI,qBAAQ,IAAI,CAAC,IAAI,CAAE,CAAA;YAE5B,OAAO,IAAI,CAAA;QACb,CAAC;KACF,CAAA;AACH,CAAC;AAnBD,oEAmBC"}
package/dist-server/controllers/xilnex/apis/shipment/create-shipment.js CHANGED
@@ -8,6 +8,9 @@ function createShipment() {
8
8
  denormalize(req, { accounting }) {
9
9
  const { releaseGood, orderProducts } = req;
10
10
  let accountInfo = (accounting === null || accounting === void 0 ? void 0 : accounting.accountInfo) ? JSON.parse(accounting.accountInfo) : {};
11
+ let { outlet } = accountInfo;
12
+ let xilnexSetting = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.xilnexSetting) ? JSON.parse(releaseGood.xilnexSetting) : null;
13
+ let outletName = (xilnexSetting === null || xilnexSetting === void 0 ? void 0 : xilnexSetting.outletName) || outlet || 'MAIN BRANCH';
11
14
  let shipmentItems = orderProducts.map(op => {
12
15
  return {
13
16
  documentItemId: op.refItemId,
@@ -15,8 +18,8 @@ function createShipment() {
15
18
  };
16
19
  });
17
20
  let shipment = {
18
- shippingOutlet: (accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.outlet) || 'MAIN BRANCH',
19
- documentId: Number(releaseGood.collectionOrderNo),
21
+ shippingOutlet: outletName,
22
+ documentId: Number(releaseGood.refNo3),
20
23
  shippingDateTime: new Date().toISOString()
21
24
  };
22
25
  return { payload: { shipment: Object.assign(Object.assign({}, shipment), { shipmentItems }) } };
package/dist-server/controllers/xilnex/apis/shipment/create-shipment.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-shipment.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/shipment/create-shipment.ts"],"names":[],"mappings":";;;AAAA,SAAgB,cAAc;IAC5B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YAC7B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC1C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAExF,IAAI,aAAa,GAAQ,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9C,OAAO;oBACL,cAAc,EAAE,EAAE,CAAC,SAAS;oBAC5B,gBAAgB,EAAE,EAAE,CAAC,UAAU;iBAChC,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,QAAQ,GAAQ;gBAClB,cAAc,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa;gBACpD,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;gBACjD,gBAAgB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aAC3C,CAAA;YAED,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,kCAAO,QAAQ,KAAE,aAAa,GAAE,EAAE,EAAE,CAAA;QAClE,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA3BD,wCA2BC"}
1
+ {"version":3,"file":"create-shipment.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/shipment/create-shipment.ts"],"names":[],"mappings":";;;AAAA,SAAgB,cAAc;IAC5B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YAC7B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC1C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,IAAI,EAAE,MAAM,EAAE,GAAG,WAAW,CAAA;YAC5B,IAAI,aAAa,GAAG,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,aAAa,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAC7F,IAAI,UAAU,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,KAAI,MAAM,IAAI,aAAa,CAAA;YAErE,IAAI,aAAa,GAAQ,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9C,OAAO;oBACL,cAAc,EAAE,EAAE,CAAC,SAAS;oBAC5B,gBAAgB,EAAE,EAAE,CAAC,UAAU;iBAChC,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,QAAQ,GAAQ;gBAClB,cAAc,EAAE,UAAU;gBAC1B,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;gBACtC,gBAAgB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aAC3C,CAAA;YAED,OAAO,EAAE,OAAO,EAAE,EAAE,QAAQ,kCAAO,QAAQ,KAAE,aAAa,GAAE,EAAE,EAAE,CAAA;QAClE,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA9BD,wCA8BC"}
package/dist-server/controllers/xilnex/xilnex.js CHANGED
@@ -43,6 +43,16 @@ class Xilnex {
43
43
  }
44
44
  async post(path, data = {}) {
45
45
  const { accessToken, appId, domain } = this.config;
46
+ let headers = {
47
+ 'Content-Type': 'application/json',
48
+ token: accessToken,
49
+ appid: appId,
50
+ auth: '5'
51
+ };
52
+ if (path == '/salesorder?disableRounding=true') {
53
+ headers = Object.assign(Object.assign({}, headers), { Idempotency_Key: data.releaseGoodId });
54
+ delete data.releaseGoodId;
55
+ }
46
56
  debug('data', data);
47
57
  const jsondata = JSON.stringify(data);
48
58
  const endpoint = `${ENDPOINT}${path}`;
@@ -50,12 +60,7 @@ class Xilnex {
50
60
  let requestInfo = {
51
61
  requestBody: {
52
62
  method: 'post',
53
- headers: {
54
- 'Content-Type': 'application/json',
55
- token: accessToken,
56
- appid: appId,
57
- auth: '5'
58
- },
63
+ headers: headers,
59
64
  body: jsondata
60
65
  },
61
66
  requestEndpoint: endpoint
package/dist-server/controllers/xilnex/xilnex.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"xilnex.js","sourceRoot":"","sources":["../../../server/controllers/xilnex/xilnex.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,4DAA8B;AAI9B,MAAM,QAAQ,GAAG,iCAAiC,CAAA;AAClD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,8CAA8C,CAAC,CAAA;AAS9E,MAAa,MAAM;IAGjB,YAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,qBACN,MAAM,CACV,CAAA;IACH,CAAC;IAED,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS;QACtC,IAAI,IAAI,GAAG,gBAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;QAEvG,OAAO,IAAI,KAAK,SAAS,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,IAAS;QAC/B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAE1C,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,QAAQ,GAAG,GAAG,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;QAC1D,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,KAAK,EAAE,WAAW;gBAClB,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,GAAG;aACV;SACF,CAAC,CAAA;QAEF,IAAI,QAAQ,CAAC,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,MAAM,CAAA;SACd;aAAM;YACL,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpC,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC,CAAA;SAClD;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAAY,EAAE;QACrC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAElD,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAErC,MAAM,QAAQ,GAAG,GAAG,QAAQ,GAAG,IAAI,EAAE,CAAA;QACrC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3B,IAAI,WAAW,GAAQ;YACrB,WAAW,EAAE;gBACX,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,GAAG;iBACV;gBACD,IAAI,EAAE,QAAQ;aACf;YACD,eAAe,EAAE,QAAQ;SAC1B,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE,WAAW,CAAC,WAAW,CAAC,CAAA;QAE/D,IAAI,QAAQ,CAAC,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,MAAM,CAAA;SACd;aAAM;YACL,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpC,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC,CAAA;SAClD;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,OAAY,EAAE;QACpC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAE1C,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAEnB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAErC,MAAM,QAAQ,GAAG,GAAG,QAAQ,GAAG,IAAI,EAAE,CAAA;QACrC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,KAAK,EAAE,WAAW;gBAClB,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,GAAG;aACV;YACD,IAAI,EAAE,QAAQ;SACf,CAAC,CAAA;QAEF,IAAI,QAAQ,CAAC,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,MAAM,CAAA;SACd;aAAM;YACL,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACpC,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC,CAAA;SAClD;IACH,CAAC;CACF;AA3GD,wBA2GC"}
1
+ {"version":3,"file":"xilnex.js","sourceRoot":"","sources":["../../../server/controllers/xilnex/xilnex.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-accounting",
3
- "version": "4.3.544",
3
+ "version": "4.3.562",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -31,7 +31,7 @@
31
31
  "@things-factory/context-ui": "^4.3.535",
32
32
  "@things-factory/grist-ui": "^4.3.535",
33
33
  "@things-factory/i18n-base": "^4.3.535",
34
- "@things-factory/integration-ui": "^4.3.544",
34
+ "@things-factory/integration-ui": "^4.3.562",
35
35
  "@things-factory/more-ui": "^4.3.535",
36
36
  "@things-factory/product-base": "^4.3.535",
37
37
  "@things-factory/resource-ui": "^4.3.535",
@@ -50,5 +50,5 @@
50
50
  "nock": "^13.0.2",
51
51
  "should": "^13.2.3"
52
52
  },
53
- "gitHead": "d9ba6fd47325e8b698b33e2ea133f8596ba55719"
53
+ "gitHead": "23e29a852185cced85f48b9bfff6cdabe479199d"
54
54
  }
package/server/controllers/xilnex/apis/sales-order/create-sales-order.ts CHANGED
@@ -1,22 +1,42 @@
1
1
  export function createSalesOrder() {
2
2
  return {
3
3
  method: 'post',
4
- path: '/salesorder',
4
+ path: '/salesorder?disableRounding=true',
5
5
  denormalize(req, { accounting }) {
6
6
  const { releaseGood, orderProducts } = req
7
7
  let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
8
- const matchedClient: any = accountInfo.clients.filter(
8
+ let { outlet, clients } = accountInfo
9
+
10
+ let xilnexSetting = releaseGood?.xilnexSetting ? JSON.parse(releaseGood.xilnexSetting) : null
11
+ const matchedClient: any = clients.filter(
9
12
  client =>
10
13
  client.clientPlatform == releaseGood.platformCode && client.clientCountry == releaseGood.platformCountry
11
14
  )
12
15
 
16
+ let salesOrderType = xilnexSetting?.salesType || matchedClient[0]?.salesType || 'InvoiceSales'
17
+ let outletName = xilnexSetting?.outletName || outlet || 'MAIN BRANCH'
18
+ let clientId = xilnexSetting?.clientId || matchedClient[0].clientId || ''
19
+ let clientPayment = xilnexSetting?.clientPayment || matchedClient[0].clientPayment || ''
20
+ let paidAmt = 0
21
+ let salesOrderItems = orderProducts.map(op => {
22
+ let sellingPrice = Math.round((op?.sellingPrice || 0) * 100) / 100
23
+ let unitPrice = sellingPrice / op?.releaseQty
24
+ let enterPrice = Math.round(unitPrice * 100) / 100
25
+ paidAmt += enterPrice * op.releaseQty
26
+ return {
27
+ itemCode: op?.product?.sku,
28
+ enterPrice: enterPrice,
29
+ quantity: op?.releaseQty
30
+ // discountPercentage
31
+ }
32
+ })
33
+
13
34
  let discountAmt = releaseGood?.discountAmount
14
35
  ? parseFloat(releaseGood.discountAmount.toString().replace('-', ''))
15
36
  : 0
16
37
  let promotionAmt = releaseGood?.promotionAmount || 0
17
38
  let taxAmt = releaseGood?.taxAmount || 0
18
39
  let shippingFee = releaseGood?.shippingFee || 0
19
- let paidAmt = releaseGood?.paidAmount || 0
20
40
  let totalAmount = paidAmt + shippingFee + taxAmt + promotionAmt + discountAmt
21
41
  let discountPercentage = (discountAmt / totalAmount) * 100
22
42
  let taxPercentage = (taxAmt / totalAmount) * 100
@@ -24,7 +44,7 @@ export function createSalesOrder() {
24
44
 
25
45
  let salesOrder: any = {
26
46
  dateTime: new Date(),
27
- clientId: matchedClient[0]?.clientId || '',
47
+ clientId: clientId,
28
48
  billingAddress: {
29
49
  street: releaseGood.billingAddress,
30
50
  city: null,
@@ -42,32 +62,25 @@ export function createSalesOrder() {
42
62
  customField1: releaseGood?.refNo || '-',
43
63
  integrationCustomField1: releaseGood?.refNo || '-',
44
64
  status: 'CONFIRMED',
45
- outlet: accountInfo?.outlet || 'MAIN BRANCH',
46
- confirmOutlet: accountInfo?.outlet || 'MAIN BRANCH',
65
+ outlet: outletName,
66
+ confirmOutlet: outletName,
47
67
  remark: releaseGood.remark,
48
- type: 'InvoiceSales',
68
+ type: salesOrderType,
49
69
  taxPercentage,
50
70
  collections: [
51
71
  {
52
- amount: releaseGood?.paidAmount || 0,
53
- cardType: matchedClient[0].clientPayment,
54
- reference: matchedClient[0].clientPayment,
55
- remark: matchedClient[0].clientPayment,
72
+ amount: Math.round((paidAmt || 0) * 100) / 100,
73
+ cardType: clientPayment,
74
+ reference: clientPayment,
75
+ remark: clientPayment,
56
76
  method: 'other'
57
77
  }
58
78
  ],
59
- salesOrderItems: orderProducts.map(op => {
60
- return {
61
- itemCode: op?.product?.sku,
62
- enterPrice: op?.sellingPrice / op?.releaseQty,
63
- quantity: op?.releaseQty
64
- // discountPercentage
65
- }
66
- })
79
+ salesOrderItems: salesOrderItems
67
80
  }
68
81
 
69
82
  return {
70
- payload: { salesOrder }
83
+ payload: { salesOrder, releaseGoodId: releaseGood.id }
71
84
  }
72
85
  },
73
86
  normalize(res) {
package/server/controllers/xilnex/apis/sales-order/post-sales-order-to-sales-invoice.ts CHANGED
@@ -3,7 +3,7 @@ import { AccountingAPI } from '../../../accounting-api'
3
3
  export function postSalesOrderToSalesInvoice() {
4
4
  return {
5
5
  method: 'post',
6
- path: '/salesorder/{orderId}/invoice/{outlet}',
6
+ path: '/salesorder/{orderId}/invoice/{outlet}?disableRounding=true',
7
7
  denormalize(req, { accounting }) {
8
8
  let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
9
9
  return {
package/server/controllers/xilnex/apis/shipment/create-shipment.ts CHANGED
@@ -5,6 +5,9 @@ export function createShipment() {
5
5
  denormalize(req, { accounting }) {
6
6
  const { releaseGood, orderProducts } = req
7
7
  let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
8
+ let { outlet } = accountInfo
9
+ let xilnexSetting = releaseGood?.xilnexSetting ? JSON.parse(releaseGood.xilnexSetting) : null
10
+ let outletName = xilnexSetting?.outletName || outlet || 'MAIN BRANCH'
8
11
 
9
12
  let shipmentItems: any = orderProducts.map(op => {
10
13
  return {
@@ -14,8 +17,8 @@ export function createShipment() {
14
17
  })
15
18
 
16
19
  let shipment: any = {
17
- shippingOutlet: accountInfo?.outlet || 'MAIN BRANCH',
18
- documentId: Number(releaseGood.collectionOrderNo),
20
+ shippingOutlet: outletName,
21
+ documentId: Number(releaseGood.refNo3),
19
22
  shippingDateTime: new Date().toISOString()
20
23
  }
21
24
 
package/server/controllers/xilnex/xilnex.ts CHANGED
@@ -60,6 +60,22 @@ export class Xilnex {
60
60
  async post(path: string, data: any = {}) {
61
61
  const { accessToken, appId, domain } = this.config
62
62
 
63
+ let headers: any = {
64
+ 'Content-Type': 'application/json',
65
+ token: accessToken,
66
+ appid: appId,
67
+ auth: '5'
68
+ }
69
+
70
+ if (path == '/salesorder?disableRounding=true') {
71
+ headers = {
72
+ ...headers,
73
+ Idempotency_Key: data.releaseGoodId
74
+ }
75
+
76
+ delete data.releaseGoodId
77
+ }
78
+
63
79
  debug('data', data)
64
80
  const jsondata = JSON.stringify(data)
65
81
 
@@ -69,12 +85,7 @@ export class Xilnex {
69
85
  let requestInfo: any = {
70
86
  requestBody: {
71
87
  method: 'post',
72
- headers: {
73
- 'Content-Type': 'application/json',
74
- token: accessToken,
75
- appid: appId,
76
- auth: '5'
77
- },
88
+ headers: headers,
78
89
  body: jsondata
79
90
  },
80
91
  requestEndpoint: endpoint