@things-factory/sales-base 4.1.3 → 4.1.8

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -172,7 +172,7 @@ export class ArrivalNoticeMutation {
     const users: any[] = await getDomainUsers(arrivalNotice?.bizplace, tx)
     debug('users', users)
 
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `Products are added/edited for ${arrivalNotice.name}`,
@@ -599,7 +599,7 @@ export async function confirmArrivalNoticeFunction(
       .getRawMany()
 
     // send notification to Office Admin Users
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `New Arrival Notice from ${customerBizplace.name}`,
@@ -671,7 +671,7 @@ export async function receiveArrivalNoticeFunction(_: any, name: String, context
     const users: any[] = await getDomainUsers(foundArrivalNotice?.bizplace, tx)
 
     // send notification to Customer Users
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `Latest status for ${foundArrivalNotice.name}`,
@@ -761,7 +761,7 @@ export async function checkArrivedNoticeFunction(
     // notification logics
     const users: any[] = await getDomainUsers(foundArrivalNotice?.bizplace, tx)
 
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `Latest status for ${foundArrivalNotice.name}`,
@@ -838,7 +838,7 @@ export async function rejectArrivalNotice(
   const users: any[] = await getDomainUsers(foundArrivalNotice?.bizplace, tx)
 
   // send notification to Customer Users
-  if (users?.length) {
+  if (users?.length && context.header?.referer) {
     const receivers: any[] = users.map(user => user.id)
     const msg = {
       title: `Latest status for ${foundArrivalNotice.name}`,

package/server/service/order-product/order-product-mutation.ts

@@ -1,10 +1,29 @@
-import { Domain } from '@things-factory/shell'
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, In } from 'typeorm'
+
+import { Domain } from '@things-factory/shell'
+
 import { OrderProduct } from './order-product'
+import { OrderProductPatch } from './order-product-types'
 
 @Resolver(OrderProduct)
 export class OrderProductMutation {
+  @Directive('@transaction')
+  @Mutation(returns => OrderProduct)
+  async updateOrderProduct(
+    @Ctx() context: any,
+    @Arg('name') name: string,
+    @Arg('patch', type => OrderProductPatch) patch: OrderProductPatch
+  ): Promise<OrderProduct> {
+    const { tx, domain, user } = context.state
+
+    let foundOP: OrderProduct = await tx.getRepository(OrderProduct).findOne({
+      where: { domain, name }
+    })
+
+    return await tx.getRepository(OrderProduct).save({ ...foundOP, ...patch, updater: user })
+  }
+
   @Directive('@transaction')
   @Mutation(returns => Boolean)
   async deleteOrderProduct(@Arg('name') name: string, @Ctx() context: any): Promise<boolean> {

package/server/service/release-good/release-good-mutation.ts

@@ -14,6 +14,7 @@ import {
 import { generateId } from '@things-factory/id-rule-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import { Sftp } from '@things-factory/integration-sftp'
 import { MarketplaceOrder, MarketplaceProductVariation } from '@things-factory/marketplace-base'
 import { sendNotification } from '@things-factory/notification'
 import { Product, ProductBundleSetting } from '@things-factory/product-base'
@@ -133,7 +134,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) { }
+      } catch (error) {}
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -451,9 +452,14 @@ export async function generateReleaseGoodFunction(
         .getRepository(Sellercraft)
         .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
 
+      let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+        where: { domain: bizplace.domain }
+      })
+
       if (sellercraft) {
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
         await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
+      } else if (customerAvailableSftp) {
       } else {
         const refNo: string = releaseGood.refNo
         const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
@@ -890,7 +896,7 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
       .getRawMany()
 
     // send notification to Office Admin Users
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `New Release Order from ${customerBizplace.name}`,
@@ -972,7 +978,7 @@ export async function receiveReleaseGood(name: string, context: any, tx: EntityM
       .getRawMany()
 
     // send notification to Office Admin Users
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `New Release Order from ${customerBizplace.name}`,
@@ -1095,7 +1101,7 @@ export async function rejectReleaseGood(
   // notification logics
   const users: any[] = await getDomainUsers(releaseGood?.bizplace, tx)
 
-  if (users?.length) {
+  if (users?.length && context.header?.referer) {
     const receivers: any[] = users.map(user => user.id)
     const msg = {
       title: `Latest status for ${releaseGood.name}`,
@@ -1290,7 +1296,7 @@ export async function bulkConfirmReleaseGoods(
       .getRawMany()
 
     // send notification to Office Admin Users
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const message = {
         title: `New Release Order from ${customerBizplace.name}`,

package/server/service/release-good/release-good-types.ts

@@ -342,6 +342,9 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   remainUomValue: number
 
+  @Field({ nullable: true })
+  remark: string
+
   @Field({ nullable: true })
   errorMsg: string
 }

package/server/service/return-order/return-order-mutation.ts

@@ -276,7 +276,7 @@ export async function confirmReturnOrder(tx: EntityManager, name: string, contex
     .getRawMany()
 
   // send notification to Office Admin Users
-  if (users?.length) {
+  if (users?.length && context.header?.referer) {
     const receivers: any[] = users.map(user => user.id)
     const msg = {
       title: `New Return Order from ${customerBizplace.name}`,
@@ -340,7 +340,7 @@ export async function receiveReturnOrder(tx: EntityManager, name: string, contex
   // notification logics
   const users: any[] = await getDomainUsers(foundReturnOrder?.bizplace, tx)
 
-  if (users?.length) {
+  if (users?.length && context.header?.referer) {
     const receivers: any[] = users.map(user => user.id)
     const msg = {
       title: `Latest status for ${foundReturnOrder.name}`,
@@ -407,7 +407,7 @@ export async function rejectReturnOrder(
   // notification logics
   const users: any[] = await getDomainUsers(foundReturnOrder?.bizplace, tx)
 
-  if (users?.length) {
+  if (users?.length && context.header?.referer) {
     const receivers: any[] = users.map(user => user.id)
     const msg = {
       title: `Latest status for ${foundReturnOrder.name}`,
@@ -467,7 +467,7 @@ export async function checkReturnOrder(tx: EntityManager, name: string, context:
   // notification logics
   const users: any[] = await getDomainUsers(foundReturnOrder?.bizplace, tx)
 
-  if (users?.length) {
+  if (users?.length && context.header?.referer) {
     const receivers: any[] = users.map(user => user.id)
     const msg = {
       title: `Latest status for ${foundReturnOrder.name}`,

package/server/service/vas-order/vas-order-mutation.ts

@@ -1,10 +1,12 @@
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { EntityManager, In } from 'typeorm'
+
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { sendNotification } from '@things-factory/notification'
 import { Product } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
-import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { EntityManager, In } from 'typeorm'
+
 import { NewOrderVas, NewVasOrder, OrderVas, Vas, VasOrderPatch } from '../'
 import { ORDER_STATUS, ORDER_TYPES, ORDER_VAS_STATUS } from '../../constants'
 import { OrderNoGenerator } from '../../utils'
@@ -154,7 +156,7 @@ export class VasOrderMutation {
       .getRawMany()
 
     // send notification to Office Admin Users
-    if (users?.length) {
+    if (users?.length && context.header?.referer) {
       const receivers: any[] = users.map(user => user.id)
       const msg = {
         title: `New VAS Order from ${customerBizplace.name}`,
@@ -224,7 +226,7 @@ export class VasOrderMutation {
         .getRawMany()
 
       // send notification to Customer Users
-      if (users?.length) {
+      if (users?.length && context.header?.referer) {
         const receivers: any[] = users.map(user => user.id)
         const msg = {
           title: `Latest status for ${vasOrder.name}`,