@things-factory/integration-accounting 4.3.123 → 4.3.135

package/dist-server/controllers/xilnex/xilnex.js

@@ -13,7 +13,7 @@ class Xilnex {
         this.config = Object.assign({}, config);
     }
     isValidSignature(data, secret, signature) {
-        let hmac = crypto_1.default.createHmac('sha256', secret).update(JSON.stringify(data)).digest('hex');
+        let hmac = crypto_1.default.createHmac('sha256', secret).update(JSON.stringify(data)).digest('hex').toUpperCase();
         return hmac === signature;
     }
     async get(path, data) {
@@ -66,6 +66,31 @@ class Xilnex {
             throw new Error(`(${response.status}) ${result}`);
         }
     }
+    async put(path, data = {}) {
+        const { accessToken, appId } = this.config;
+        debug('data', data);
+        const jsondata = JSON.stringify(data);
+        const endpoint = `${ENDPOINT}${path}`;
+        debug('endpoint', endpoint);
+        const response = await (0, node_fetch_1.default)(endpoint, {
+            method: 'put',
+            headers: {
+                'Content-Type': 'application/json',
+                token: accessToken,
+                appid: appId,
+                auth: '5'
+            },
+            body: jsondata
+        });
+        if (response.ok) {
+            const result = await response.json();
+            return result;
+        }
+        else {
+            const result = await response.text();
+            throw new Error(`(${response.status}) ${result}`);
+        }
+    }
 }
 exports.Xilnex = Xilnex;
 //# sourceMappingURL=xilnex.js.map

package/dist-server/controllers/xilnex/xilnex.js.map

@@ -1 +1 @@
-{"version":3,"file":"xilnex.js","sourceRoot":"","sources":["../../../server/controllers/xilnex/xilnex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xilnex.js","sourceRoot":"","sources":["../../../server/controllers/xilnex/xilnex.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@things-factory/integration-accounting",
-  "version": "4.3.123",
+  "version": "4.3.135",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
-  "license": "MIT",
   "author": "heartyoh",
   "description": "Module to manage integration with accounting service.",
   "publishConfig": {
@@ -25,19 +24,19 @@
     "test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^4.3.122",
-    "@things-factory/auth-ui": "^4.3.122",
-    "@things-factory/biz-base": "^4.3.122",
-    "@things-factory/code-ui": "^4.3.123",
-    "@things-factory/context-ui": "^4.3.122",
-    "@things-factory/grist-ui": "^4.3.123",
-    "@things-factory/i18n-base": "^4.3.122",
-    "@things-factory/integration-ui": "^4.3.122",
-    "@things-factory/more-ui": "^4.3.122",
-    "@things-factory/product-base": "^4.3.122",
-    "@things-factory/resource-ui": "^4.3.123",
-    "@things-factory/setting-ui": "^4.3.123",
-    "@things-factory/system-ui": "^4.3.122",
+    "@things-factory/apptool-ui": "^4.3.131",
+    "@things-factory/auth-ui": "^4.3.131",
+    "@things-factory/biz-base": "^4.3.131",
+    "@things-factory/code-ui": "^4.3.131",
+    "@things-factory/context-ui": "^4.3.131",
+    "@things-factory/grist-ui": "^4.3.131",
+    "@things-factory/i18n-base": "^4.3.131",
+    "@things-factory/integration-ui": "^4.3.131",
+    "@things-factory/more-ui": "^4.3.131",
+    "@things-factory/product-base": "^4.3.131",
+    "@things-factory/resource-ui": "^4.3.131",
+    "@things-factory/setting-ui": "^4.3.131",
+    "@things-factory/system-ui": "^4.3.131",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0"
   },
@@ -51,5 +50,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "4b257504bfc8c0a626dd90dc0216abb7ca30d8d3"
+  "gitHead": "55b877e97abb4350a0fa9dceb051c54fd496dcf0"
 }

package/server/controllers/accounting-api/index.ts

@@ -73,6 +73,12 @@ export class AccountingAPI {
   @api
   static createGoodsReceivedNote(accounting, req): any {}
 
+  @api
+  static createPurchaseReceive(accounting, req): any {}
+
+  @api
+  static cancelPurchaseOrder(accounting, req): any {}
+
   @api
   static createTransferNote(accounting, req): any {}
 
@@ -88,12 +94,21 @@ export class AccountingAPI {
   @api
   static createShipment(accounting, req): any {}
 
+  @api
+  static createStockAdjustRecord(accounting, req): any {}
+
+  @api
+  static deliveryTransferNote(accounting, req): any {}
+
   @api
   static getPurchaseOrder(accounting, req): any {}
 
   @api
   static getStockRequest(accounting, req): any {}
 
+  @api
+  static getTransferNote(accounting, req): any {}
+
   @api
   static getSale(accounting, req): any {}
 }

package/server/controllers/xilnex/apis/goods-received/create-goods-received-note.ts

@@ -6,11 +6,12 @@ export function createGoodsReceivedNote() {
       const { arrivalNotice, orderProducts } = req
       let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
       let totalReceivedQuantity = 0
+      const curDate: string = new Date().toISOString()
 
       let receivedItems: any = orderProducts.map(op => {
         totalReceivedQuantity += op.actualPackQty
         return {
-          itemId: op.productDetail.refCode,
+          itemCode: op.product.sku,
           quantityReceived: op.actualPackQty,
           discountPercentage: 0,
           uniqueId: '',
@@ -22,7 +23,7 @@ export function createGoodsReceivedNote() {
       })
 
       let grn: any = {
-        receivingDate: new Date(),
+        receivingDate: curDate,
         receiveType: 'Receive',
         receivedStatus: 'Completed',
         remark: arrivalNotice.remark || 'NA',
@@ -30,7 +31,7 @@ export function createGoodsReceivedNote() {
         totalReceivedQuantity: totalReceivedQuantity,
         poNumber: arrivalNotice.refNo,
         invoiceNo: '-',
-        invoiceDate: ''
+        invoiceDate: curDate
       }
 
       return { payload: { goodsReceive: { ...grn, receivedItems } } }

package/server/controllers/xilnex/apis/index.ts

@@ -6,3 +6,4 @@ export * from './sales-return'
 export * from './stocks'
 export * from './purchase-order'
 export * from './stock-request'
+export * from './shipment'

package/server/controllers/xilnex/apis/purchase-order/cancel-purchase-order.ts

@@ -0,0 +1,18 @@
+export function cancelPurchaseOrder() {
+  return {
+    method: 'put',
+    path: '/PurchaseOrder/{orderId}/Cancel',
+    denormalize(req, { accounting }) {
+      const { purchaseOrder } = req
+      let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
+
+      return {
+        resource: { orderId: parseInt(purchaseOrder.refNo) },
+        payload: { purchaseOrder: { cancelOutlet: accountInfo?.outlet || 'MAIN BRANCH', cancelRemark: '-' } }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

package/server/controllers/xilnex/apis/purchase-order/create-purchase-receive.ts

@@ -0,0 +1,43 @@
+export function createPurchaseReceive() {
+  return {
+    method: 'post',
+    path: '/PurchaseOrder/{orderId}/GRNs',
+    denormalize(req, { accounting }) {
+      const { arrivalNotice, orderProducts } = req
+      const curDate = new Date().toISOString()
+      let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
+      let totalReceivedQuantity = 0
+
+      let receivedItems: any = orderProducts.map(op => {
+        totalReceivedQuantity += op.actualPackQty
+        return {
+          itemCode: op.product.sku,
+          enterQuantity: op.actualPackQty,
+          enterCost: op.unitPrice
+        }
+      })
+
+      let purchaseReceive: any = {
+        terms: 0,
+        postingDate: curDate,
+        receiveDate: curDate,
+        receivingDate: curDate,
+        receivedStatus: 'Completed',
+        isUpdateItemCost: false,
+        remark: arrivalNotice.remark || 'NA',
+        outlet: accountInfo?.outlet || 'MAIN BRANCH',
+        poNumber: arrivalNotice.refNo,
+        invoiceNo: arrivalNotice.refNo2 || '-',
+        invoiceDate: curDate
+      }
+
+      return {
+        resource: { orderId: parseInt(arrivalNotice.refNo) },
+        payload: { purchaseReceive: { ...purchaseReceive, receivedItems } }
+      }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

package/server/controllers/xilnex/apis/purchase-order/get-purchase-order.ts

@@ -12,24 +12,30 @@ export function getPurchaseOrder() {
       let poItems: any = purchaseOrder.poItems
 
       let orderInfo: any = {
-        refNo: purchaseOrder.id,
-        refNo2: purchaseOrder.submitterOutlet,
+        orderId: purchaseOrder.id,
+        fromOutlet: purchaseOrder.submitterOutlet,
+        toOutlet: purchaseOrder.producerOutlet,
         etaDate: new Date().toISOString().slice(0, 10),
         ownTransport: true,
         importCargo: false,
         container: false,
-        remark: purchaseOrder.remarks
+        remark: purchaseOrder.remarks,
+        currency: purchaseOrder.currencyCode
       }
 
       let orderItems: any = poItems.map(poItem => {
         return {
+          refItemId: poItem.id,
           product: {
-            sku: poItem.itemId
+            refCode: poItem.itemId,
+            sku: poItem.itemCode
           },
           batchId: poItem?.batchNo ? poItem.batchNo : '-',
-          packQty: poItem.enterQuantity,
+          confirmedQty: poItem.enterQuantity,
+          unitCost: poItem.enterCost,
           palletQty: null,
-          manufactureDate: ''
+          manufactureDate: '',
+          taxAmount: poItem.taxAmount
         }
       })
 

package/server/controllers/xilnex/apis/purchase-order/index.ts

@@ -1 +1,3 @@
 export * from './get-purchase-order'
+export * from './create-purchase-receive'
+export * from './cancel-purchase-order'

package/server/controllers/xilnex/apis/sales-order/create-sales-order.ts

@@ -10,6 +10,18 @@ export function createSalesOrder() {
           client.clientPlatform == releaseGood.platformCode && client.clientCountry == releaseGood.platformCountry
       )
 
+      let discountAmt = releaseGood?.discountAmount
+        ? parseFloat(releaseGood.discountAmount.toString().replace('-', ''))
+        : 0
+      let promotionAmt = releaseGood?.promotionAmount || 0
+      let taxAmt = releaseGood?.taxAmount || 0
+      let shippingFee = releaseGood?.shippingFee || 0
+      let paidAmt = releaseGood?.paidAmount || 0
+      let totalAmount = paidAmt + shippingFee + taxAmt + promotionAmt + discountAmt
+      let discountPercentage = (discountAmt / totalAmount) * 100
+      let taxPercentage = (taxAmt / totalAmount) * 100
+      taxPercentage = Math.round(taxPercentage * 100) / 100
+
       let salesOrder: any = {
         dateTime: new Date(),
         clientId: matchedClient[0]?.clientId || '',
@@ -32,6 +44,7 @@ export function createSalesOrder() {
         confirmOutlet: accountInfo?.outlet || 'MAIN BRANCH',
         remark: releaseGood.remark,
         type: 'InvoiceSales',
+        taxPercentage,
         collections: [
           {
             amount: releaseGood?.paidAmount || 0,
@@ -46,6 +59,7 @@ export function createSalesOrder() {
             itemCode: op?.product?.sku,
             enterPrice: op?.sellingPrice / op?.releaseQty,
             quantity: op?.releaseQty
+            // discountPercentage
           }
         })
       }

package/server/controllers/xilnex/apis/sales-return/create-sales-return.ts

@@ -5,20 +5,27 @@ export function createSalesReturn() {
     denormalize(req, { accounting }) {
       const { releaseGood, orderProducts } = req
       let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
+      const matchedClient: any = accountInfo.clients.filter(
+        client =>
+          client.clientPlatform == releaseGood.platformCode && client.clientCountry == releaseGood.platformCountry
+      )
       let sale: any = {
         id: releaseGood?.refNo3,
         dateTime: releaseGood.updatedAt,
         term: 0,
         status: 'CONFIRMED',
         outlet: accountInfo?.outlet || 'MAIN BRANCH',
-        salesPerson: accountInfo?.clientName,
+        client: {
+          id: matchedClient[0]?.clientId
+        },
+        salesPerson: matchedClient[0]?.clientName,
         recipientContact: releaseGood?.phone1,
         recipientName: releaseGood?.attentionTo,
         items: orderProducts.map(op => {
           return {
             id: op?.refItemId,
             unitPrice: op?.sellingPrice,
-            quantity: -op?.pickedQty,
+            quantity: -op?.releaseQty,
             deliveryQuantity: 0,
             discountAmount: 0,
             remark: op?.remark,

package/server/controllers/xilnex/apis/shipment/create-shipment.ts

@@ -8,15 +8,15 @@ export function createShipment() {
 
       let shipmentItems: any = orderProducts.map(op => {
         return {
-          documentId: op.refItemId,
+          documentItemId: op.refItemId,
           shippingQuantity: op.releaseQty
         }
       })
 
       let shipment: any = {
         shippingOutlet: accountInfo?.outlet || 'MAIN BRANCH',
-        documentId: releaseGood.refNo3,
-        shippingDateTime: new Date()
+        documentId: Number(releaseGood.collectionOrderNo),
+        shippingDateTime: new Date().toISOString()
       }
 
       return { payload: { shipment: { ...shipment, shipmentItems } } }

package/server/controllers/xilnex/apis/stock-request/get-stock-request.ts

@@ -9,7 +9,41 @@ export function getStockRequest() {
     normalize(res) {
       const { data } = res
       let stockRequest: any = data.stockRequest
-      return stockRequest
+
+      let orderInfo: any = {
+        orderId: stockRequest.id,
+        issueDate: stockRequest.issueDate,
+        etaDate: stockRequest.ETADate,
+        fromLocation: stockRequest.fromLocation,
+        toLocation: stockRequest.toLocation,
+        issueBy: stockRequest.issueBy,
+        status: stockRequest.status,
+        cancelledBy: stockRequest.cancelledBy,
+        cancelledRemark: stockRequest.cancelledRemark,
+        cancelledDate: stockRequest.cancelledDate,
+        ownTransport: true,
+        importCargo: false,
+        container: false,
+        remark: stockRequest.remark
+      }
+
+      let orderItems: any = stockRequest.requestItems.map(ri => {
+        return {
+          orderItemId: ri.id,
+          product: {
+            refCode: ri.itemId,
+            sku: ri.itemCode
+          },
+          fromLocation: ri.fromLocation,
+          toLocation: ri.toLocation,
+          requestQty: ri.requestQuantity,
+          confirmedQty: ri.confirmedQuantity,
+          unitCost: ri.enterCost,
+          sellingPrice: ri.totalCost
+        }
+      })
+
+      return { orderInfo, orderItems }
     }
   }
 }

package/server/controllers/xilnex/apis/stocks/create-stock-adjust-record.ts

@@ -2,33 +2,29 @@ export function createStockAdjustRecord() {
   return {
     method: 'post',
     path: '/stocks/stockadjustment',
-    denormalize(req) {
+    denormalize(req, { accounting }) {
       const { xilnexInv } = req
+      let accountInfo: any = accounting?.accountInfo ? JSON.parse(accounting.accountInfo) : {}
 
-      let adjustQuantity: number = xilnexInv.changedQty - xilnexInv.originalQty
       let stocksTakeTitle: any = {
         recordItems: [],
         adjustItems: [
           {
             adjustQuantity: xilnexInv.adjustQuantity,
-            adjustType: adjustQuantity >= 0 ? 'AdjustUp' : 'AdjustDown',
+            adjustAvailable: xilnexInv.adjustQuantity,
+            adjustType: xilnexInv.adjustQuantity >= 0 ? 'AdjustUp' : 'AdjustDown',
             remark: '',
-            itemId: xilnexInv.productDetail.refCode,
-            itemCode: xilnexInv.product.sku,
-            name: xilnexInv.product.name,
-            stockAdjustType: 'Normal',
-            uom: xilnexInv?.uom ? xilnexInv.uom : xilnexInv.productDetail.uom,
-            uomQuantity: xilnexInv?.packingSize ? xilnexInv.packingSize : xilnexInv.productDetail.packingSize,
-            batchNo: xilnexInv?.batchId ? xilnexInv.batchId : null,
-            batchExpiryDate: xilnexInv?.expirationDate ? xilnexInv.expirationDate : null,
-            dateTime: xilnexInv.createdAt
+            itemCode: xilnexInv.sku,
+            stockAdjustType: xilnexInv.stockTakeType,
+            dateTime: xilnexInv.dateTime
           }
         ],
+        outlet: accountInfo.outlet,
         description: 'Stock Adjustment',
-        dateTime: xilnexInv.createdAt,
+        dateTime: xilnexInv.dateTime,
         remarks: '',
-        stockTakeType: 'StockAdjustment',
-        status: 'COMPLETED'
+        stockTakeType: xilnexInv.stockTakeType,
+        status: 'SAVED'
       }
 
       return {
@@ -36,7 +32,7 @@ export function createStockAdjustRecord() {
       }
     },
     normalize(res) {
-      return res
+      return res.data.stocksTakeTitle
     }
   }
 }

package/server/controllers/xilnex/apis/transfer-note/delivery-transfer-note.ts

@@ -0,0 +1,21 @@
+export function deliveryTransferNote() {
+  return {
+    method: 'post',
+    path: '/TransferNote/{orderId}/shipments',
+    denormalize(req) {
+      const { arrivalNotice, orderProducts } = req
+
+      let transferItems: any = orderProducts.map(op => {
+        return {
+          id: op.refItemId,
+          shippingQuantity: op.releaseQty
+        }
+      })
+
+      return { resource: { orderId: parseInt(arrivalNotice.refNo) }, payload: { transferNote: { transferItems } } }
+    },
+    normalize(res) {
+      return res
+    }
+  }
+}

package/server/controllers/xilnex/apis/transfer-note/get-transfer-note.ts

@@ -0,0 +1,47 @@
+export function getTransferNote() {
+  return {
+    method: 'get',
+    path: '/TransferNote/{orderId}',
+    denormalize(req) {
+      const { orderId } = req
+      return { resource: { orderId: parseInt(orderId) } }
+    },
+    normalize(res) {
+      const { data } = res
+      let transferNote: any = data.transferNote
+      let transferItems: any = transferNote.transferItems
+
+      let orderInfo: any = {
+        orderId: transferNote.id,
+        transferDate: transferNote.transferDate,
+        etaDate: transferNote.etaDate,
+        fromLocation: transferNote.transferFrom,
+        toLocation: transferNote.transferTo,
+        issueBy: transferNote.transferBy,
+        status: transferNote.status,
+        cancelledDate: transferNote.cancelDate,
+        ownTransport: true,
+        importCargo: false,
+        container: false,
+        remark: transferNote.remarks
+      }
+
+      let orderItems: any = transferItems.map(ri => {
+        return {
+          orderItemId: ri.id,
+          product: {
+            sku: ri.itemCode
+          },
+          fromLocation: ri.fromOutlet,
+          toLocation: ri.toOutlet,
+          requestQty: ri.transferQty,
+          confirmedQty: ri.transferQty,
+          unitCost: ri.unitPrice,
+          sellingPrice: ri.enterCost
+        }
+      })
+
+      return { orderInfo, orderItems }
+    }
+  }
+}

package/server/controllers/xilnex/apis/transfer-note/index.ts

@@ -1 +1,3 @@
 export * from './create-transfer-note'
+export * from './get-transfer-note'
+export * from './delivery-transfer-note'

package/server/controllers/xilnex/xilnex.ts

@@ -20,7 +20,7 @@ export class Xilnex {
   }
 
   isValidSignature(data, secret, signature) {
-    let hmac = crypto.createHmac('sha256', secret).update(JSON.stringify(data)).digest('hex')
+    let hmac = crypto.createHmac('sha256', secret).update(JSON.stringify(data)).digest('hex').toUpperCase()
 
     return hmac === signature
   }
@@ -83,4 +83,34 @@ export class Xilnex {
       throw new Error(`(${response.status}) ${result}`)
     }
   }
+
+  async put(path: string, data: any = {}) {
+    const { accessToken, appId } = this.config
+
+    debug('data', data)
+
+    const jsondata = JSON.stringify(data)
+
+    const endpoint = `${ENDPOINT}${path}`
+    debug('endpoint', endpoint)
+
+    const response = await fetch(endpoint, {
+      method: 'put',
+      headers: {
+        'Content-Type': 'application/json',
+        token: accessToken,
+        appid: appId,
+        auth: '5'
+      },
+      body: jsondata
+    })
+
+    if (response.ok) {
+      const result = await response.json()
+      return result
+    } else {
+      const result = await response.text()
+      throw new Error(`(${response.status}) ${result}`)
+    }
+  }
 }

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.