From 27dc57af5c4546d330fd6f5d359b38fd52cd7206 Mon Sep 17 00:00:00 2001 From: fro1991 Date: Tue, 21 Oct 2025 00:18:17 +0700 Subject: [PATCH] update --- src/entity/trx_transactions.ts | 22 ++++++++++++ src/types/trx.ts | 65 +++++----------------------------- 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/src/entity/trx_transactions.ts b/src/entity/trx_transactions.ts index 0d93db4..a008ebd 100644 --- a/src/entity/trx_transactions.ts +++ b/src/entity/trx_transactions.ts @@ -5,6 +5,8 @@ import { TrxCustomerAccount } from "./trx_customer_accounts"; import { TrxReceiver } from "./trx_receivers"; import { TrxCurrencyRate } from "./trx_currency_rates"; import { TrxCustomerCost } from "./trx_customer_costs"; +import { TrxCustomerUser } from "./trx_customer_users"; +import { TrxTransactionType } from "../types/trx"; @Entity("trx_transactions", { schema: "trx" }) export class TrxTransactions { @@ -16,10 +18,19 @@ export class TrxTransactions { }) code: string; + @Column({ + length: 256, + }) + type: TrxTransactionType; + @ManyToOne(() => TrxCustomer, { onDelete: "NO ACTION" }) @JoinColumn() customer: TrxCustomer; + @ManyToOne(() => TrxCustomerUser, { onDelete: "NO ACTION" }) + @JoinColumn() + customer_user: TrxCustomerUser; + @ManyToOne(() => TrxCustomerAccount, { onDelete: "NO ACTION" }) @JoinColumn() customer_account: TrxCustomerAccount; @@ -59,6 +70,17 @@ export class TrxTransactions { }) cost_amount: number; + @Column({ + type: "float8", + }) + total_amount: number; + + @Column({ + nullable: true, + length: 256, + }) + file: string; + @Column() @CreateDateColumn() created_at: Date; diff --git a/src/types/trx.ts b/src/types/trx.ts index 7aedc37..d3942d3 100644 --- a/src/types/trx.ts +++ b/src/types/trx.ts @@ -43,65 +43,18 @@ export enum TrxCurrencyRateType { "deal" = "deal", } -//// - -export enum TrxTransactionStatus { - "verify" = "verify", - "open" = "open", - "progress" = "progress", - "close" = "close", - "reject" = "reject", - "approved" = "approved", - "draft" = "draft", -} - -export enum TrxTransactionTypeStatus { - "deposit" = "deposit", - "transfer" = "transfer", - "clearing" = "clearing", - "rtgs" = "rtgs", -} - -export enum TrxPartnerType { - "company" = "company", - "personal" = "personal", -} - -export enum TrxTransactionTransferStatus { +export enum TrxTransactionType { + "domestic" = "domestic", "remittance" = "remittance", "swift" = "swift", - "domestic" = "domestic", } -export enum TrxTransactionCorrespondentFees { - "sender" = "sender", - "recepient" = "recepient", - "other" = "other", +export enum TrxTransactionStatus { + "draft" = "draft", + "pending_deal" = "pending_deal", + "pending_checker" = "pending_checker", + "pending_signer" = "pending_signer", + "process_setlement" = "process_setlement", } -export enum TrxConfigBankType { - "indonesia" = "indonesia", - "domestic" = "domestic", -} - -export enum TrxActivityType { - "Create" = "C", - "View" = "V", - "Update" = "U", - "Delete" = "D", - "Restore" = "T", - "Download" = "W", - "Login" = "L", - "Logout" = "O", -} - -export enum TrxActivityTypeReverse { - "C" = "Create", - "V" = "View", - "U" = "Update", - "D" = "Delete", - "T" = "Restore", - "W" = "Download", - "L" = "Login", - "O" = "Logout", -} +////