modify payment entity

backend/package-lock.json

@@ -31,7 +31,8 @@
         "pg": "^8.13.0",
         "reflect-metadata": "^0.2.0",
         "rxjs": "^7.8.1",
-        "typeorm": "^0.3.20"
+        "typeorm": "^0.3.20",
+        "vnpay": "^1.6.0"
       },
       "devDependencies": {
         "@nestjs/cli": "^10.0.0",
@@ -7138,6 +7139,27 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.46",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz",
+      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
+      "license": "MIT",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -9594,6 +9616,7 @@
       "version": "0.3.20",
       "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz",
       "integrity": "sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==",
+      "license": "MIT",
       "dependencies": {
         "@sqltools/formatter": "^1.2.5",
         "app-root-path": "^3.1.0",
@@ -9878,6 +9901,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/vnpay": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/vnpay/-/vnpay-1.6.0.tgz",
+      "integrity": "sha512-+y1tdsJ1ClPC0cVGCG6v5lDi5rZZSzfUe1I670d4tqzxvHdgPbgmrYuH4LpLOEuiFs0Nwum9Thw7DfWgbztjBA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "moment-timezone": "^0.5.43"
+      }
+    },
     "node_modules/walker": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",

backend/package.json

@@ -47,7 +47,8 @@
     "pg": "^8.13.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
-    "typeorm": "^0.3.20"
+    "typeorm": "^0.3.20",
+    "vnpay": "^1.6.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.0.0",

backend/src/common/enums/PaymentMethod.enum.ts

@@ -1,5 +1,5 @@
 export enum PaymentMethod {
-  CASH = 0,
-  CARD = 1,
-  ONLINE_PAYMENT = 2,
+  CASH = "CASH",
+  CARD = "CARD",
+  ONLINE_PAYMENT = "ONLINE_PAYMENT",
 }

backend/src/common/enums/VnpCardType.enum.ts

@@ -0,0 +1,5 @@
+export enum VnpCardType {
+	ATM = "ATM",
+	QRCODE = "QRCODE",
+	None = "None"
+}

backend/src/entities/payment.entity.ts

@@ -8,6 +8,7 @@ import {
 } from 'typeorm';
 import { OrderEntity } from './order.entity.js';
 import { PaymentMethod } from '../common/enums/PaymentMethod.enum.js';
+import { VnpCardType } from '../common/enums/VnpCardType.enum.js';
 
 @Entity('payments')
 export class PaymentEntity extends BaseEntity {
@@ -17,9 +18,36 @@ export class PaymentEntity extends BaseEntity {
   @OneToOne(() => OrderEntity, (a) => a.payment)
   order: Relation<OrderEntity>;
 
-  @Column({ default: 0 })
-  payment_method: number; // E.g., 'Cash', 'Credit Card', 'Online Payment'
+  @Column({ type: 'enum', enum: PaymentMethod, default: "CASH" })
+  payment_method: PaymentMethod; // E.g., 'Cash', 'Credit Card', 'Online Payment'
 
   @Column()
-  value: number;
+  vnp_amount: number
+
+  @Column()
+  vnp_bank_code: string
+
+  @Column()
+  vnp_bank_tran_no:string
+  
+  @Column({ type: 'enum', enum: VnpCardType, default: "None"})
+  vnp_card_type: VnpCardType //  E.g., 'ATM', 'QRCODE', 'None'
+
+  @Column()
+  vnp_order_info: string
+
+  @Column()
+  vnp_paydate: string
+
+  @Column()
+  vnp_response_code: number
+
+  @Column()
+  vnp_transaction_no: string
+
+  @Column()
+  vnp_transaction_status: number
+
+  @Column()
+  vnp_securehash: string
 }

backend/src/migrations/1730647727322-modify_payment_entity.ts

@@ -0,0 +1,42 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ModifyPaymentEntity1730647727322 implements MigrationInterface {
+    name = 'ModifyPaymentEntity1730647727322'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "value"`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_amount" integer NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_code" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_tran_no" character varying NOT NULL`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_vnp_card_type_enum" AS ENUM('ATM', 'QRCODE', 'None')`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_card_type" "public"."payments_vnp_card_type_enum" NOT NULL DEFAULT 'None'`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_order_info" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_paydate" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_response_code" integer NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_no" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_status" integer NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_securehash" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
+        await queryRunner.query(`CREATE TYPE "public"."payments_payment_method_enum" AS ENUM('CASH', 'CARD', 'ONLINE_PAYMENT')`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" "public"."payments_payment_method_enum" NOT NULL DEFAULT 'CASH'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "payment_method"`);
+        await queryRunner.query(`DROP TYPE "public"."payments_payment_method_enum"`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "payment_method" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_securehash"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_status"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_no"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_response_code"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_paydate"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_order_info"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_card_type"`);
+        await queryRunner.query(`DROP TYPE "public"."payments_vnp_card_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_tran_no"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_code"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_amount"`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "value" integer NOT NULL`);
+    }
+
+}