@things-factory/operato-hub 4.0.9 → 4.0.13

package/server/routers/api/restful-apis/v1/get-marketplace-order-shipping-list.ts

@@ -15,7 +15,7 @@ router.get(
     const { shippingNo, orderNo, status, fromDate, toDate, paginationEntriesPerPage, paginationOffset } = context.query
 
     let filters: any = [
-      { name: 'marketplaceStore', operator: 'eq', value: marketplaceStore?.id, relation: true },
+      { name: 'marketplace_store_id', operator: 'eq', value: marketplaceStore?.id, relation: true },
       { name: 'domain', operator: 'eq', value: domain.id, relation: true }
     ]
     let pagination: any = { page: 1, limit: 20 }
@@ -48,14 +48,13 @@ router.get(
                   phone2
                   email
                   orderType
-                  freightType
-                  parcelType
-                  goodsType
                   trackingNo
                   ownTrackingNo
                   airwayBill
                   deliveryMethod
+                  weightUnit
                   totalWeight
+                  volumeUnit
                   totalVolume
                   transporter
                   ownTransporter
@@ -106,17 +105,17 @@ export async function validateFilters(context, filters, shippingNo, orderNo, sta
 
   if (status && status !== '') filters = [...filters, { name: 'status', operator: 'eq', value: status }]
 
-  if (fromDate && fromDate !== '') {
-    fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
-    if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
-    else context.throw(400, context.t('fromDate is invalid'))
-  } else fromDate = ''
-
-  if (toDate && toDate !== '') {
-    toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
-    if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
-    else context.throw(400, context.t('toDate is invalid'))
-  } else toDate = ''
+  // if (fromDate && fromDate !== '') {
+  //   fromDate = new Date(`${fromDate.split(' ').join('')} 00:00:00`)
+  //   // if (fromDate instanceof Date && !isNaN(fromDate.getTime())) fromDate = fromDate.toLocaleString()
+  //   // else context.throw(400, context.t('fromDate is invalid'))
+  // } else fromDate = ''
+
+  // if (toDate && toDate !== '') {
+  //   toDate = new Date(`${toDate.split(' ').join('')} 23:59:59`)
+  //   // if (toDate instanceof Date && !isNaN(toDate.getTime())) toDate = toDate.toLocaleString()
+  //   // else context.throw(400, context.t('toDate is invalid'))
+  // } else toDate = ''
 
   if (fromDate !== '' && toDate !== '')
     filters = [...filters, { name: 'createdAt', operator: 'between', value: [fromDate, toDate] }]

package/server/routers/api/restful-apis/v1/index.ts

@@ -24,3 +24,4 @@ import './set-marketplace-order-delivered'
 import './set-marketplace-order-failed-delivery'
 import './update-marketplace-shipping-order'
 import './update-marketplace-order'
+import './update-release-order-details'

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

@@ -0,0 +1,94 @@
+import gql from 'graphql-tag'
+import { getRepository } from 'typeorm'
+
+import { restfulApiRouter as router } from '@things-factory/api'
+import { Bizplace } from '@things-factory/biz-base'
+
+import { businessMiddleware } from '../../../../middlewares/business-middleware'
+import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
+
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:update-release-order-details')
+
+router.post(
+  '/v1/warehouse/:warehouseId/update-release-order-details',
+  businessMiddleware,
+  warehouseMiddleware,
+  async (context, next) => {
+    const { client, domain } = context.state
+    const { warehouseId: customerBizplaceId } = context.params
+    const { t } = context
+    const bodyReq = context.request.body
+
+    if (!customerBizplaceId) context.throw(404, t('error.warehouse id not found'))
+    const customerBizplace: Bizplace = await getRepository(Bizplace).findOne({
+      where: { id: customerBizplaceId }
+    })
+
+    if (typeof bodyReq === undefined || !Object.keys(bodyReq)?.length) {
+      debug('bodyReq', bodyReq)
+      context.throw(400, t('error.invalid body request format'))
+    }
+
+    let patch: any = {}
+    if (bodyReq?.releaseOrder) patch.releaseGood = bodyReq.releaseOrder
+    else context.throw(400, t('error.body request require releaseGood property'))
+
+    if (bodyReq?.shippingOrder) patch.shippingOrder = bodyReq.shippingOrder
+    else patch.shippingOrder = null
+
+    context.body = {
+      result: (
+        await client.mutate({
+          mutation: gql`
+            mutation updateReleaseGoodDetails($releaseGood: ReleaseGoodPatch!, $shippingOrder: ShippingOrderPatch) {
+              updateReleaseGoodDetails(releaseGood: $releaseGood, shippingOrder: $shippingOrder) {
+                id
+                name
+                refNo
+                refNo2
+                refNo3
+                ownTransport
+                collectionOrderNo
+                exportOption
+                courierOption
+                packingOption
+                type
+                billingAddress
+                deliveryAddress1
+                deliveryAddress2
+                deliveryAddress3
+                deliveryAddress4
+                deliveryAddress5
+                attentionTo
+                attentionCompany
+                city
+                state
+                postalCode
+                country
+                phone1
+                phone2
+                email
+                handoverType
+                dropoffAddress
+                pickupAddress
+                transporter
+                trackingNo
+                marketplaceOrderStatus
+              }
+            }
+          `,
+          variables: { ...patch },
+          context: {
+            ...context,
+            state: {
+              ...context.state,
+              bizplace: customerBizplace,
+              domain,
+              type: 'api'
+            }
+          }
+        } as any)
+      ).data
+    }
+  }
+)