@things-factory/marketplace-base 3.6.3 → 3.6.8

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

@@ -0,0 +1,35 @@
+import {
+  MarketplaceOrder as MarketplaceOrderEntity,
+  MarketplaceOrderItem as MarketplaceOrderItemEntity
+} from '../../../entities'
+
+export const updateMarketplaceOrder = {
+  async updateMarketplaceOrder(_: any, { orderNo, patch }, context: any) {
+    const { tx, user, marketplaceStore } = context.state
+    let marketplaceOrder: MarketplaceOrderEntity = await tx.getRepository(MarketplaceOrderEntity).findOne({
+      where: { marketplaceStore, orderNo },
+      relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
+    })
+
+    let marketplaceOrderItems: MarketplaceOrderItemEntity[] = marketplaceOrder.marketplaceOrderItems
+    marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderItem => {
+      return {
+        ...marketplaceOrderItem,
+        ...patch,
+        updater: user
+      }
+    })
+
+    marketplaceOrder = await tx.getRepository(MarketplaceOrderEntity).save({
+      ...marketplaceOrder,
+      ...patch,
+      updater: user
+    })
+
+    marketplaceOrderItems = await tx.getRepository(MarketplaceOrderItemEntity).save(marketplaceOrderItems)
+
+    return {
+      ...marketplaceOrder
+    }
+  }
+}

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

@@ -4,10 +4,12 @@ export const updateMarketplaceOrderShipping = {
   async updateMarketplaceOrderShipping(_: any, { orderNo, patch }, context: any) {
     const { tx, user, marketplaceStore } = context.state
     let marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShippingEntity).findOne({
-      where: { marketplaceStore, orderNoRef: orderNo },
+      where: { marketplaceStore, subOrderNoRef: orderNo },
       relations: ['marketplaceStore']
     })
 
+    marketplaceOrderShipping.ownTrackingNo = patch.trackingNo
+
     marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShippingEntity).save({
       ...marketplaceOrderShipping,
       ...patch,

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

@@ -29,8 +29,10 @@ export const MarketplaceOrderResolver = gql`
     initialiseLazadaLogisticsByBatch(patches: [LogisticsInfo]!): Boolean @transaction
     setMarketplaceOrderDelivered(orderNo: String!): Boolean @transaction
     setMarketplaceOrderFailedDelivery(orderNo: String!): Boolean @transaction
+    setOwnShippingProviderByOrders(patches: [LogisticsInfo]!): Boolean @transaction
     deleteMarketplaceOrders(names: [String]!): Boolean
     splitOrdersByBatch(patches: [LogisticsInfo]): Boolean @transaction
+    updateMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
   }
 
   extend type Query {

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

@@ -9,6 +9,7 @@ export const LogisticsInfo = gql`
     pickupDate: String
     timeText: String
     shippingProvider: String
+    ownShippingProvider: String
     branchId: Int
     addressId: Int
     country: String
@@ -20,5 +21,6 @@ export const LogisticsInfo = gql`
     town: String
     addressFlag: [String]
     trackingNo: String
+    ownTrackingNo: String
   }
 `

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

@@ -20,10 +20,13 @@ export const MarketplaceOrder = gql`
     voucherCode: String
     discountValue: String
     shippingProvider: String
+    ownShippingProvider: String
     trackingNo: String
+    ownTrackingNo: String
     status: String
     releaseOrderId: String
     otherInfoJSON: String
+    isSplitted: Boolean
     updater: User
     creator: User
     orderUpdatedAt: String

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

@@ -7,6 +7,7 @@ export const MarketplaceOrderShippingPatch = gql`
     description: String
     marketplaceOrderItems: [ObjectRef]
     orderNoRef: String
+    subOrderNoRef: String
     address1: String
     address2: String
     address3: String
@@ -14,6 +15,7 @@ export const MarketplaceOrderShippingPatch = gql`
     address5: String
     attentionTo: String
     transporter: String
+    ownTransporter: String
     city: String
     state: String
     postCode: String
@@ -32,6 +34,7 @@ export const MarketplaceOrderShippingPatch = gql`
     airwayBill: String
     invoice: String
     trackingNo: String
+    ownTrackingNo: String
     orderType: String
     freightType: Int
     parcelType: Int

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

@@ -10,6 +10,7 @@ export const MarketplaceOrderShipping = gql`
     marketplaceOrderItems: [MarketplaceOrderItem]
     marketplaceStore: MarketplaceStore
     orderNoRef: String
+    subOrderNoRef: String
     shippingId: String
     address1: String
     address2: String
@@ -26,7 +27,9 @@ export const MarketplaceOrderShipping = gql`
     email: String
     type: String
     transporter: String
+    ownTransporter: String
     trackingNo: String
+    ownTrackingNo: String
     airwayBill: String
     invoice: String
     weightUnit: String

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

@@ -6,6 +6,7 @@ export const NewMarketplaceOrderShipping = gql`
     description: String
     marketplaceOrderItems: [ObjectRef]
     orderNoRef: String
+    subOrderNoRef: String
     shippingId: String
     address1: String
     address2: String
@@ -22,7 +23,9 @@ export const NewMarketplaceOrderShipping = gql`
     email: String
     type: String
     transporter: String
+    ownTransporter: String
     trackingNo: String
+    ownTrackingNo: String
     airwayBill: String
     invoice: String
     weightUnit: String