@things-factory/operato-hub 4.3.79 → 4.3.80-alpha.2

package/openapi/v1.yaml

@@ -12,21 +12,27 @@ info:
     name: MIT
     url: http://mit-license.org/
 tags:
-  - name: 'product'
+  - name: 'Authentication'
+  - name: 'Bizplace'
+  - name: 'Partner'
+  - name: 'Contact Point'
+  - name: 'Product'
     description: 'API for read, create and update products'
-  - name: 'inbound'
+  - name: 'Marketplace'
+  - name: 'Inbound'
     description: 'API to create and get inbound order list and detail'
-  - name: 'outbound'
+  - name: 'Outbound'
     description: 'API to create and get outbound order list and detail'
-  - name: 'inventory'
+  - name: 'Inventory'
     description: 'API to get inventory information from WMS'
 schemes:
   - 'https'
   - 'http'
 servers:
-  - url: '/api/v1'
+  - url: '/oauth'
 
-components:
+components:     # test 
+# Authentorize Button
   securitySchemes:
     basicAuth:
       type: http
@@ -48,6 +54,31 @@ components:
             LMD: last-mile delivery system
             FREIGHT: freight system
             FLEET: fleet system
+# Schemas at the bottom
+  schemas:
+    # Response Code
+    API Response Code:     
+      type: object
+      properties:
+        E00:
+          type: No Errors
+          HTTP Response Status Code: 200 OK
+        E01:
+          type: 'Invalid parameter value: {{parameter}}'
+          HTTP Response Status Code: 400 Bad Request 
+        E02:
+          type: 'Unexpected parameter: {{parameter}}'
+          HTTP Response Status Code: 400 Bad Request
+        E03:
+          type: 'Missing parameter: {{parameter}}'
+          HTTP Response Status Code: 400 Bad Request
+        E04:
+          type: 'Resource not found: {{parameter}}'
+          HTTP Response Status Code: 404 Not Found
+        E05:
+          type: 'Duplicate entry: {{parameter}}'
+          HTTP Response Status Code: 409 Conflict
+
 
 security:
   - basicAuth: []
@@ -67,7 +98,7 @@ responses:
 securityDefinitions:
   wms_auth:
     type: 'oauth2'
-    authorizationUrl: 'http://petstore.swagger.io/oauth/dialog'
+    authorizationUrl: 'http://petstore.swagger.io/oauth/dialog' # <-- i don't know why it's still here
     flow: 'implicit'
     scopes:
       write:product: 'modify product in specific company id'
@@ -86,3 +117,4 @@ securityDefinitions:
 externalDocs:
   description: 'Find out about our release notes'
   url: 'https://developer.myoperato.com/release_notes'
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.79",
+  "version": "4.3.80-alpha.2",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -56,66 +56,66 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/api": "^4.3.78",
-    "@things-factory/apptool-ui": "^4.3.78",
-    "@things-factory/attachment-base": "^4.3.78",
-    "@things-factory/auth-base": "^4.3.78",
-    "@things-factory/auth-ui": "^4.3.78",
-    "@things-factory/biz-base": "^4.3.78",
-    "@things-factory/biz-ui": "^4.3.78",
-    "@things-factory/board-service": "^4.3.78",
-    "@things-factory/board-ui": "^4.3.78",
-    "@things-factory/code-ui": "^4.3.78",
-    "@things-factory/component-ui": "^4.3.74",
-    "@things-factory/context-ui": "^4.3.78",
-    "@things-factory/document-template-ui": "^4.3.78",
-    "@things-factory/export-ui": "^4.3.78",
-    "@things-factory/export-ui-csv": "^4.3.78",
-    "@things-factory/export-ui-excel": "^4.3.78",
-    "@things-factory/grist-ui": "^4.3.78",
-    "@things-factory/help": "^4.3.78",
-    "@things-factory/i18n-base": "^4.3.78",
-    "@things-factory/import-ui": "^4.3.78",
-    "@things-factory/import-ui-excel": "^4.3.78",
-    "@things-factory/integration-accounting": "^4.3.78",
-    "@things-factory/integration-fulfillment": "^4.3.78",
-    "@things-factory/integration-lmd": "^4.3.78",
-    "@things-factory/integration-marketplace": "^4.3.78",
-    "@things-factory/integration-pos": "^4.3.78",
-    "@things-factory/integration-sellercraft": "^4.3.79",
-    "@things-factory/integration-sftp": "^4.3.78",
-    "@things-factory/lite-menu": "^4.3.78",
-    "@things-factory/more-ui": "^4.3.78",
-    "@things-factory/notification": "^4.3.78",
-    "@things-factory/pdf": "^4.3.74",
-    "@things-factory/product-ui": "^4.3.78",
-    "@things-factory/resource-ui": "^4.3.78",
-    "@things-factory/sales-base": "^4.3.79",
-    "@things-factory/scene-data-transform": "^4.3.76",
-    "@things-factory/scene-excel": "^4.3.76",
-    "@things-factory/scene-firebase": "^4.3.76",
-    "@things-factory/scene-form": "^4.3.76",
-    "@things-factory/scene-google-map": "^4.3.76",
-    "@things-factory/scene-graphql": "^4.3.76",
-    "@things-factory/scene-label": "^4.3.78",
-    "@things-factory/scene-marker": "^4.3.76",
-    "@things-factory/scene-mqtt": "^4.3.76",
-    "@things-factory/scene-restful": "^4.3.76",
-    "@things-factory/scene-visualizer": "^4.3.76",
-    "@things-factory/setting-ui": "^4.3.78",
-    "@things-factory/shell": "^4.3.78",
-    "@things-factory/system-ui": "^4.3.78",
-    "@things-factory/warehouse-base": "^4.3.79",
-    "@things-factory/worksheet-base": "^4.3.79",
+    "@things-factory/api": "^4.3.79-alpha.0",
+    "@things-factory/apptool-ui": "^4.3.79-alpha.0",
+    "@things-factory/attachment-base": "^4.3.79-alpha.0",
+    "@things-factory/auth-base": "^4.3.79-alpha.0",
+    "@things-factory/auth-ui": "^4.3.79-alpha.0",
+    "@things-factory/biz-base": "^4.3.79-alpha.0",
+    "@things-factory/biz-ui": "^4.3.79-alpha.0",
+    "@things-factory/board-service": "^4.3.79-alpha.0",
+    "@things-factory/board-ui": "^4.3.79-alpha.0",
+    "@things-factory/code-ui": "^4.3.79-alpha.0",
+    "@things-factory/component-ui": "^4.3.79-alpha.0",
+    "@things-factory/context-ui": "^4.3.79-alpha.0",
+    "@things-factory/document-template-ui": "^4.3.79-alpha.0",
+    "@things-factory/export-ui": "^4.3.79-alpha.0",
+    "@things-factory/export-ui-csv": "^4.3.79-alpha.0",
+    "@things-factory/export-ui-excel": "^4.3.79-alpha.0",
+    "@things-factory/grist-ui": "^4.3.79-alpha.0",
+    "@things-factory/help": "^4.3.79-alpha.0",
+    "@things-factory/i18n-base": "^4.3.79-alpha.0",
+    "@things-factory/import-ui": "^4.3.79-alpha.0",
+    "@things-factory/import-ui-excel": "^4.3.79-alpha.0",
+    "@things-factory/integration-accounting": "^4.3.80-alpha.1",
+    "@things-factory/integration-fulfillment": "^4.3.79-alpha.0",
+    "@things-factory/integration-lmd": "^4.3.79-alpha.0",
+    "@things-factory/integration-marketplace": "^4.3.79-alpha.0",
+    "@things-factory/integration-pos": "^4.3.79-alpha.0",
+    "@things-factory/integration-sellercraft": "^4.3.79-alpha.0",
+    "@things-factory/integration-sftp": "^4.3.79-alpha.0",
+    "@things-factory/lite-menu": "^4.3.79-alpha.0",
+    "@things-factory/more-ui": "^4.3.79-alpha.0",
+    "@things-factory/notification": "^4.3.79-alpha.0",
+    "@things-factory/pdf": "^4.3.79-alpha.0",
+    "@things-factory/product-ui": "^4.3.80-alpha.1",
+    "@things-factory/resource-ui": "^4.3.79-alpha.0",
+    "@things-factory/sales-base": "^4.3.80-alpha.1",
+    "@things-factory/scene-data-transform": "^4.3.79-alpha.0",
+    "@things-factory/scene-excel": "^4.3.79-alpha.0",
+    "@things-factory/scene-firebase": "^4.3.79-alpha.0",
+    "@things-factory/scene-form": "^4.3.79-alpha.0",
+    "@things-factory/scene-google-map": "^4.3.79-alpha.0",
+    "@things-factory/scene-graphql": "^4.3.79-alpha.0",
+    "@things-factory/scene-label": "^4.3.79-alpha.0",
+    "@things-factory/scene-marker": "^4.3.79-alpha.0",
+    "@things-factory/scene-mqtt": "^4.3.79-alpha.0",
+    "@things-factory/scene-restful": "^4.3.79-alpha.0",
+    "@things-factory/scene-visualizer": "^4.3.79-alpha.0",
+    "@things-factory/setting-ui": "^4.3.79-alpha.0",
+    "@things-factory/shell": "^4.3.79-alpha.0",
+    "@things-factory/system-ui": "^4.3.79-alpha.0",
+    "@things-factory/warehouse-base": "^4.3.80-alpha.1",
+    "@things-factory/worksheet-base": "^4.3.80-alpha.1",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.3.74"
+    "@things-factory/builder": "^4.3.79-alpha.0"
   },
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "e1d319473973c800e4605cc6c47836b9a328c71b"
+  "gitHead": "bb18947c21ab30207b10212b9f40ab887d8ee160"
 }

package/server/middlewares/business-middleware.ts

@@ -1,6 +1,8 @@
+import { getRepository } from 'typeorm'
+
+import { Application } from '@things-factory/auth-base'
 import { Bizplace, Company } from '@things-factory/biz-base'
 import { Domain, getDomainFromURL } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
 
 const debug = require('debug')('things-factory:operato-hub:business-middleware')
 
@@ -11,6 +13,7 @@ export async function businessMiddleware(context, next) {
 
   if (user) {
     const domain: Domain = await getDomainFromURL(context)
+    const application: Application = await getRepository(Application).findOne({ where: { id: user.reference } })
 
     let company: Company
     if (domain.extType === 'company') {
@@ -24,6 +27,7 @@ export async function businessMiddleware(context, next) {
     }
 
     context.state.business = company
+    context.state.application = application
   }
 
   await next()

package/server/middlewares/store-middleware.ts

@@ -1,4 +1,5 @@
 import { getRepository } from 'typeorm'
+
 import { MarketplaceStore as MarketplaceStoreEntity } from '@things-factory/integration-marketplace'
 
 const debug = require('debug')('things-factory:operato-hub:store-middleware')

package/server/routers/api/index.ts

@@ -1,3 +1,2 @@
 import './restful-apis/v1'
-import './restful-apis/v2'
 import './restful-apis/unstable'

package/server/routers/api/restful-apis/unstable/add-draft-release-order.ts

@@ -16,7 +16,7 @@ router.post(
   warehouseMiddleware,
   async (context, next) => {
     return await getConnection().transaction(async (tx: EntityManager) => {
-      const { client, domain } = context.state
+      const { client, domain, application } = context.state
       const { warehouseId: customerBizplaceId } = context.params
       const { t } = context
 
@@ -126,7 +126,8 @@ router.post(
                 phone1: bodyReq?.deliverTo?.phone1 || null,
                 phone2: bodyReq?.deliverTo?.phone2 || null,
                 email: bodyReq?.deliverTo?.email || null,
-                packageId: bodyReq?.packageId || null
+                packageId: bodyReq?.packageId || null,
+                source: application?.type || null
               },
               orderProducts: orderInventories,
               files: []

package/server/routers/api/restful-apis/unstable/add-inbound-order.ts

@@ -15,7 +15,7 @@ router.post(
   businessMiddleware,
   warehouseMiddleware,
   async (context, next) => {
-    const { client, domain } = context.state
+    const { client, domain, application } = context.state
     const { warehouseId } = context.params
     const { t } = context
     const attachments = undefined
@@ -173,7 +173,10 @@ router.post(
               }
             }
           `,
-          variables: { arrivalNotice: { ...bodyReq, orderProducts, warehouseId }, attachments },
+          variables: {
+            arrivalNotice: { ...bodyReq, orderProducts, warehouseId, source: application?.type },
+            attachments
+          },
           context: {
             ...context,
             hasUpload: true,

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

@@ -43,7 +43,7 @@ router.post(
   warehouseMiddleware,
   async (context, next) => {
     return await getConnection().transaction(async (tx: EntityManager) => {
-      const { client, domain, user } = context.state
+      const { client, domain, user, application } = context.state
       const { warehouseId: customerBizplaceId } = context.params
       const { t } = context
       const bodyReq = context.request.body
@@ -107,7 +107,8 @@ router.post(
           storeName: bodyReq?.storeName,
           storeId: bodyReq?.storeId,
           routeId: bodyReq?.routeId,
-          stopId: bodyReq?.stopId
+          stopId: bodyReq?.stopId,
+          source: application?.type
         }
 
         // check existing order
@@ -495,6 +496,7 @@ async function createReleaseGood(
       stopId: releaseGood?.stopId,
       packageId: releaseGood?.packageId || null,
       noOfItems: orderProducts.length,
+      source: releaseGood?.source,
       creator: user,
       updater: user,
       acceptedBy: user,

package/server/routers/api/restful-apis/v1/company/add-contact-points.ts

@@ -0,0 +1,84 @@
+import { getConnection, EntityManager } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { ContactPoint } from '@things-factory/biz-base'
+import { Bizplace } from '@things-factory/biz-base'
+
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
+
+router.post('/v1/company/add-contact-points', businessMiddleware, validationMiddleware, loggingMiddleware, async (context, next) => {
+  try {
+    if (!Array.isArray(context.request.body.data)) throw new ApiError('E01', 'data field is not an array')
+    await getConnection().transaction(async (tx: EntityManager) => {
+      // create and format values to be inserted
+      const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+        where: { domain: context.state.domain }
+      })
+      let values = []
+      for (const datapoint of context.request.body.data) {
+        const value = {
+          name: datapoint.name,
+          description: datapoint.description,
+          companyName: datapoint.companyName,
+          email: datapoint.email,
+          fax: datapoint.fax,
+          phone: datapoint.phone,
+          billingAddress: datapoint.billingAddress,
+          accountNo: datapoint.accountNo,
+          address: datapoint.address,
+          address2: datapoint.address2,
+          city: datapoint.city,
+          state: datapoint.state,
+          postCode: datapoint.postCode,
+          type: datapoint.type,
+          domain: context.state.domain,
+          bizplace: bizplace,
+          creator: context.state.user,
+          updater: context.state.user
+        }
+        values.push(value)
+      }
+
+      // insert values to DB
+      const result = await tx
+        .getRepository(ContactPoint)
+        .createQueryBuilder()
+        .insert()
+        .into(ContactPoint)
+        .values(values)
+        .returning('*')
+        .execute()
+
+      // create and format response
+      let data = []
+      for (const contactPoint of result.generatedMaps) {
+        const datapoint = {
+          name: contactPoint.name,
+          description: contactPoint.description,
+          companyName: contactPoint.companyName,
+          email: contactPoint.email,
+          fax: contactPoint.fax,
+          phone: contactPoint.phone,
+          billingAddress: contactPoint.billingAddress,
+          accountNo: contactPoint.accountNo,
+          address: contactPoint.address,
+          address2: contactPoint.address2,
+          city: contactPoint.city,
+          state: contactPoint.state,
+          postCode: contactPoint.postCode,
+          type: contactPoint.type,
+          createdAt: contactPoint.createdAt
+        }
+        data.push(datapoint)
+      }
+
+      context.body = {
+        data
+      }
+    })
+  } catch (e) {
+    if (e instanceof ApiError) ApiErrorHandler(context, e)
+    else throwInternalServerError(context, e)
+  }
+})

package/server/routers/api/restful-apis/v1/company/add-marketplace-order.ts

@@ -0,0 +1,223 @@
+import { getConnection, EntityManager, IsNull, SelectQueryBuilder } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
+import { v4 as uuidv4 } from 'uuid'
+import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Product, ProductBundle, ProductBundleSetting } from '@things-factory/product-base'
+import {
+  MarketplaceOrder as MarketplaceOrderEntity,
+  MarketplaceOrderItem as MarketplaceOrderItemEntity,
+  MarketplaceOrderShipping as MarketplaceOrderShippingEntity,
+  MarketplaceOrderShippingItem as MarketplaceOrderShippingItemEntity,
+  MarketplaceProductVariation as MarketplaceProductVariationEntity,
+  NoGenerator
+} from '@things-factory/marketplace-base'
+import { businessMiddleware, validationMiddleware, loggingMiddleware } from '../middlewares'
+
+router.post('/v1/company/add-marketplace-order', businessMiddleware, validationMiddleware, loggingMiddleware, async (context, next) => {
+  try {
+    await getConnection().transaction(async (tx: EntityManager) => {
+      const { user, domain } = context.state
+      const marketplaceOrder = context.request.body.data
+
+      const marketplaceStore: MarketplaceStore = await tx.getRepository(MarketplaceStore).findOne({
+        where: { name: marketplaceOrder.storeId, domain }
+      })
+      if (!marketplaceStore) throw new ApiError('E04', 'storeId')
+
+      let marketplaceOrderItems: MarketplaceOrderItemEntity[] = []
+
+      let newMarketplaceOrder: MarketplaceOrderEntity = Object.assign({}, marketplaceOrder)
+      const itemCount: number = marketplaceOrder.marketplaceOrderItems?.length
+
+      const currentDate = new Date()
+      newMarketplaceOrder.name = `MO-${currentDate.getFullYear()}${
+        currentDate.getMonth() + 1
+      }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
+      newMarketplaceOrder.itemCount = itemCount
+      newMarketplaceOrder.marketplaceStore = marketplaceStore
+      newMarketplaceOrder.domain = domain
+      newMarketplaceOrder.creator = user
+      newMarketplaceOrder = await tx.getRepository(MarketplaceOrderEntity).save(newMarketplaceOrder)
+
+      let newMarketplaceOrderShipping: MarketplaceOrderShippingEntity
+      if (marketplaceOrder?.marketplaceOrderShipping) {
+        const marketplaceOrderShipping: any = marketplaceOrder.marketplaceOrderShipping
+        newMarketplaceOrderShipping = Object.assign({}, marketplaceOrderShipping)
+        newMarketplaceOrderShipping.name = marketplaceOrderShipping?.shippingId
+          ? marketplaceOrderShipping.shippingId
+          : NoGenerator.orderShipping()
+        newMarketplaceOrderShipping.transporter =
+          marketplaceOrderShipping?.transporter === '' ? null : marketplaceOrderShipping.transporter
+        newMarketplaceOrderShipping.ownTransporter =
+          marketplaceOrderShipping?.transporter === '' ? null : marketplaceOrderShipping.transporter
+        newMarketplaceOrderShipping.marketplaceStore = marketplaceStore
+        newMarketplaceOrderShipping.orderNoRef = newMarketplaceOrder.orderNo
+        newMarketplaceOrderShipping.subOrderNoRef = newMarketplaceOrder.orderNo
+        newMarketplaceOrderShipping.domain = domain
+        newMarketplaceOrderShipping.creator = user
+        newMarketplaceOrderShipping = await tx
+          .getRepository(MarketplaceOrderShippingEntity)
+          .save(newMarketplaceOrderShipping)
+      }
+
+      marketplaceOrderItems = await Promise.all(
+        marketplaceOrder?.marketplaceOrderItems.map(async orderItem => {
+          let marketplaceOrderItem: MarketplaceOrderItemEntity = Object.assign({}, orderItem)
+
+          const marketplaceProductVariation = orderItem.marketplaceProductVariation
+          const qb: SelectQueryBuilder<MarketplaceProductVariationEntity> = await tx
+            .getRepository(MarketplaceProductVariationEntity)
+            .createQueryBuilder('mpv')
+            .leftJoin('mpv.marketplaceProduct', 'mp')
+            .leftJoin('mp.marketplaceStore', 'ms')
+            .where('mpv.domain_id = :domainId')
+            .andWhere('mpv.variation_id = :variationId')
+            .andWhere('ms.id = :marketplaceStoreId')
+            .setParameters({
+              domainId: domain.id,
+              variationId: marketplaceProductVariation.variationId,
+              marketplaceStoreId: marketplaceStore.id
+            })
+
+          let foundVariation: MarketplaceProductVariationEntity = await qb.getOne()
+
+          if (!foundVariation) {
+            let newVariation: MarketplaceProductVariationEntity = Object.assign({}, marketplaceProductVariation)
+            newVariation.status = 'ACTIVE'
+            newVariation.domain = domain
+
+            await tx.getRepository(MarketplaceProductVariationEntity).save(newVariation)
+            foundVariation = newVariation
+          }
+
+          marketplaceOrderItem.marketplaceProductVariation = foundVariation
+          marketplaceOrderItem.name = orderItem.orderItemId
+          marketplaceOrderItem.marketplaceOrder = newMarketplaceOrder
+          marketplaceOrderItem.domain = domain
+          marketplaceOrderItem.creator = user
+
+          return marketplaceOrderItem
+        })
+      )
+
+      marketplaceOrderItems = await tx.getRepository(MarketplaceOrderItemEntity).save(marketplaceOrderItems)
+
+      await Promise.all(
+        marketplaceOrderItems.map(async marketplaceOrderItem => {
+          const marketplaceProductVariation = marketplaceOrderItem.marketplaceProductVariation
+
+          let product: Product = await tx.getRepository(Product).findOne({
+            where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku, deletedAt: IsNull() },
+            relations: ['productDetails']
+          })
+
+          let productBundle: ProductBundle
+          if (!product) {
+            productBundle = await tx.getRepository(ProductBundle).findOne({
+              where: { domain: marketplaceStore.domain, sku: marketplaceProductVariation.sku },
+              relations: ['productBundleSettings', 'productBundleSettings.product']
+            })
+          }
+
+          let existingMarketplaceOrderShippingItems: MarketplaceOrderShippingItemEntity[] = await tx
+            .getRepository(MarketplaceOrderShippingItemEntity)
+            .find({
+              where: { domain: marketplaceStore.domain, marketplaceOrderItem }
+            })
+
+          if (existingMarketplaceOrderShippingItems && existingMarketplaceOrderShippingItems?.length) {
+          } else {
+            if (productBundle) {
+              const productBundleSettings: ProductBundleSetting[] = productBundle.productBundleSettings
+              let marketplaceOrderShippingItems: MarketplaceOrderShippingItemEntity[] = []
+              productBundleSettings.map(productBundleSetting => {
+                let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
+                  new MarketplaceOrderShippingItemEntity()
+                marketplaceOrderShippingItem.name = uuidv4()
+                marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty * productBundleSetting.bundleQty
+                marketplaceOrderShippingItem.domain = marketplaceStore.domain
+                marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+                marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping
+                marketplaceOrderShippingItem.product = productBundleSetting.product
+
+                marketplaceOrderShippingItems.push(marketplaceOrderShippingItem)
+              })
+
+              await tx.getRepository(MarketplaceOrderShippingItemEntity).save(marketplaceOrderShippingItems)
+            } else {
+              let marketplaceOrderShippingItem: MarketplaceOrderShippingItemEntity =
+                new MarketplaceOrderShippingItemEntity()
+              marketplaceOrderShippingItem.name = uuidv4()
+              marketplaceOrderShippingItem.qty = marketplaceOrderItem.qty
+              marketplaceOrderShippingItem.domain = marketplaceStore.domain
+              marketplaceOrderShippingItem.marketplaceOrderItem = marketplaceOrderItem
+              marketplaceOrderShippingItem.marketplaceOrderShipping = newMarketplaceOrderShipping
+              marketplaceOrderShippingItem.product = product ? product : null
+
+              await tx.getRepository(MarketplaceOrderShippingItemEntity).save(marketplaceOrderShippingItem)
+            }
+          }
+        })
+      )
+
+      let marketplaceOrderItemsData = []
+      for (const item of marketplaceOrderItems) {
+        const datapoint = {
+          marketplaceOrderVariation: {
+            variationId: item.marketplaceProductVariation.variationId,
+            sku: item.marketplaceProductVariation.sku,
+            variationSku: item.marketplaceProductVariation.variationSku,
+            variationName: item.marketplaceProductVariation.variationName
+          },
+          marketplaceOrderShipping: {
+            attentionTo: item.marketplaceOrderShipping.attentionTo,
+            address1: item.marketplaceOrderShipping.address1,
+            address2: item.marketplaceOrderShipping.address2,
+            address3: item.marketplaceOrderShipping.address3,
+            address4: item.marketplaceOrderShipping.address4,
+            address5: item.marketplaceOrderShipping.address5,
+            state: item.marketplaceOrderShipping.state,
+            city: item.marketplaceOrderShipping.city,
+            postCode: item.marketplaceOrderShipping.postCode,
+            country: item.marketplaceOrderShipping.country,
+            phone1: item.marketplaceOrderShipping.phone1,
+            phone2: item.marketplaceOrderShipping.phone2,
+            email: item.marketplaceOrderShipping.email,
+            freightType: item.marketplaceOrderShipping.freightType,
+            parcelType: item.marketplaceOrderShipping.parcelType,
+            deliveryMethod: item.marketplaceOrderShipping.deliveryMethod,
+            totalWeight: item.marketplaceOrderShipping.totalWeight,
+            totalVolume: item.marketplaceOrderShipping.totalVolume,
+            transporter: item.marketplaceOrderShipping.transporter
+          }
+        }
+        marketplaceOrderItemsData.push(datapoint)
+      }
+      const data = {
+        orderNo: newMarketplaceOrder.orderNo,
+        itemCount,
+        paymentMethod: newMarketplaceOrder.paymentMethod,
+        remark: newMarketplaceOrder.remark,
+        giftOption: newMarketplaceOrder.giftOption,
+        orderCreatedAt: newMarketplaceOrder.orderCreatedAt,
+        orderUpdatedAt: newMarketplaceOrder.orderUpdatedAt,
+        marketplaceOrderItems: marketplaceOrderItemsData,
+        orderItemId: newMarketplaceOrder.orderItemId,
+        qty: newMarketplaceOrder.qty,
+        cancelBy: newMarketplaceOrder.cancelBy,
+        returnStatus: newMarketplaceOrder.returnStatus,
+        packageId: newMarketplaceOrder.packageId,
+        status: newMarketplaceOrder.status
+      }
+
+      context.body = {
+        data
+      }
+    })
+  } catch (e) {
+    if (e instanceof ApiError) ApiErrorHandler(context, e)
+    else throwInternalServerError(context, e)
+  }
+})