@things-factory/sales-base 4.3.129 → 4.3.132

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

@@ -3,9 +3,10 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { EntityManager, getRepository, Repository } from 'typeorm'
 
 import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-factory/attachment-base'
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
+import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import { Product, ProductDetail } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
@@ -23,16 +24,11 @@ import {
   ATTACHMENT_TYPE,
   ORDER_NUMBER_RULE_TYPE,
   ORDER_NUMBER_SETTING_KEY,
-  PURCHASE_ORDER_STATUS,
-  ORDER_STATUS
+  ORDER_STATUS,
+  PURCHASE_ORDER_STATUS
 } from '../../constants'
 import { OrderNoGenerator } from '../../utils'
-import {
-  checkArrivedNoticeFunction,
-  confirmArrivalNoticeFunction,
-  generateArrivalNoticeFunction,
-  receiveArrivalNoticeFunction
-} from '../arrival-notice/arrival-notice-mutation'
+import { checkArrivedNoticeFunction, generateArrivalNoticeFunction } from '../arrival-notice/arrival-notice-mutation'
 import { getPurchaseOrderFunction } from './purchase-order-query'
 
 @Resolver(PurchaseOrder)
@@ -132,7 +128,7 @@ export class PurchaseOrderMutation {
 
     const findPurchaseOrder: PurchaseOrder = await getRepository(PurchaseOrder).findOne({
       where: { domain, id },
-      relations: ['orderProducts']
+      relations: ['bizplace', 'bizplace.domain', 'orderProducts']
     })
     // // 1. Reject purchase order
     const rejectedPurchaseOrder: PurchaseOrder = await tx.getRepository(PurchaseOrder).save({
@@ -150,6 +146,22 @@ export class PurchaseOrderMutation {
       })
     )
 
+    const orderSource: string = rejectedPurchaseOrder.source
+    switch (orderSource) {
+      case ApplicationType.XILNEX:
+        const xilnex: Account = await tx
+          .getRepository(Account)
+          .findOne({ where: { domain: findPurchaseOrder.bizplace.domain, status: 'active', platform: 'xilnex' } })
+
+        await AccountingAPI.cancelPurchaseOrder(xilnex, {
+          purchaseOrder: rejectedPurchaseOrder
+        })
+        break
+
+      default:
+        break
+    }
+
     return rejectedPurchaseOrder
   }
 

package/server/service/purchase-order/purchase-order-types.ts

@@ -1,7 +1,9 @@
-import { ObjectRef } from '@things-factory/shell'
 import { Field, InputType, Int, ObjectType } from 'type-graphql'
+
+import { ObjectRef } from '@things-factory/shell'
+
+import { PurchaseOrder, PurchaseOrderOtherCharge, PurchaseOrderOtherChargePatch } from '../'
 import { OrderProductPatch } from '../order-product/order-product-types'
-import { PurchaseOrder, PurchaseOrderOtherChargePatch, PurchaseOrderOtherCharge } from '../'
 
 @ObjectType()
 export class PurchaseOrderList {
@@ -79,6 +81,12 @@ export class NewPurchaseOrder {
 
   @Field({ nullable: true })
   truckNo: string
+
+  @Field({ nullable: true })
+  source: string
+
+  @Field({ nullable: true })
+  orderSourceType: string
 }
 
 @InputType()
@@ -151,4 +159,10 @@ export class PurchaseOrderPatch {
 
   @Field({ nullable: true })
   truckNo: string
+
+  @Field({ nullable: true })
+  source: string
+
+  @Field({ nullable: true })
+  orderSourceType: string
 }

package/server/service/purchase-order/purchase-order.ts

@@ -1,9 +1,4 @@
-import { User } from '@things-factory/auth-base'
-import { Bizplace, ContactPoint } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
-import { Location } from '@things-factory/warehouse-base'
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Attachment } from '@things-factory/attachment-base'
 import {
   Column,
   CreateDateColumn,
@@ -16,6 +11,13 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
+
+import { Attachment } from '@things-factory/attachment-base'
+import { User } from '@things-factory/auth-base'
+import { Bizplace, ContactPoint } from '@things-factory/biz-base'
+import { Domain } from '@things-factory/shell'
+import { Location } from '@things-factory/warehouse-base'
+
 import { ArrivalNotice, OrderProduct, PurchaseOrderOtherCharge, PurchaseOrderOtherChargePatch } from '../'
 import { PURCHASE_ORDER_STATUS } from '../../constants'
 
@@ -64,6 +66,14 @@ export class PurchaseOrder {
   @Field({ nullable: true })
   refNo: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  refNo2: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  refNo3: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   issuedOn: Date
@@ -126,6 +136,14 @@ export class PurchaseOrder {
   @Field({ nullable: true })
   looseItem: boolean
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  source: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  orderSourceType: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   approvedOn: Date

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

@@ -159,7 +159,7 @@ export class ReleaseGoodMutation {
               childTx
             )
           }
-        } catch (error) {}
+        } catch (error) { }
     })
 
     if (errorsCaught.length)
@@ -652,8 +652,8 @@ export async function generateReleaseGoodFunction(
       orderMethod: releaseGood?.orderMethod
         ? releaseGood.orderMethod
         : releaseGood.orderInventories[0]?.inventory?.id
-        ? ORDER_METHOD.SELECT_BY_PALLET
-        : ORDER_METHOD.SELECT_BY_PRODUCT,
+          ? ORDER_METHOD.SELECT_BY_PALLET
+          : ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
       packageId: releaseGood?.packageId,
       storeName: releaseGood?.storeName,
@@ -931,26 +931,6 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
 
   const orderSource: string = foundReleaseGood.source
   switch (orderSource) {
-    case ApplicationType.SELLERCRAFT:
-      if (foundReleaseGood.type == 'b2c' && sellercraft) {
-        try {
-          let rg = await sellercraftCtrl.packOrder(sellercraft, {
-            ...foundReleaseGood,
-            orderProducts: foundOPs
-          })
-          foundReleaseGood = rg
-        } catch (error) {
-          logger.error(
-            `release-good-mutation[confirmReleaseGood]:(data:${JSON.stringify({
-              sellercraft,
-              foundReleaseGood,
-              domain,
-              user
-            })}) ${error} `
-          )
-        }
-      }
-      break
 
     case ApplicationType.MMS:
       // find for any existing marketplace store connections

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

@@ -477,6 +477,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   source: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  orderSourceType: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   manifestedAt: Date

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.