@things-factory/operato-hub 3.7.11 → 3.7.15

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] }]