@things-factory/marketplace-base 4.1.3 → 4.1.10

package/server/graphql/resolvers/marketplace-order-shipping-item/marketplace-order-shipping-items.ts

@@ -0,0 +1,16 @@
+import { getRepository } from 'typeorm'
+
+import { convertListParams, ListParam } from '@things-factory/shell'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const marketplaceOrderShippingItemsResolver = {
+  async marketplaceOrderShippingItems(_: any, params: ListParam, context: any) {
+    const convertedParams = convertListParams(params)
+    const [items, total] = await getRepository(MarketplaceOrderShippingItem).findAndCount({
+      ...convertedParams,
+      relations: ['domain', 'creator', 'updater']
+    })
+    return { items, total }
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/update-marketplace-order-shipping-item.ts

@@ -0,0 +1,18 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const updateMarketplaceOrderShippingItem = {
+  async updateMarketplaceOrderShippingItem(_: any, { name, patch }, context: any) {
+    const repository = getRepository(MarketplaceOrderShippingItem)
+    const marketplaceOrderShippingItem = await repository.findOne({
+      where: { domain: context.state.domain, name }
+    })
+
+    return await repository.save({
+      ...marketplaceOrderShippingItem,
+      ...patch,
+      updater: context.state.user
+    })
+  }
+}

package/server/graphql/resolvers/marketplace-order-shipping-item/update-multiple-marketplace-order-shipping-item.ts

@@ -0,0 +1,44 @@
+import { getRepository } from 'typeorm'
+
+import { MarketplaceOrderShippingItem } from '../../../entities'
+
+export const updateMultipleMarketplaceOrderShippingItem = {
+  async updateMultipleMarketplaceOrderShippingItem(_: any, { patches }, context: any) {
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const marketplaceOrderShippingItemRepo = getRepository(MarketplaceOrderShippingItem)
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await marketplaceOrderShippingItemRepo.save({
+          ...newRecord,
+          domain: context.state.domain,
+          creator: context.state.user,
+          updater: context.state.user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const newRecord = _updateRecords[i]
+        const marketplaceOrderShippingItem = await marketplaceOrderShippingItemRepo.findOne(newRecord.id)
+
+        const result = await marketplaceOrderShippingItemRepo.save({
+          ...marketplaceOrderShippingItem,
+          ...newRecord,
+          updater: context.state.user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+}

package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts

@@ -24,7 +24,8 @@ export const marketplaceSalesReportsResolver = {
     let qb: SelectQueryBuilder<MarketplaceOrderItem> = getRepository(MarketplaceOrderItem).createQueryBuilder('moi')
     buildQuery(qb, params, context)
     qb.leftJoinAndSelect('moi.domain', 'domain')
-      .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
+      .leftJoinAndSelect('moi.marketplaceOrderShippingItems', 'mosi')
+      .leftJoinAndSelect('mosi.marketplaceOrderShipping', 'mos')
       .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
       .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
       .leftJoinAndSelect('mo.marketplaceStore', 'ms')

package/server/graphql/types/index.ts

@@ -10,3 +10,4 @@ export * from './store-replenishment-item'
 export * from './marketplace-product-variation-price'
 export * from './marketplace-refund-order'
 export * from './marketplace-report'
+export * from './marketplace-order-shipping-item'

package/server/graphql/types/marketplace-order/index.ts

@@ -23,13 +23,14 @@ export const MarketplaceOrderResolver = gql`
     generateMarketplaceOrder(marketplaceOrder: NewMarketplaceOrder!): MarketplaceOrder @transaction
     cancelMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
     syncMarketplaceOrder(storeId: String!, fromDate: String, toDate: String): Boolean @transaction
-    syncAllMarketplaceOrder(
-      companyDomainId: String
-      fromDate: String
-      toDate: String
-      blackListStores: String
-    ): Boolean
-    updateOrderReadyToShip(shippingProvider: String!, deliveryType: String, orderNo: String!): Boolean @transaction
+    syncAllMarketplaceOrder(companyDomainId: String, fromDate: String, toDate: String, blackListStores: String): Boolean
+    updateOrderReadyToShip(
+      shippingProvider: String
+      deliveryType: String
+      orderNo: String!
+      orderId: String!
+      domainId: String!
+    ): Boolean @transaction
     initialiseLogistics(deliveryType: LogisticsInit, orderNo: String!): Boolean @transaction
     initialiseLogisticsByBatch(patches: [LogisticsInfo]!): Boolean @transaction
     initialiseShopeeLogisticsByBatch(patches: [LogisticsInfo]!): Boolean

package/server/graphql/types/marketplace-order/logistics-info.ts

@@ -22,5 +22,6 @@ export const LogisticsInfo = gql`
     addressFlag: [String]
     trackingNo: String
     ownTrackingNo: String
+    trackingUrl: String
   }
 `

package/server/graphql/types/marketplace-order-item/marketplace-order-item.ts

@@ -6,8 +6,8 @@ export const MarketplaceOrderItem = gql`
     name: String
     domain: Domain
     marketplaceOrder: MarketplaceOrder
+    marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
     marketplaceProductVariation: MarketplaceProductVariation
-    marketplaceOrderShipping: MarketplaceOrderShipping
     orderType: String
     cancelBy: String
     returnStatus: String

package/server/graphql/types/marketplace-order-item/new-marketplace-order-item.ts

@@ -12,7 +12,6 @@ export const NewMarketplaceOrderItem = gql`
     packageId: String
     invoiceNo: String
     status: String
-    marketplaceOrderShipping: NewMarketplaceOrderShipping
     marketplaceProductVariation: MarketplaceProductVariationPatch
   }
 `

package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping-patch.ts

@@ -5,7 +5,6 @@ export const MarketplaceOrderShippingPatch = gql`
     id: String
     name: String
     description: String
-    marketplaceOrderItems: [ObjectRef]
     orderNoRef: String
     subOrderNoRef: String
     address1: String

package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts

@@ -7,7 +7,7 @@ export const MarketplaceOrderShipping = gql`
     domain: Domain
     description: String
     marketplaceOrder: MarketplaceOrder
-    marketplaceOrderItems: [MarketplaceOrderItem]
+    marketplaceOrderShippingItems: [MarketplaceOrderShippingItem]
     marketplaceStore: MarketplaceStore
     orderNoRef: String
     subOrderNoRef: String
@@ -50,6 +50,7 @@ export const MarketplaceOrderShipping = gql`
     sellerShippingFeeVoucher: Float
     releaseOrderId: String
     fulfillmentCenter: FulfillmentCenter
+    trackingUrl: String
     updater: User
     creator: User
     updatedAt: String

package/server/graphql/types/marketplace-order-shipping/new-marketplace-order-shipping.ts

@@ -4,7 +4,6 @@ export const NewMarketplaceOrderShipping = gql`
   input NewMarketplaceOrderShipping {
     name: String
     description: String
-    marketplaceOrderItems: [ObjectRef]
     orderNoRef: String
     subOrderNoRef: String
     shippingId: String

package/server/graphql/types/marketplace-order-shipping-item/index.ts

@@ -0,0 +1,32 @@
+import gql from 'graphql-tag'
+
+export * from './marketplace-order-shipping-item'
+export * from './marketplace-order-shipping-item-list'
+export * from './marketplace-order-shipping-item-patch'
+export * from './new-marketplace-order-shipping-item'
+
+export const MarketplaceOrderShippingItemResolver = gql`
+  extend type Mutation {
+    createMarketplaceOrderShippingItem(
+      marketplaceOrderShippingItem: NewMarketplaceOrderShippingItem!
+    ): MarketplaceOrderShippingItem
+    updateMarketplaceOrderShippingItem(
+      name: String!
+      patch: MarketplaceOrderShippingItemPatch!
+    ): MarketplaceOrderShippingItem @transaction
+    updateMultipleMarketplaceOrderShippingItem(
+      patches: [MarketplaceOrderShippingItemPatch]!
+    ): [MarketplaceOrderShippingItem]
+    deleteMarketplaceOrderShippingItem(name: String!): Boolean
+    deleteMarketplaceOrderShippingItems(names: [String]!): Boolean
+  }
+
+  extend type Query {
+    marketplaceOrderShippingItems(
+      filters: [Filter]
+      pagination: Pagination
+      sortings: [Sorting]
+    ): MarketplaceOrderShippingItemList
+    marketplaceOrderShippingItem(name: String!): MarketplaceOrderShippingItem
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderShippingItemList = gql`
+  type MarketplaceOrderShippingItemList {
+    items: [MarketplaceOrderShippingItemList]
+    total: Int
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item-patch.ts

@@ -0,0 +1,13 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderShippingItemPatch = gql`
+  input MarketplaceOrderShippingItemPatch {
+    id: String
+    name: String
+    marketplaceOrderItem: ObjectRef
+    marketplaceOrderShipping: ObjectRef
+    product: ObjectRef
+    qty: Int
+    cuFlag: String
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/marketplace-order-shipping-item.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const MarketplaceOrderShippingItem = gql`
+  type MarketplaceOrderShippingItem {
+    id: String
+    name: String
+    marketplaceOrderItem: MarketplaceOrderItem
+    marketplaceOrderShipping: MarketplaceOrderShipping
+    product: Product
+    qty: Int
+    updater: User
+    creator: User
+    updatedAt: String
+    createdAt: String
+  }
+`

package/server/graphql/types/marketplace-order-shipping-item/new-marketplace-order-shipping-item.ts

@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const NewMarketplaceOrderShippingItem = gql`
+  input NewMarketplaceOrderShippingItem {
+    id: String
+    name: String
+    marketplaceOrderItem: ObjectRef
+    marketplaceOrderShipping: ObjectRef
+    product: ObjectRef
+    qty: Int
+  }
+`