@things-factory/operato-hub 4.3.231 → 4.3.232

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.231",
+  "version": "4.3.232",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -91,7 +91,7 @@
     "@things-factory/pdf": "^4.3.227",
     "@things-factory/product-ui": "^4.3.227",
     "@things-factory/resource-ui": "^4.3.227",
-    "@things-factory/sales-base": "^4.3.229",
+    "@things-factory/sales-base": "^4.3.232",
     "@things-factory/scene-data-transform": "^4.3.227",
     "@things-factory/scene-excel": "^4.3.227",
     "@things-factory/scene-firebase": "^4.3.227",
@@ -107,7 +107,7 @@
     "@things-factory/shell": "^4.3.227",
     "@things-factory/system-ui": "^4.3.227",
     "@things-factory/warehouse-base": "^4.3.229",
-    "@things-factory/worksheet-base": "^4.3.231",
+    "@things-factory/worksheet-base": "^4.3.232",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -119,5 +119,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "5fee013f37dee7e021e0c88e1078a51d7375e3ad"
+  "gitHead": "14c591b96b1519e7a118103205053185cf7a1305"
 }

package/server/routers/api/restful-apis/v1/utils/params.ts

@@ -268,6 +268,7 @@ export const params = {
     'refNo',
     'refNo2',
     'refNo3',
+    'refOrderId',
     'type',
     'transporter',
     'trackingNo',
@@ -339,6 +340,7 @@ export const params = {
     'releaseGood.refNo',
     'releaseGood.refNo2',
     'releaseGood.refNo3',
+    'releaseGood.refOrderId',
     'releaseGood.marketplaceOrderStatus',
     'releaseGood.billingAddress',
     'releaseGood.deliveryAddress1',

package/server/routers/api/restful-apis/v1/warehouse/add-release-order.ts

@@ -1,13 +1,13 @@
 import {
+  Brackets,
   EntityManager,
   getConnection,
   getRepository,
+  ILike,
   In,
   Not,
   Repository,
-  SelectQueryBuilder,
-  ILike,
-  Brackets
+  SelectQueryBuilder
 } from 'typeorm'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -16,6 +16,7 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 import { GeoCountry } from '@things-factory/geography'
 import { generateId } from '@things-factory/id-rule-base'
+import { LastMileDelivery } from '@things-factory/integration-lmd'
 import { Sellercraft } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ProductBundle, ProductDetail } from '@things-factory/product-base'
@@ -39,7 +40,6 @@ import {
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
-import { LastMileDelivery } from '@things-factory/integration-lmd'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -96,6 +96,7 @@ router.post(
           refNo: bodyReq.refNo,
           refNo2: bodyReq?.refNo2,
           refNo3: bodyReq?.refNo3,
+          refOrderId: bodyReq?.refOrderId,
           releaseDate: bodyReq.releaseDate,
           type: bodyReq.type,
           marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
@@ -207,6 +208,7 @@ router.post(
           refNo: result.refNo,
           refNo2: result.refNo2,
           refNo3: result.refNo3,
+          refOrderId: result.refOrderId,
           status: result.status,
           truckNo: result.truckNo,
           ownTransport: result.ownTransport,
@@ -262,6 +264,7 @@ router.post(
               refNo: result.refNo,
               refNo2: result.refNo2,
               refNo3: result.refNo3,
+              refOrderId: result.refOrderId,
               status: result.status,
               truckNo: result.truckNo,
               ownTransport: result.ownTransport,
@@ -474,6 +477,7 @@ async function createReleaseGood(
     refNo: releaseGood.refNo,
     refNo2: releaseGood.refNo2 || null,
     refNo3: releaseGood.refNo3 || null,
+    refOrderId: releaseGood?.refOrderId || null,
     remark: releaseGood?.remark || null,
     releaseDate: releaseGood.releaseDate,
     truckNo: releaseGood.truckNo,

package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts

@@ -52,6 +52,7 @@ router.get(
         refNo: releaseGood.refNo,
         refNo2: releaseGood.refNo2,
         refNo3: releaseGood.refNo3,
+        refOrderId: releaseGood.refOrderId,
         type: releaseGood.type,
         releaseDate: releaseGood.releaseDate,
         collectionOrderNo: releaseGood.collectionOrderNo,

package/server/routers/api/restful-apis/v1/warehouse/get-release-order-list.ts

@@ -62,6 +62,7 @@ router.get(
           refNo: releaseGood.refNo,
           refNo2: releaseGood.refNo2,
           refNo3: releaseGood.refNo3,
+          refOrderId: releaseGood.refOrderId,
           type: releaseGood.type,
           releaseDate: releaseGood.releaseDate,
           collectionOrderNo: releaseGood.collectionOrderNo,

package/server/routers/internal/powrup-router.ts

@@ -1,6 +1,7 @@
 import Router from 'koa-router'
 import { EntityManager, getConnection } from 'typeorm'
 
+import { Bizplace } from '@things-factory/biz-base'
 import { Integration } from '@things-factory/integration-base'
 
 import * as API from './apis'
@@ -195,6 +196,93 @@ powrupRouter.post('/internal/account/terminate-user', validationMiddleware, asyn
   }
 })
 
+powrupRouter.post('/integration/create', validationMiddleware, async (context, next) => {
+  try {
+    await getConnection().transaction(async (tx: EntityManager) => {
+      const { body } = context.request
+
+      const { bizplaceId, name, description } = body
+
+      const bizplace: Bizplace = await tx
+        .getRepository(Bizplace)
+        .findOne({ where: { id: bizplaceId }, relations: ['domain'] })
+
+      if (!bizplace) {
+        throw new ApiError('E04', `${bizplaceId} not found`)
+      }
+
+      let existingIntegration: Integration = await tx
+        .getRepository(Integration)
+        .findOne({ where: { name, domain: bizplace.domain } })
+
+      if (existingIntegration) {
+        throw new ApiError('E04', `${name} already exist`)
+      }
+
+      let integration: Integration = {
+        name,
+        description,
+        platform: 'powrup',
+        active: true,
+        domain: bizplace.domain
+      }
+
+      let createdIntegration: Integration = await tx.getRepository(Integration).create(integration)
+
+      let data = {
+        id: createdIntegration.id,
+        name: createdIntegration.name
+      }
+
+      context.body = {
+        result: { data }
+      }
+    })
+  } catch (e) {
+    if (e instanceof ApiError) ApiErrorHandler(context, e)
+    else throwInternalServerError(context, e)
+  }
+})
+
+powrupRouter.post('/integration/update', validationMiddleware, async (context, next) => {
+  try {
+    await getConnection().transaction(async (tx: EntityManager) => {
+      const { body } = context.request
+
+      const { id, name, description, active } = body
+
+      let existingIntegration: Integration = await tx.getRepository(Integration).findOne(id)
+
+      if (!existingIntegration) {
+        throw new ApiError('E04', `${id} not found`)
+      }
+
+      await tx.getRepository(Integration).update(
+        { id: existingIntegration.id },
+        {
+          name: name || existingIntegration.name,
+          description: description || existingIntegration.description,
+          active: active || existingIntegration.active
+        }
+      )
+
+      let updatedIntegration: Integration = await tx.getRepository(Integration).findOne(existingIntegration.id)
+
+      let data = {
+        id: updatedIntegration.id,
+        name: updatedIntegration.name
+      }
+
+      context.body = {
+        result: { data }
+      }
+    })
+  } catch (e) {
+    if (e instanceof ApiError) ApiErrorHandler(context, e)
+    else throwInternalServerError(context, e)
+  }
+})
+
 async function getIntegration(context, tx) {
   const integration: Integration = await tx.getRepository(Integration).findOne({
     where: { name: context.request.body.apiKey }