Merge remote-tracking branch 'origin/main'

Dockerfile

@@ -7,6 +7,8 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY backend/package*.json ./
 
+RUN npm install -g npm@10.9.0
+
 # Install dependencies
 RUN npm install
 

backend/.env.example

@@ -4,4 +4,9 @@ DB_USER='pbl6_jw8s_user'
 DB_PASSWORD=''
 DB_NAME='pbl6_jw8s'
 JWT_KEY= ''
-DB_SSL_ENABLED=true # default is true to connect with remote database
+DB_SSL_ENABLED=true # default is true to connect with remote database
+#Payment
+VNP_TMNCODE = ''
+VNP_HASHSECRET = ''
+VNP_URL = ''
+VNP_RETURNURL = ''

backend/package.json

@@ -1,91 +1,95 @@
-{
-  "type": "module",
-  "name": "backend",
-  "version": "0.0.1",
-  "description": "",
-  "author": "",
-  "private": true,
-  "license": "UNLICENSED",
-  "scripts": {
-    "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typeorm": "typeorm-ts-node-esm",
-    "db:migrate:generate": "npm run typeorm migration:generate -- -d ./src/config/typeorm.ts",
-    "db:migrate:up": "npm run typeorm migration:run -- -d ./src/config/typeorm.ts",
-    "db:migrate:down": "npm run typeorm migration:revert -- -d ./src/config/typeorm.ts"
-  },
-  "dependencies": {
-    "@nestjs/common": "^10.0.0",
-    "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^10.0.0",
-    "@nestjs/jwt": "^10.2.0",
-    "@nestjs/mapped-types": "*",
-    "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^10.0.0",
-    "@nestjs/typeorm": "^10.0.2",
-    "bcrypt": "^5.1.1",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
-    "dotenv": "^16.4.5",
-    "mysql2": "^3.11.3",
-    "nest-access-control": "^3.1.0",
-    "nestjs-paginate": "^9.3.0",
-    "passport": "^0.7.0",
-    "passport-jwt": "^4.0.1",
-    "passport-local": "^1.0.0",
-    "pg": "^8.13.0",
-    "reflect-metadata": "^0.2.0",
-    "rxjs": "^7.8.1",
-    "typeorm": "^0.3.20"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "^10.0.0",
-    "@nestjs/schematics": "^10.0.0",
-    "@nestjs/testing": "^10.0.0",
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/node": "^20.3.1",
-    "@types/supertest": "^6.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
-    "eslint": "^8.42.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "jest": "^29.5.0",
-    "prettier": "^3.0.0",
-    "source-map-support": "^0.5.21",
-    "supertest": "^7.0.0",
-    "ts-jest": "^29.1.0",
-    "ts-loader": "^9.4.3",
-    "ts-node": "^10.9.2",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.3"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  }
-}
+{
+  "type": "module",
+  "name": "backend",
+  "version": "0.0.1",
+  "description": "",
+  "author": "",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "build": "nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "start": "nest start",
+    "start:dev": "nest start --watch",
+    "start:debug": "nest start --debug --watch",
+    "start:prod": "node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "typeorm": "typeorm-ts-node-esm",
+    "db:migrate:generate": "npm run typeorm migration:generate -- -d ./src/config/typeorm.ts",
+    "db:migrate:up": "npm run typeorm migration:run -- -d ./src/config/typeorm.ts",
+    "db:migrate:down": "npm run typeorm migration:revert -- -d ./src/config/typeorm.ts"
+  },
+  "dependencies": {
+    "@nestjs/common": "^10.0.0",
+    "@nestjs/config": "^3.2.3",
+    "@nestjs/core": "^10.0.0",
+    "@nestjs/jwt": "^10.2.0",
+    "@nestjs/mapped-types": "*",
+    "@nestjs/passport": "^10.0.3",
+    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/typeorm": "^10.0.2",
+    "bcrypt": "^5.1.1",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+    "dateformat": "^5.0.3",
+    "dotenv": "^16.4.5",
+    "mysql2": "^3.11.3",
+    "nest-access-control": "^3.1.0",
+    "nestjs-paginate": "^9.3.0",
+    "passport": "^0.7.0",
+    "passport-jwt": "^4.0.1",
+    "passport-local": "^1.0.0",
+    "pg": "^8.13.0",
+    "reflect-metadata": "^0.2.0",
+    "rxjs": "^7.8.1",
+    "typeorm": "^0.3.20",
+    "vnpay": "^1.6.0"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^10.0.0",
+    "@nestjs/schematics": "^10.0.0",
+    "@nestjs/testing": "^10.0.0",
+    "@types/dateformat": "^5.0.2",
+    "@types/express": "^4.17.17",
+    "@types/jest": "^29.5.2",
+    "@types/multer": "^1.4.12",
+    "@types/node": "^20.3.1",
+    "@types/supertest": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "eslint": "^8.42.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "jest": "^29.5.0",
+    "prettier": "^3.0.0",
+    "source-map-support": "^0.5.21",
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.1.0",
+    "ts-loader": "^9.4.3",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.1.3"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}

backend/src/app.module.ts

@@ -1,43 +1,45 @@
-import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
-import { AppController } from './app.controller.js';
-import { AppService } from './app.service.js';
-import { ConfigModule } from '@nestjs/config';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { configuration } from './config/config.js';
-import { DatabaseConfigService } from './config/database.js';
-import { AppLoggerMiddleware } from './common/middlewares/app-logger.middleware.js';
-import { DeviceInfoMiddleware } from './common/middlewares/device-info.middleware.js';
-import { UserModule } from './modules/user/user.module.js';
-import { BranchModule } from './modules/branch/branch.module.js';
-import { AuthenticationModule } from './modules/authentication/authentication.module.js';
-import { MenuItemModule } from './modules/menu-item/menu-item.module.js';
-import { FeedsModule } from './modules/feeds/feeds.module.js';
-import { OrderModule } from './modules/order/order.module.js';
-import { BranchMenusModule } from './modules/branch-menus/branch-menus.module.js';
-@Module({
-  imports: [
-    ConfigModule.forRoot({
-      isGlobal: true,
-      load: [configuration],
-    }),
-    TypeOrmModule.forRootAsync({
-      imports: [ConfigModule],
-      useClass: DatabaseConfigService,
-    }),
-    UserModule,
-    BranchModule,
-    AuthenticationModule,
-    MenuItemModule,
-    FeedsModule,
-    OrderModule,
-    BranchMenusModule,
-  ],
-  controllers: [AppController],
-  providers: [AppService],
-})
-export class AppModule implements NestModule {
-  configure(consumer: MiddlewareConsumer): void {
-    consumer.apply(AppLoggerMiddleware).forRoutes('*');
-    consumer.apply(DeviceInfoMiddleware).forRoutes('*');
-  }
-}
+import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
+import { AppController } from './app.controller.js';
+import { AppService } from './app.service.js';
+import { ConfigModule } from '@nestjs/config';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { configuration } from './config/config.js';
+import { DatabaseConfigService } from './config/database.js';
+import { AppLoggerMiddleware } from './common/middlewares/app-logger.middleware.js';
+import { DeviceInfoMiddleware } from './common/middlewares/device-info.middleware.js';
+import { UserModule } from './modules/user/user.module.js';
+import { BranchModule } from './modules/branch/branch.module.js';
+import { AuthenticationModule } from './modules/authentication/authentication.module.js';
+import { MenuItemModule } from './modules/menu-item/menu-item.module.js';
+import { FeedsModule } from './modules/feeds/feeds.module.js';
+import { OrderModule } from './modules/order/order.module.js';
+import { BranchMenusModule } from './modules/branch-menus/branch-menus.module.js';
+import { PaymentModule } from './payment/payment.module.js';
+@Module({
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [configuration],
+    }),
+    TypeOrmModule.forRootAsync({
+      imports: [ConfigModule],
+      useClass: DatabaseConfigService,
+    }),
+    UserModule,
+    BranchModule,
+    AuthenticationModule,
+    MenuItemModule,
+    FeedsModule,
+    OrderModule,
+    BranchMenusModule,
+		PaymentModule,
+  ],
+  controllers: [AppController],
+  providers: [AppService],
+})
+export class AppModule implements NestModule {
+  configure(consumer: MiddlewareConsumer): void {
+    consumer.apply(AppLoggerMiddleware).forRoutes('*');
+    consumer.apply(DeviceInfoMiddleware).forRoutes('*');
+  }
+}

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

@@ -1,6 +1,6 @@
 export enum MenuItemType {
-  MON_CHINH = 'monchinh', // món chính
-  TRANG_MIENG = 'trangmieng', // tráng miệng
-  GIAI_KHAT = 'giaikhat', // giải khát
-  KHAC = 'khac', // khác
+  KHAC = 0, // khác
+  MON_CHINH = 1, // món chính
+  GIAI_KHAT = 2, // giải khát
+  TRANG_MIENG = 3, // tráng miệng
 }

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

@@ -1,7 +1,7 @@
 export enum OrderStatus {
-  PENDING = 'pending', // KH đặt hàng đã thanh toán online, nhân viên chưa xác nhận <online>
-  CONFIRMED = 'confirmed', // nhân viên xác nhận và chuyển sang trạng thái <online>
-  PREPARING = 'preparing', // nhân viên xác nhận và sang trạng thái preparing này ngay lập tức <online/offline>
-  DELIVERING = 'delivering', // dang giao hàng <online>
-  DONE = 'done', // <online, offline>
+  PENDING = 0, // Khách hàng đặt hàng chưa thanh toán <online>
+  ONLINE_PAID = 1, // Khách hàng đã thanh toán và được nhân viên xác nhận <online>
+  PREPARING = 2, // nhân viên xác nhận và sang trạng thái preparing <online/offline>
+  DELIVERING = 3, // dang giao hàng <online>
+  DONE = 4, // <online, offline>
 }

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

@@ -1,5 +1,5 @@
 export enum OrderType {
-  TAKE_AWAY = 'take_away',
-  OFFLINE = 'offline',
-  ONLINE = 'online',
+  TAKE_AWAY = 0,
+  OFFLINE = 1,
+  ONLINE = 2,
 }

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

@@ -1,5 +1,5 @@
 export enum PaymentMethod {
-  CASH = 'cash',
-  CARD = 'card',
-  ONLINE_PAYMENT = 'online_payment',
+  CASH = 0,
+  CARD = 1,
+  ONLINE_PAYMENT = 2,
 }

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

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

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

@@ -1,8 +1,8 @@
 export enum Role {
-    CUSTOMER = 'CUSTOMER',
-    ADMIN = 'ADMIN',
-    BRANCH_MANAGER = 'BRANCH_MANAGER',
-    AREA_MANAGER = 'AREA_MANAGER',
-    STAFF = 'STAFF',
-    SHIPPER = 'SHIPPER'
-  }
+  CUSTOMER = 'CUSTOMER',
+  ADMIN = 'ADMIN',
+  BRANCH_MANAGER = 'BRANCH_MANAGER',
+  AREA_MANAGER = 'AREA_MANAGER',
+  STAFF = 'STAFF',
+  SHIPPER = 'SHIPPER',
+}

backend/src/common/interfaces/jwt-payload.interface.ts

@@ -0,0 +1,5 @@
+interface JwtPayload {
+  sub: string; // id người dùng
+  role: string; // quyền người dùng
+  username: string;
+}

backend/src/config/config.ts

@@ -8,5 +8,10 @@ export const configuration = () => {
     'db.name': process.env.DB_NAME,
     'db.slow_limit': Number(process.env.DB_SLOW_LIMIT) || 500, // ms
     'db.ssl_enabled': process.env.DB_SSL_ENABLED,
+    // payment config
+    'vnp_TmnCode': process.env.VNP_TMNCODE,
+    'vnp_HashSecret': process.env.VNP_HASHSECRET,
+    'vnp_Url': process.env.VNP_URL,
+    'vnp_ReturnUrl': process.env.VNP_RETURNURL,
   };
 };

backend/src/entities/branch-menu.entity.ts

@@ -28,6 +28,9 @@ export class BranchMenuEntity extends BaseEntity {
   @Column({ default: true })
   is_open: boolean;
 
+  @Column({ default: 0 })
+  sold_count: number;
+
   @ManyToOne(() => BranchEntity, (a) => a.menu_items)
   @JoinColumn({ name: 'branch_id' })
   branch: Relation<BranchEntity>;

backend/src/entities/branch.entity.ts

@@ -2,6 +2,7 @@ import {
   BaseEntity,
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   ManyToOne,
   OneToMany,
@@ -11,19 +12,23 @@ import {
 } from 'typeorm';
 import { UserEntity } from './user.entity.js';
 import { BranchMenuEntity } from './branch-menu.entity.js';
+import { ReceiptEntity } from './receipt.entity.js';
 
 @Entity('branches')
 export class BranchEntity extends BaseEntity {
   @PrimaryColumn()
   id: string;
 
-  @Column()
+  @Column({ nullable: true })
   name: string;
 
-  @Column()
+  @Column({ nullable: true })
+  image_url: string;
+
+  @Column({ nullable: true })
   location: string;
 
-  @Column()
+  @Column({ nullable: true })
   phone_number: string;
 
   @ManyToOne(() => UserEntity, (user) => user.branches)
@@ -32,6 +37,12 @@ export class BranchEntity extends BaseEntity {
   @OneToMany(() => BranchMenuEntity, (a) => a.branch)
   menu_items: Relation<BranchMenuEntity>[];
 
+  @OneToMany(() => ReceiptEntity, (a) => a.branch)
+  receipts: Relation<ReceiptEntity>[];
+
   @CreateDateColumn()
   create_at: Date;
+
+  @DeleteDateColumn()
+  delete_at: Date;
 }

backend/src/entities/feed.entity.ts

@@ -1,4 +1,11 @@
-import { Entity, Column, BaseEntity, PrimaryGeneratedColumn, CreateDateColumn } from 'typeorm';
+import {
+  Entity,
+  Column,
+  BaseEntity,
+  PrimaryGeneratedColumn,
+  CreateDateColumn,
+  DeleteDateColumn,
+} from 'typeorm';
 
 @Entity('feeds')
 export class FeedEntity extends BaseEntity {
@@ -19,4 +26,7 @@ export class FeedEntity extends BaseEntity {
 
   @CreateDateColumn()
   create_at: Date;
+
+  @DeleteDateColumn()
+  delete_at: Date;
 }

backend/src/entities/menu-item.entity.ts

@@ -2,6 +2,7 @@ import {
   BaseEntity,
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   OneToMany,
   PrimaryColumn,
@@ -21,8 +22,8 @@ export class MenuItemEntity extends BaseEntity {
   @Column({ nullable: true })
   image_url: string;
 
-  @Column({ type: 'enum', enum: MenuItemType, default: 'khac' })
-  item_type: MenuItemType;
+  @Column({ default: 0 })
+  item_type: number;
 
   @Column()
   description: string;
@@ -35,4 +36,7 @@ export class MenuItemEntity extends BaseEntity {
 
   @CreateDateColumn()
   create_at: Date;
+
+  @DeleteDateColumn()
+  delete_at: Date;
 }

backend/src/entities/order.entity.ts

@@ -2,6 +2,7 @@ import {
   BaseEntity,
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   JoinColumn,
   ManyToOne,
@@ -9,6 +10,7 @@ import {
   OneToOne,
   PrimaryGeneratedColumn,
   Relation,
+  UpdateDateColumn,
 } from 'typeorm';
 import { BranchEntity } from './branch.entity.js';
 import { UserEntity } from './user.entity.js';
@@ -46,17 +48,20 @@ export class OrderEntity extends BaseEntity {
   @Column({ nullable: true })
   table_number: number;
 
+  @Column({ nullable: true })
+  note: string;
+
+  @Column({ nullable: true })
+  rating: number;
+
   @Column()
   total_value: number;
 
-  @CreateDateColumn()
-  create_at: Date;
-
-  @Column({ type: 'enum', enum: OrderType, default: OrderType.ONLINE })
-  order_type: OrderType;
+  @Column({ default: 0 })
+  order_type: number;
 
-  @Column({ type: 'enum', enum: OrderStatus, default: OrderStatus.PENDING })
-  order_status: OrderStatus;
+  @Column({ default: 0 })
+  order_status: number;
 
   @OneToMany(() => OrderItemEntity, (a) => a.order)
   order_items: Relation<OrderItemEntity>[];
@@ -67,4 +72,13 @@ export class OrderEntity extends BaseEntity {
   @OneToOne(() => PaymentEntity, (a) => a.order)
   @JoinColumn({ name: 'payment_id' })
   payment: Relation<PaymentEntity>;
+
+  @CreateDateColumn()
+  created_at: Date;
+
+  @UpdateDateColumn()
+  updated_at: Date;
+
+  @DeleteDateColumn()
+  deleted_at: Date;
 }

backend/src/entities/payment.entity.ts

@@ -2,15 +2,11 @@ import {
   BaseEntity,
   Column,
   Entity,
-  JoinColumn,
-  ManyToOne,
   OneToOne,
   PrimaryGeneratedColumn,
   Relation,
 } from 'typeorm';
-import { BranchMenuEntity } from './branch-menu.entity.js';
 import { OrderEntity } from './order.entity.js';
-import { PaymentMethod } from '../common/enums/PaymentMethod.enum.js';
 
 @Entity('payments')
 export class PaymentEntity extends BaseEntity {
@@ -20,9 +16,33 @@ export class PaymentEntity extends BaseEntity {
   @OneToOne(() => OrderEntity, (a) => a.payment)
   order: Relation<OrderEntity>;
 
-  @Column({ type: 'enum', enum: PaymentMethod, default: PaymentMethod.CASH })
-  payment_method: PaymentMethod; // E.g., 'Cash', 'Credit Card', 'Online Payment'
+  @Column({ default: 0 })
+  payment_method: number; 
 
   @Column()
-  value: number;
+  vnp_amount: number
+
+  @Column({ nullable: true })
+  vnp_bank_code: string
+
+  @Column({ nullable: true })
+  vnp_bank_tran_no:string
+  
+  @Column({ default: 0})
+  vnp_card_type: number
+
+  @Column({ nullable: true })
+  vnp_order_info: string //Nội dung giao dịch
+
+  @Column({ nullable: true })
+  vnp_paydate: string
+
+  @Column({ nullable: true })
+  vnp_response_code: number
+
+  @Column({ nullable: true })
+  vnp_transaction_no: string
+
+  @Column({ nullable: true })
+  vnp_transaction_status: number
 }

backend/src/entities/receipt.entity.ts

@@ -0,0 +1,57 @@
+import {
+  BaseEntity,
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  Relation,
+} from 'typeorm';
+import { BranchEntity } from './branch.entity.js';
+import { UserEntity } from './user.entity.js';
+
+@Entity('receipts')
+export class ReceiptEntity extends BaseEntity {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  branch_id: string;
+
+  @ManyToOne(() => BranchEntity, (a) => a.receipts)
+  @JoinColumn({ name: 'branch_id' })
+  branch: Relation<BranchEntity>;
+
+  @Column({ default: 0 })
+  income: number;
+
+  @Column({ default: 0 })
+  spend: number;
+
+  @Column({ nullable: true })
+  description: string;
+
+  @Column({ default: 0 })
+  type: number;
+
+  @Column({ default: 0 })
+  sub_type: number;
+
+  @Column({ nullable: true })
+  sender_id: string;
+
+  @Column({ nullable: true })
+  receiver_id: string;
+
+  @ManyToOne(() => UserEntity, (a) => a.out_receipts)
+  @JoinColumn({ name: 'sender_id' })
+  sender: Relation<UserEntity>;
+
+  @ManyToOne(() => UserEntity, (a) => a.in_receipts)
+  @JoinColumn({ name: 'receiver_id' })
+  receiver: Relation<UserEntity>;
+
+  @CreateDateColumn()
+  created_at: Date;
+}

backend/src/entities/user.entity.ts

@@ -12,6 +12,7 @@ import {
 import { BranchEntity } from './branch.entity.js';
 import { IsOptional } from 'class-validator';
 import { Role } from '../common/enums/role.enum.js';
+import { ReceiptEntity } from './receipt.entity.js';
 
 @Entity('users')
 export class UserEntity extends BaseEntity {
@@ -37,19 +38,22 @@ export class UserEntity extends BaseEntity {
 
   @Column({ type: 'enum', enum: Role, default: 'CUSTOMER' })
   role: Role;
-  
+
   @Column()
   hash_password: string;
 
-  @IsOptional()
   @Column({ default: true })
   is_valid: boolean;
 
-  @IsOptional()
   @CreateDateColumn()
   create_at: Date;
 
-  @IsOptional()
   @OneToMany(() => BranchEntity, (branch) => branch.owner)
   branches: Relation<BranchEntity>[];
+
+  @OneToMany(() => ReceiptEntity, (receipt) => receipt.sender)
+  in_receipts: Relation<ReceiptEntity>[];
+
+  @OneToMany(() => ReceiptEntity, (receipt) => receipt.receiver)
+  out_receipts: Relation<ReceiptEntity>[];
 }

backend/src/migrations/1730547520878-AddReceipt.ts

@@ -0,0 +1,30 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddReceipt1730547520878 implements MigrationInterface {
+    name = 'AddReceipt1730547520878'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "receipts" ("id" SERIAL NOT NULL, "branch_id" character varying NOT NULL, "income" integer NOT NULL DEFAULT '0', "spend" integer NOT NULL DEFAULT '0', "description" character varying, "type" integer NOT NULL DEFAULT '0', "sub_type" integer NOT NULL DEFAULT '0', "sender_id" uuid, "receiver_id" uuid, "created_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_5e8182d7c29e023da6e1ff33bfe" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "branches" ADD "image_url" character varying`);
+        await queryRunner.query(`ALTER TABLE "branch_menu" ADD "sold_count" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "name" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "location" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "phone_number" DROP NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_82e9dee911c0e7393154d1d98ad" FOREIGN KEY ("branch_id") REFERENCES "branches"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_eda4c4e486a25beef4dc82a41d5" FOREIGN KEY ("sender_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "receipts" ADD CONSTRAINT "FK_366c3d3cf125da97552f40001a1" FOREIGN KEY ("receiver_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_366c3d3cf125da97552f40001a1"`);
+        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_eda4c4e486a25beef4dc82a41d5"`);
+        await queryRunner.query(`ALTER TABLE "receipts" DROP CONSTRAINT "FK_82e9dee911c0e7393154d1d98ad"`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "phone_number" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "location" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branches" ALTER COLUMN "name" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "branch_menu" DROP COLUMN "sold_count"`);
+        await queryRunner.query(`ALTER TABLE "branches" DROP COLUMN "image_url"`);
+        await queryRunner.query(`DROP TABLE "receipts"`);
+    }
+
+}

backend/src/migrations/1730549959767-RemoveEnums.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RemoveEnums1730549959767 implements MigrationInterface {
+    name = 'RemoveEnums1730549959767'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
+        await queryRunner.query(`DROP TYPE "public"."menu_items_item_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" integer NOT NULL DEFAULT '0'`);
+        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 "orders" DROP COLUMN "order_type"`);
+        await queryRunner.query(`DROP TYPE "public"."orders_order_type_enum"`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_type" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_status"`);
+        await queryRunner.query(`DROP TYPE "public"."orders_order_status_enum"`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_status" integer NOT NULL DEFAULT '0'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_status"`);
+        await queryRunner.query(`CREATE TYPE "public"."orders_order_status_enum" AS ENUM('pending', 'confirmed', 'preparing', 'delivering', 'done')`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_status" "public"."orders_order_status_enum" NOT NULL DEFAULT 'pending'`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "order_type"`);
+        await queryRunner.query(`CREATE TYPE "public"."orders_order_type_enum" AS ENUM('take_away', 'offline', 'online')`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "order_type" "public"."orders_order_type_enum" NOT NULL DEFAULT 'online'`);
+        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'`);
+        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
+        await queryRunner.query(`CREATE TYPE "public"."menu_items_item_type_enum" AS ENUM('monchinh', 'trangmieng', 'giaikhat', 'khac')`);
+        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" "public"."menu_items_item_type_enum" NOT NULL DEFAULT 'khac'`);
+    }
+
+}

backend/src/migrations/1730651201156-modify_payment.ts

@@ -0,0 +1,32 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ModifyPayment1730651201156 implements MigrationInterface {
+    name = 'ModifyPayment1730651201156'
+
+    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`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_tran_no" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_card_type" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_order_info" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_paydate" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_response_code" integer`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_no" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_status" integer`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        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(`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`);
+    }
+
+}

backend/src/migrations/1730865796585-AddBranchAndOrderFields.ts

@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddBranchAndOrderFields1730865796585 implements MigrationInterface {
+    name = 'AddBranchAndOrderFields1730865796585'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "feeds" ADD "delete_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "menu_items" ADD "delete_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "branches" ADD "delete_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "note" character varying`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "rating" integer`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "rating"`);
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "note"`);
+        await queryRunner.query(`ALTER TABLE "branches" DROP COLUMN "delete_at"`);
+        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "delete_at"`);
+        await queryRunner.query(`ALTER TABLE "feeds" DROP COLUMN "delete_at"`);
+    }
+
+}

backend/src/migrations/1730895089788-UpdateOrderFieldTime.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateOrderFieldTime1730895089788 implements MigrationInterface {
+  name = 'UpdateOrderFieldTime1730895089788';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "create_at"`);
+    await queryRunner.query(
+      `ALTER TABLE "orders" ADD "created_at" TIMESTAMP NOT NULL DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "orders" ADD "updated_at" TIMESTAMP NOT NULL DEFAULT now()`,
+    );
+    await queryRunner.query(`ALTER TABLE "orders" ADD "deleted_at" TIMESTAMP`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "orders" ADD "create_at" TIMESTAMP NOT NULL DEFAULT now()`,
+    );
+    await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "deleted_at"`);
+    await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "updated_at"`);
+    await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "created_at"`);
+  }
+}

backend/src/modules/authentication/authentication.service.ts

@@ -28,7 +28,7 @@ export class AuthenticationService {
     if (!compare) {
       throw new UnauthorizedException("Wrong password");
     }
-    const payload = { sub: user.id, username: user.full_name, roles: user.role};
+    const payload = { sub: user.id, username: user.full_name, role: user.role};
     return {
       access_token: await this.jwtService.signAsync(payload),
     };

backend/src/modules/authentication/authorization/roles.guard.ts

@@ -17,6 +17,6 @@ export class RolesGuard implements CanActivate {
       return true;
     }
     const { user } = context.switchToHttp().getRequest();
-    return requiredRoles.some((role) => user.roles.includes(role));
+    return requiredRoles.some((role) => user.role.includes(role));
   }
 }

backend/src/modules/branch-menus/branch-menus.service.ts

@@ -4,7 +4,12 @@ import { UpdateBranchMenuDto } from './dto/update-branch-menu.dto.js';
 import { BranchService } from '../branch/branch.service.js';
 import { MenuItemService } from '../menu-item/menu-item.service.js';
 import { BranchMenuEntity } from '../../entities/branch-menu.entity.js';
-import { paginate, PaginateConfig, PaginateQuery } from 'nestjs-paginate';
+import {
+  FilterOperator,
+  paginate,
+  PaginateConfig,
+  PaginateQuery,
+} from 'nestjs-paginate';
 import { isUUID } from 'class-validator';
 
 @Injectable()
@@ -36,12 +41,18 @@ export class BranchMenusService {
     const paginateConfig: PaginateConfig<BranchMenuEntity> = {
       sortableColumns: ['id', 'branch_id', 'menu_id', 'description'],
       nullSort: 'last',
-      defaultSortBy: [['id', 'DESC']],
+      defaultSortBy: [['menu_item.item_type', 'ASC']],
       searchableColumns: ['description'],
       filterableColumns: {
-        // price: [],
-        // item_type: [FilterOperator.EQ],
+        'menu_item.price': [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        'menu_item.item_type': [FilterOperator.EQ, FilterOperator.IN],
       },
+      relations: ['menu_item'],
     };
     return paginate(
       query,

backend/src/modules/branch/branch.controller.ts

@@ -22,6 +22,11 @@ export class BranchController {
     return this.branchService.create(createBranchDto);
   }
 
+  @Post(':id/restore')
+  restore(@Param('id') id: string) {
+    return this.branchService.restore(id);
+  }
+
   @Get()
   async findAll() {
     return this.branchService.findAll();
@@ -42,7 +47,7 @@ export class BranchController {
 
   @Delete(':id')
   async remove(@Param('id') id: string) {
-    return this.branchService.remove(id);
+    return this.branchService.softRemove(id);
   }
 
   @Post(':id/menu-items')

backend/src/modules/branch/branch.service.ts

@@ -46,8 +46,14 @@ export class BranchService {
     return await branch.save();
   }
 
-  async remove(id: string) {
-    let menuItem = await this.getBranchOrError(id);
-    return await menuItem.remove();
+  async softRemove(id: string) {
+    let branch = await this.getBranchOrError(id);
+    return await branch.softRemove();
+  }
+
+  async restore(id: string) {
+    let result = await BranchEntity.getRepository().restore(id);
+    let branch = await BranchEntity.findOneBy({ id });
+    return branch;
   }
 }

backend/src/modules/branch/dto/create-branch.dto.ts

@@ -7,6 +7,9 @@ export class CreateBranchDto {
   @IsString()
   name: string;
 
+  @IsString()
+  image_url: string;
+
   @IsString()
   location: string;
 

backend/src/modules/branch/dto/update-branch.dto.ts

@@ -5,6 +5,10 @@ export class UpdateBranchDto {
   @IsOptional()
   name?: string;
 
+  @IsString()
+  @IsOptional()
+  image_url?: string;
+
   @IsString()
   @IsOptional()
   location?: string;

backend/src/modules/menu-item/dto/create-menu-item.dto.ts

@@ -10,9 +10,9 @@ export class CreateMenuItemDto {
   @IsUrl()
   image_url: string;
 
-  @IsString()
+  @IsNumber()
   @IsOptional()
-  item_group_id?: string;
+  item_type?: number;
 
   @IsString()
   @IsOptional()

backend/src/modules/menu-item/dto/update-menu-item.dto.ts

@@ -9,9 +9,9 @@ export class UpdateMenuItemDto {
   @IsOptional()
   image_url: string;
 
-  @IsString()
+  @IsNumber()
   @IsOptional()
-  item_group_id?: string;
+  item_type?: number;
 
   @IsString()
   @IsOptional()

backend/src/modules/order/dto/create-order.dto.ts

@@ -16,8 +16,12 @@ export class CreateOrderDto {
   @IsNumber()
   table_number?: number;
 
-  @IsEnum(OrderType)
-  order_type: OrderType;
+  @IsOptional()
+  @IsString()
+  note?: string;
+
+  @IsNumber()
+  order_type: number;
 
   @IsArray()
   @ValidateNested()

backend/src/modules/order/dto/update-order.dto.ts

@@ -0,0 +1,14 @@
+import { IsArray, IsNumber, IsOptional, ValidateNested } from 'class-validator';
+import { OrderItemsDto } from './order-items.dto.js';
+import { Type } from 'class-transformer';
+
+export class UpdateOrderDto {
+  @IsOptional()
+  @IsNumber()
+  table_number?: number;
+
+  @IsArray()
+  @ValidateNested()
+  @Type(() => OrderItemsDto)
+  order_items: OrderItemsDto[];
+}

backend/src/modules/order/order.controller.ts

@@ -11,9 +11,12 @@ import {
 import { OrderService } from './order.service.js';
 import { CreateOrderDto } from './dto/create-order.dto.js';
 import { Role } from '../../common/enums/role.enum.js';
+import { paginate, Paginate, PaginateQuery } from 'nestjs-paginate';
+import { Roles } from '../authentication/authorization/roles.decorator.js';
+import { UpdateOrderDto } from './dto/update-order.dto.js';
 
 @Controller('branchs/:branchId/orders')
-export class OrderController {
+export class BranchOrderController {
   constructor(private readonly orderService: OrderService) {}
 
   @Post()
@@ -23,15 +26,16 @@ export class OrderController {
     @Body() createOrderDto: CreateOrderDto,
   ) {
     const userId = req['user'].sub;
-    const role = req['user'].roles;
+    const role = req['user'].role;
     console.log(req['user']);
-    if (role == Role.CUSTOMER)
+    if (role === Role.CUSTOMER) {
+      console.log('customer');
       return this.orderService.createFromCustomer(
         branchId,
         userId,
         createOrderDto,
       );
-    else
+    } else
       return this.orderService.createFromStaff(
         branchId,
         userId,
@@ -39,28 +43,50 @@ export class OrderController {
       );
   }
 
-  @Get()
-  async findAll(@Req() req: Request) {
+  @Get('history')
+  async findHistory(
+    @Req() req: Request,
+    @Param('branchId') branchId: string,
+    @Paginate() paginateQuery: PaginateQuery,
+  ) {
+    // order history of user.
     const userId = req['user'].sub;
     console.log(req['user']);
-    return this.orderService.findAll();
+    return this.orderService.findHistory(paginateQuery, userId, branchId);
   }
 
   @Get(':id')
   async findOne(@Param('id') id: string) {
     return this.orderService.findOne(+id);
   }
-
-  // @Patch(':id')
-  // async update(
-  //   @Param('id') id: string,
-  //   @Body() updateOrderDto: UpdateOrderDto,
-  // ) {
-  //   return this.orderService.update(+id, updateOrderDto);
-  // }
+  @Patch(':id')
+  update(@Param('id') id: string, @Body() updateOrderDto: UpdateOrderDto) {
+    return this.orderService.updateOrder(+id, updateOrderDto);
+  }
 
   @Delete(':id')
   remove(@Param('id') id: string) {
     return this.orderService.remove(+id);
   }
 }
+
+@Roles(Role.ADMIN, Role.STAFF, Role.BRANCH_MANAGER, Role.SHIPPER)
+@Controller('orders')
+export class OrderController {
+  constructor(private readonly orderService: OrderService) {}
+
+  @Get()
+  async findAll(@Paginate() paginateQuery: PaginateQuery) {
+    return this.orderService.findAll(paginateQuery);
+  }
+
+  @Get(':id')
+  async findOne(@Param('id') id: string) {
+    return this.orderService.findOne(+id);
+  }
+
+  @Patch(':id')
+  update(@Param('id') id: string, @Body() updateOrderDto: UpdateOrderDto) {
+    return this.orderService.updateOrder(+id, updateOrderDto);
+  }
+}

backend/src/modules/order/order.module.ts

@@ -1,12 +1,13 @@
 import { Module } from '@nestjs/common';
 import { OrderService } from './order.service.js';
-import { OrderController } from './order.controller.js';
+import { BranchOrderController, OrderController } from './order.controller.js';
 import { BranchModule } from '../branch/branch.module.js';
 import { BranchMenusModule } from '../branch-menus/branch-menus.module.js';
 
 @Module({
   imports: [BranchModule, BranchMenusModule],
-  controllers: [OrderController],
+  controllers: [BranchOrderController, OrderController],
   providers: [OrderService],
+  exports: [OrderService],
 })
 export class OrderModule {}

backend/src/modules/order/order.service.ts

@@ -1,4 +1,8 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import { CreateOrderDto } from './dto/create-order.dto.js';
 import { UserEntity } from '../../entities/user.entity.js';
 import { OrderEntity } from '../../entities/order.entity.js';
@@ -8,16 +12,27 @@ import { isUUID } from 'class-validator';
 import { OrderItemEntity } from '../../entities/order-item.entity.js';
 import { BranchMenuEntity } from '../../entities/branch-menu.entity.js';
 import { OrderStatus } from '../../common/enums/OrderStatus.enum.js';
+import {
+  FilterOperator,
+  paginate,
+  PaginateConfig,
+  PaginateQuery,
+} from 'nestjs-paginate';
+import { UpdateOrderDto } from './dto/update-order.dto.js';
+import { DataSource } from 'typeorm';
 
 @Injectable()
 export class OrderService {
-  constructor(private readonly branchService: BranchService) {}
+  constructor(
+    private readonly branchService: BranchService,
+    private readonly datasource: DataSource,
+  ) {}
   async createFromCustomer(
     branchId: string,
     userId: string,
     createOrderDto: CreateOrderDto,
   ) {
-    console.log('??');
+    // Chưa được update đầy đủ, còn thiếu thông tin thanh toán.
     if (createOrderDto.order_type != OrderType.ONLINE) {
       throw new BadRequestException('customer cannot create offline order');
     }
@@ -30,44 +45,60 @@ export class OrderService {
     if (!branch) {
       throw new BadRequestException('Branch not found');
     }
-    const order = OrderEntity.create();
-    order.branch = branch;
-    order.customer = user;
-    order.order_type = createOrderDto.order_type;
-    order.order_status = OrderStatus.PENDING;
-    order.total_value = 0;
-    await order.save();
+    const queryRunner = this.datasource.createQueryRunner();
 
-    let orderItems: OrderItemEntity[] = [];
-    let totalValue = 0;
-    for (const item of createOrderDto.order_items) {
-      let branchMenu: BranchMenuEntity;
-      if (!isUUID(item.menu_id)) {
-        branchMenu = await BranchMenuEntity.findOne({
-          where: { branch_id: branchId, menu_id: item.menu_id },
-          relations: ['menu_item'],
-        });
-      } else {
-        branchMenu = await BranchMenuEntity.findOne({
-          where: { branch_id: branchId, id: item.menu_id },
-          relations: ['menu_item'],
-        });
-      }
-      if (!branchMenu) {
-        throw new BadRequestException('Item not found in branch menu');
+    // Start a new transaction
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    try {
+      console.log('Customer create order');
+      const order = OrderEntity.create();
+      order.branch = branch;
+      order.customer = user;
+      order.order_type = createOrderDto.order_type;
+      order.order_status = OrderStatus.PENDING;
+      order.total_value = 0;
+      await queryRunner.manager.save(order);
+
+      let orderItems: OrderItemEntity[] = [];
+      let totalValue = 0;
+      for (const item of createOrderDto.order_items) {
+        let branchMenu: BranchMenuEntity;
+        if (!isUUID(item.menu_id)) {
+          branchMenu = await BranchMenuEntity.findOne({
+            where: { branch_id: branchId, menu_id: item.menu_id },
+            relations: ['menu_item'],
+          });
+        } else {
+          branchMenu = await BranchMenuEntity.findOne({
+            where: { branch_id: branchId, id: item.menu_id },
+            relations: ['menu_item'],
+          });
+        }
+        if (!branchMenu) {
+          throw new BadRequestException('Item not found in branch menu');
+        }
+        const orderItem = OrderItemEntity.create();
+        orderItem.branch_menu = branchMenu;
+        orderItem.price = branchMenu.menu_item.price;
+        orderItem.quantity = item.quantity;
+        orderItem.order_id = order.id;
+        totalValue += orderItem.price * orderItem.quantity;
+        orderItems.push(orderItem);
       }
-      const orderItem = OrderItemEntity.create();
-      orderItem.branch_menu = branchMenu;
-      orderItem.price = branchMenu.menu_item.price;
-      orderItem.quantity = item.quantity;
-      orderItem.order_id = order.id;
-      totalValue += orderItem.price * orderItem.quantity;
-      orderItems.push(orderItem);
+      await queryRunner.manager.save(order);
+      order.total_value = totalValue;
+      await queryRunner.manager.save(orderItems);
+
+      await queryRunner.commitTransaction();
+      await queryRunner.release();
+      return { ...order, order_items: orderItems };
+    } catch (err) {
+      await queryRunner.rollbackTransaction();
+      await queryRunner.release();
+      throw err;
     }
-    await order.save();
-    order.total_value = totalValue;
-    await OrderItemEntity.save(orderItems);
-    return { ...order, order_items: orderItems };
   }
 
   async createFromStaff(
@@ -89,49 +120,150 @@ export class OrderService {
     order.table_number = createOrderDto.table_number;
     order.order_status = OrderStatus.PREPARING;
     order.total_value = 0;
-    await order.save();
 
-    let orderItems: OrderItemEntity[] = [];
-    let totalValue = 0;
-    for (const item of createOrderDto.order_items) {
-      let branchMenu: BranchMenuEntity;
-      if (!isUUID(item.menu_id)) {
-        branchMenu = await BranchMenuEntity.findOne({
-          where: { branch_id: branchId, menu_id: item.menu_id },
-          relations: ['menu_item'],
-        });
-      } else {
-        branchMenu = await BranchMenuEntity.findOne({
-          where: { branch_id: branchId, id: item.menu_id },
-          relations: ['menu_item'],
-        });
-      }
-      if (!branchMenu) {
-        throw new BadRequestException('Item not found in branch menu');
+    const queryRunner = this.datasource.createQueryRunner();
+
+    // Start a new transaction
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+
+    try {
+      await queryRunner.manager.save(order);
+
+      let orderItems: OrderItemEntity[] = [];
+      let totalValue = 0;
+      for (const item of createOrderDto.order_items) {
+        let branchMenu: BranchMenuEntity;
+        if (!isUUID(item.menu_id)) {
+          branchMenu = await BranchMenuEntity.findOne({
+            where: { branch_id: branchId, menu_id: item.menu_id },
+            relations: ['menu_item'],
+          });
+        } else {
+          branchMenu = await BranchMenuEntity.findOne({
+            where: { branch_id: branchId, id: item.menu_id },
+            relations: ['menu_item'],
+          });
+        }
+        if (!branchMenu) {
+          throw new BadRequestException('Item not found in branch menu');
+        }
+        const orderItem = OrderItemEntity.create();
+        orderItem.branch_menu = branchMenu;
+        orderItem.price = branchMenu.menu_item.price;
+        orderItem.quantity = item.quantity;
+        orderItem.order_id = order.id;
+        totalValue += orderItem.price * orderItem.quantity;
+        orderItems.push(orderItem);
       }
-      const orderItem = OrderItemEntity.create();
-      orderItem.branch_menu = branchMenu;
-      orderItem.price = branchMenu.menu_item.price;
-      orderItem.quantity = item.quantity;
-      orderItem.order_id = order.id;
-      totalValue += orderItem.price * orderItem.quantity;
-      orderItems.push(orderItem);
+      await queryRunner.manager.save(order);
+      order.total_value = totalValue;
+      await queryRunner.manager.save(orderItems);
+
+      await queryRunner.commitTransaction();
+      await queryRunner.release();
+
+      return { ...order, order_items: orderItems };
+    } catch (err) {
+      await queryRunner.rollbackTransaction();
+      await queryRunner.release();
+      throw err;
+    }
+  }
+
+  /**
+   * Lấy order kèm với list item
+   */
+  async findOrderOrError(id: number) {
+    const order = await OrderEntity.findOne({
+      where: { id },
+      relations: [
+        'order_items',
+        'order_items.branch_menu',
+        'order_items.branch_menu.menu_item',
+      ],
+    });
+    if (!order) {
+      throw new NotFoundException('Order id not found');
     }
+    return order;
+  }
+
+  async updateOrder(id: number, updateOrderDto: UpdateOrderDto) {
+    // update vì
+    // Offline
+    // Người dùng chuyển bàn
+    // Người dùng thêm/xoá món
+    // Cập nhật trạng thái
+    // Cập nhật rating
+    // Cập nhật note
+  }
+
+  async updateOrderPayment(id: number, paymentId: number) {
+    const order = await this.findOrderOrError(id);
+    order.payment_id = paymentId; // i'm trust that paymentId existed.
+    order.order_status = OrderStatus.ONLINE_PAID;
     await order.save();
-    order.total_value = totalValue;
-    await OrderItemEntity.save(orderItems);
-    return { ...order, order_items: orderItems };
   }
 
-  findAll() {
-    return `This action returns all order`;
+  getOrderPaginteConfig() {
+    const paginateConfig: PaginateConfig<OrderEntity> = {
+      sortableColumns: ['id', 'created_at', 'total_value'],
+      filterableColumns: {
+        order_status: [FilterOperator.EQ],
+        create_at: [FilterOperator.GTE, FilterOperator.LTE],
+        updated_at: [FilterOperator.GTE, FilterOperator.LTE],
+        customer_id: [FilterOperator.EQ],
+        branch_id: [FilterOperator.EQ],
+        staff_id: [FilterOperator.EQ],
+        table_number: [FilterOperator.EQ],
+        rating: [FilterOperator.EQ, FilterOperator.GTE, FilterOperator.LTE],
+        total_value: [
+          FilterOperator.EQ,
+          FilterOperator.GTE,
+          FilterOperator.LTE,
+        ],
+      },
+      defaultSortBy: [['id', 'DESC']],
+    };
+    return paginateConfig;
+  }
+
+  getOrderQueryBuilder(branchId?: string) {
+    //
+    let queryBuilder = OrderEntity.createQueryBuilder('od')
+      .leftJoinAndSelect('od.order_items', 'order_items')
+      .leftJoinAndSelect('order_items.branch_menu', 'branch_menu')
+      .leftJoinAndSelect('branch_menu.menu_item', 'menu_item');
+    if (branchId) {
+      queryBuilder.andWhere('od.branch_id = :branchId', { branchId });
+    }
+    // console.log(queryBuilder.getQuery());
+    return queryBuilder;
+  }
+
+  async findAll(query: PaginateQuery, branchId?: string) {
+    const paginateConfig = this.getOrderPaginteConfig();
+    let queryBuilder = this.getOrderQueryBuilder(branchId);
+    if (branchId) {
+      queryBuilder.andWhere('od.branch_id = :branchId', { branchId });
+    }
+    return paginate(query, queryBuilder, paginateConfig);
+  }
+
+  async findHistory(query: PaginateQuery, userId: string, branchId?: string) {
+    const paginateConfig = this.getOrderPaginteConfig();
+    let queryBuilder = this.getOrderQueryBuilder(branchId);
+    queryBuilder.andWhere('od.customer_id = :userId', { userId });
+    return paginate(query, queryBuilder, paginateConfig);
   }
 
-  findOne(id: number) {
-    return `This action returns a #${id} order`;
+  async findOne(id: number) {
+    return this.findOrderOrError(id);
   }
 
-  remove(id: number) {
-    return `This action removes a #${id} order`;
+  async remove(id: number) {
+    const order = await this.findOrderOrError(id);
+    return await OrderEntity.softRemove(order);
   }
 }

backend/src/modules/user/dto/update-users.dto.ts

@@ -0,0 +1,37 @@
+import { IsEmail, IsMobilePhone, IsOptional, IsString } from "class-validator";
+import { Role } from "../../../common/enums/role.enum.js";
+export class UpdateUsersDto {
+
+  @IsString()
+  id: string;
+
+  @IsOptional()
+  avatar: string;
+
+  @IsString()
+  @IsOptional()
+  full_name?: string;
+
+  @IsMobilePhone('vi-VN')
+  @IsOptional()
+  phone_number: string
+
+  @IsString()
+  @IsOptional()
+  address: string;
+
+  @IsEmail()
+  @IsOptional()
+  email?: string;
+
+  @IsOptional()
+  role: Role;
+
+  @IsString()
+  @IsOptional()
+  hash_password?: string;
+
+  @IsOptional()
+  is_valid: boolean;
+}
+

backend/src/modules/user/user.controller.ts

@@ -1,23 +1,61 @@
-import { Body, Controller, Get, Param, Post, Request } from '@nestjs/common';
-import { UserService } from './user.service.js';
-import { UserEntity } from 'src/entities/user.entity.js';
-import { UpdateUserDto } from './dto/update-user-dto.js';
-
-@Controller('users')
-export class UsersController {
-  constructor(private readonly usersService: UserService) {}
-
-  @Get(':username')
-  async getUser(
-    @Param('username') username: string,
-  ): Promise<UserEntity | undefined> {
-    return this.usersService.findOne(username);
-  }
-
-  @Post('updateUser')
-  async updateUser(@Request() req){
-      const userId = req.user.sub;
-      const updateUserDto = req.body;
-      return this.usersService.updateUserById(userId, updateUserDto);
-  }
-}
+import { Body, Controller, Get, Post, Put, Query, Request } from '@nestjs/common';
+import { UserService } from './user.service.js';
+import { UserEntity } from 'src/entities/user.entity.js';
+import { Roles } from '../authentication/authorization/roles.decorator.js';
+import { Role } from '../../common/enums/role.enum.js';
+import { Paginate, PaginateQuery } from 'nestjs-paginate';
+import { UpdateUsersDto } from './dto/update-users.dto.js';
+
+@Controller('users')
+export class UsersController {
+  constructor(private readonly usersService: UserService) {}
+
+  @Get('id')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserById(
+    @Query('id') id: string
+  ): Promise<UserEntity | undefined> {
+    return this.usersService.findOneByField("id", id)
+  }
+
+  @Get('fullname')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserByFullname( @Query('full_name') fullName: string, @Paginate() query: PaginateQuery, ) {
+    console.log(fullName)
+    return this.usersService.findAllByName(fullName, query);
+  }
+
+  @Post('updateUser')
+  async updateUser(@Request() req){
+      const userId = req.user.sub;
+      const updateUserDto = req.body;
+      return this.usersService.updateUserById(userId, updateUserDto);
+  }
+
+  @Put('updateList')
+  @Roles(Role.ADMIN)
+  async updateUsers(
+    @Body() updateUsersDto: UpdateUsersDto[],
+  ) {
+    return this.usersService.updateUsers(updateUsersDto);
+  }
+
+  @Get('getAll')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async findAllUser(@Paginate() query: PaginateQuery) {
+    return this.usersService.findAllUser(query);
+  }
+
+  @Get('role')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserByRole( @Query('role') role: string, @Paginate() query: PaginateQuery, ) {
+    console.log(role)
+    return this.usersService.findAllByRole(role, query);
+  }
+
+  @Get('role')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER)
+  async getUsersByBranch(@Query('branchId') branchId: string, @Paginate() query: PaginateQuery){
+    
+  }
+}

backend/src/modules/user/user.service.ts

@@ -1,66 +1,167 @@
-import { Body, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
-import { UserEntity } from '../../entities/user.entity.js';
-import { SignUpDto } from '../authentication/dto/sign-up.dto.js';
-import { UpdateUserDto } from './dto/update-user-dto.js';
-import { ValidateService } from '../../validate/validate.service.js';
-import * as bcrypt from 'bcrypt';
-import { JwtService } from '@nestjs/jwt';
-
-export type User = any;
-
-@Injectable()
-export class UserService {
-  constructor(
-    private validateService: ValidateService,
-    private jwtService: JwtService,
-  ) {}
-
-  async findOne(username: string): Promise<UserEntity | undefined> {
-    return UserEntity.findOne({ where: { full_name: username } });
-  }
-
-  async create(signUpDto: SignUpDto): Promise<UserEntity | undefined>{
-    return UserEntity.create({
-      full_name: signUpDto.full_name,
-      phone_number: signUpDto.phone_number,
-      email: signUpDto.email,
-      hash_password: signUpDto.password
-    })
-  }
-
-  async save(userEntity: UserEntity): Promise<UserEntity | undefined>{
-    return UserEntity.save(userEntity);
-  }
-
-  async findOneByField(field: string, value: any): Promise<UserEntity | undefined> {
-    return UserEntity.findOne({ 
-      where: { [field]: value }
-    });
-  }
-
-  async updateUserById(userId: string, updateUserDto: UpdateUserDto){
-
-    await this.validateService.checkExistField('email', updateUserDto.email);
-    await this.validateService.checkExistField('phone_number', updateUserDto.phone_number);
-
-    const user = await UserEntity.findOne({
-      where: { id: userId }
-    });
-    if (!user) {
-      throw new NotFoundException(`User with ID ${userId} not found`);
-    }
-
-    Object.assign(user, updateUserDto);
-    if (updateUserDto.hash_password) {
-      const saltRounds = 10;
-      user.hash_password = await bcrypt.hash(updateUserDto.hash_password, saltRounds); // Mã hóa mật khẩu
-    }
-    await UserEntity.save(user);
-
-    const payload = { sub: user.id, username: user.full_name, roles: user.role };
-    const token = await this.jwtService.signAsync(payload)
-    return {
-      access_token: token
-    };
-  }
-}
+import { Body, forwardRef, HttpStatus, Inject, Injectable, NotFoundException } from '@nestjs/common';
+import { UserEntity } from '../../entities/user.entity.js';
+import { SignUpDto } from '../authentication/dto/sign-up.dto.js';
+import { UpdateUserDto } from './dto/update-user-dto.js';
+import { ValidateService } from '../../validate/validate.service.js';
+import * as bcrypt from 'bcrypt';
+import { JwtService } from '@nestjs/jwt';
+import { FilterOperator, paginate, PaginateConfig, PaginateQuery } from 'nestjs-paginate';
+import { UpdateUsersDto } from './dto/update-users.dto.js';
+import { In } from 'typeorm';
+
+export type User = any;
+
+@Injectable()
+export class UserService {
+  constructor(
+    private validateService: ValidateService,
+    private jwtService: JwtService,
+  ) { }
+
+  async create(signUpDto: SignUpDto): Promise<UserEntity | undefined> {
+    return UserEntity.create({
+      full_name: signUpDto.full_name,
+      phone_number: signUpDto.phone_number,
+      email: signUpDto.email,
+      hash_password: signUpDto.password
+    })
+  }
+
+  async save(userEntity: UserEntity): Promise<UserEntity | undefined> {
+    return UserEntity.save(userEntity);
+  }
+
+  async findOneByField(field: string, value: any): Promise<UserEntity | undefined> {
+    return UserEntity.findOne({
+      where: { [field]: value }
+    });
+  }
+
+  async updateUserById(userId: string, updateUserDto: UpdateUserDto) {
+
+    await this.validateService.checkExistField('email', updateUserDto.email);
+    await this.validateService.checkExistField('phone_number', updateUserDto.phone_number);
+
+    const user = await UserEntity.findOne({
+      where: { id: userId }
+    });
+    if (!user) {
+      throw new NotFoundException(`User with ID ${userId} not found`);
+    }
+
+    Object.assign(user, updateUserDto);
+    if (updateUserDto.hash_password) {
+      const saltRounds = 10;
+      user.hash_password = await bcrypt.hash(updateUserDto.hash_password, saltRounds); // Mã hóa mật khẩu
+    }
+    await UserEntity.save(user);
+
+    const payload = { sub: user.id, username: user.full_name, roles: user.role };
+    const token = await this.jwtService.signAsync(payload)
+    return {
+      access_token: token
+    };
+  }
+
+  async findAllUser(query: PaginateQuery) {
+    const paginateConfig: PaginateConfig<UserEntity> = {
+      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
+      nullSort: 'last',
+      defaultSortBy: [['id', 'DESC']],
+      searchableColumns: ['full_name'],
+      filterableColumns: {
+        full_name: [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        item_type: [FilterOperator.EQ]
+      },
+    };
+    return paginate(query, UserEntity.createQueryBuilder(), paginateConfig);
+  }
+
+  async findAllByName(fullName: string, query: PaginateQuery) {
+    const queryBuilder = UserEntity.createQueryBuilder('users')
+      .where('users.full_name = :fullName', { fullName });
+    const paginateConfig: PaginateConfig<UserEntity> = {
+      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
+      nullSort: 'last',
+      defaultSortBy: [['id', 'DESC']],
+      searchableColumns: ['full_name'],
+      filterableColumns: {
+        full_name: [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        item_type: [FilterOperator.EQ]
+      },
+    };
+    return paginate(query, queryBuilder, paginateConfig);
+  }
+
+  async findAllByRole(role: string, query: PaginateQuery) {
+    const queryBuilder = UserEntity.createQueryBuilder('users')
+      .where('users.role = :role', { role });
+    const paginateConfig: PaginateConfig<UserEntity> = {
+      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
+      nullSort: 'last',
+      defaultSortBy: [['id', 'DESC']],
+      searchableColumns: ['full_name'],
+      filterableColumns: {
+        full_name: [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        item_type: [FilterOperator.EQ]
+      },
+    };
+    return paginate(query, queryBuilder, paginateConfig);
+  }
+
+  async updateUsers(updateUsersDto: UpdateUsersDto[]) {
+    try {
+      //Lấy ra id trong updateUsersDto
+      const userIds = updateUsersDto.map(user => user.id).filter(id => id !== undefined);
+
+      //Lấy ra các user tồn tại trong db
+      const existingUsers = await UserEntity.find({
+        where: { id: In(userIds) },
+      });
+
+      // Bước 2: Kết hợp dữ liệu từ yêu cầu với dữ liệu hiện có
+      const mergedData: Partial<User>[] = [];
+      for (const userData of updateUsersDto) {
+        if (userData.hash_password)
+          userData.hash_password = await bcrypt.hash(userData.hash_password, 10);
+        
+        const existingUser = existingUsers.find(user => user.id === userData.id);
+        
+        if (existingUser) {
+          // Merge data: keep existing fields for any data not included in the request
+          mergedData.push({ ...existingUser, ...userData });
+        } else {
+          // For new users, use only the request data
+          mergedData.push(userData);
+        }
+      }
+
+      console.log(updateUsersDto)
+      UserEntity.upsert(mergedData, ['id'])
+      return {
+        statusCode: HttpStatus.OK,
+        message: "Thành công"
+      }
+    } catch (error) {
+      return {
+        statusCode: HttpStatus.OK,
+        message: "Thất bại"
+      }
+    }
+  }
+}

backend/src/payment/dto/create-payment-url.dto.ts

@@ -0,0 +1,22 @@
+import { IsNumber, IsOptional, IsString } from "class-validator"
+
+export class CreatePaymentUrlDto {
+    @IsNumber()
+    amount: number
+
+    @IsOptional()
+    @IsString()
+    bankCode: string
+
+    @IsString()
+    orderId: string
+
+    @IsString()
+    orderDescription: string
+
+    @IsString()
+    orderType: string
+
+    @IsString()
+    language: string
+}

backend/src/payment/dto/create-payment.dto..ts

@@ -0,0 +1,38 @@
+import { IsNumber, IsOptional, IsString } from 'class-validator';
+
+export class CreatePaymentDto {
+    @IsNumber()
+    payment_method: number;
+
+    @IsNumber()
+    vnp_amount: number
+
+    @IsString()
+    vnp_bank_code: string
+
+    @IsString()
+    vnp_bank_tran_no: string
+
+    @IsNumber()
+    vnp_card_type: number
+
+    @IsString()
+    @IsOptional()
+    vnp_order_info: string //Nội dung giao dịch
+
+    @IsString()
+    @IsOptional()
+    vnp_paydate: string
+
+    @IsString()
+    @IsOptional()
+    vnp_response_code: number
+
+    @IsString()
+    @IsOptional()
+    vnp_transaction_no: string
+
+    @IsString()
+    @IsOptional()
+    vnp_transaction_status: number
+}

backend/src/payment/payment.controller.ts

@@ -0,0 +1,39 @@
+// payment.controller.ts
+import { Controller, Post, Body, Req, Res, Get } from '@nestjs/common';
+import { PaymentService } from './payment.service.js';
+import { Request, Response } from 'express';
+import { Public } from '../modules/authentication/authentication.decorator.js';
+import { CreatePaymentUrlDto } from './dto/create-payment-url.dto.js';
+
+@Controller('payment')
+export class PaymentController {
+  constructor(private readonly paymentService: PaymentService) {}
+
+  @Public()
+  @Post('create_payment_url')
+  async createPaymentUrl(@Req() req: Request, @Body() body: CreatePaymentUrlDto) {
+
+    const ipAddr =
+      req.headers['x-forwarded-for'] ||
+      req.socket.remoteAddress ||
+      req.socket?.remoteAddress;
+
+    return await this.paymentService.createPaymentUrl(
+      body.amount,
+      body.orderId,
+      body.orderDescription,
+      body.orderType,
+      body.language,
+      ipAddr as string,
+    );
+  }
+
+  @Public()
+  @Get('vnpay_ipn')
+  async vnpayIpn(@Req() req: Request, @Body() body: any){
+    const reqQuery = req.query;
+    const res = await this.paymentService.vnpayIpn(reqQuery)
+    console.log(res);
+    return res;
+  }
+}

backend/src/payment/payment.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { PaymentService } from './payment.service.js';
+import { PaymentController } from './payment.controller.js';
+import { OrderService } from '../modules/order/order.service.js';
+import { BranchService } from '../modules/branch/branch.service.js';
+
+@Module({
+  controllers: [PaymentController],
+  providers: [PaymentService, OrderService, BranchService],
+})
+export class PaymentModule {}

backend/src/payment/payment.service.ts

@@ -0,0 +1,200 @@
+// payment.service.ts
+import { HttpStatus, Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import * as querystring from 'qs';
+import * as crypto from 'crypto';
+import { OrderService } from '../modules/order/order.service.js';
+import { PaymentEntity } from '../entities/payment.entity.js';
+import { CreatePaymentUrlDto } from './dto/create-payment-url.dto.js';
+import { CreatePaymentDto } from './dto/create-payment.dto..js';
+import { VnpCardType } from '../common/enums/VnpCardType.enum.js';
+
+@Injectable()
+export class PaymentService {
+  constructor(
+    private readonly configService: ConfigService,
+    private readonly orderService: OrderService
+  ) { }
+
+  async createPaymentUrl(amount: number, orderId: string, orderDescription: string, orderType: string, language: string, ipAddr: string) {
+
+    const tmnCode = this.configService.get<string>('vnp_TmnCode');
+    const secretKey = this.configService.get<string>('vnp_HashSecret');
+    const vnpUrl = this.configService.get<string>('vnp_Url');
+    const returnUrl = this.configService.get<string>('vnp_ReturnUrl');
+
+    const date = new Date();
+    const createDate = this.formatDate(date, 'yyyymmddHHmmss');
+    const locale = language || 'vn';
+    const currCode = 'VND';
+
+    const vnp_Params: Record<string, string> = {
+      vnp_Version: '2.1.0',
+      vnp_Command: 'pay',
+      vnp_TmnCode: tmnCode,
+      vnp_Locale: locale,
+      vnp_CurrCode: currCode,
+      vnp_TxnRef: orderId,
+      vnp_OrderInfo: orderDescription,
+      vnp_OrderType: orderType,
+      vnp_Amount: (amount * 100).toString(),
+      vnp_ReturnUrl: returnUrl,
+      vnp_IpAddr: ipAddr,
+      vnp_CreateDate: createDate,
+    };
+    console.log("3")
+
+    const sortedParams = this.sortObject(vnp_Params);
+
+    // Sign the data
+    const signData = querystring.stringify(sortedParams, { encode: false });
+    const hmac = crypto.createHmac('sha512', secretKey);
+    const signed = hmac.update(Buffer.from(signData, 'utf-8')).digest('hex');
+    sortedParams['vnp_SecureHash'] = signed;
+
+    // Create the URL
+    const res = `${vnpUrl}?${querystring.stringify(sortedParams, { encode: false })}`;
+
+    return res;
+  }
+
+
+  async vnpayIpn(reqQuery) {
+    console.log("helloooo")
+    let vnp_Params = reqQuery;
+    let secureHash = vnp_Params['vnp_SecureHash'];
+
+    let orderId = vnp_Params['vnp_TxnRef'];
+    let rspCode = vnp_Params['vnp_ResponseCode'];
+
+    delete vnp_Params['vnp_SecureHash'];
+    delete vnp_Params['vnp_SecureHashType'];
+
+    vnp_Params = this.sortObject(vnp_Params);
+    let secretKey = this.configService.get('vnp_HashSecret');
+    let signData = querystring.stringify(vnp_Params, { encode: false });
+    let hmac = crypto.createHmac("sha512", secretKey);
+    let signed = hmac.update(Buffer.from(signData, 'utf-8')).digest("hex");
+
+    let paymentStatus = '0'; // Giả sử '0' là trạng thái khởi tạo giao dịch, chưa có IPN. Trạng thái này được lưu khi yêu cầu thanh toán chuyển hướng sang Cổng thanh toán VNPAY tại đầu khởi tạo đơn hàng.
+    //let paymentStatus = '1'; // Giả sử '1' là trạng thái thành công bạn cập nhật sau IPN được gọi và trả kết quả về nó
+    //let paymentStatus = '2'; // Giả sử '2' là trạng thái thất bại bạn cập nhật sau IPN được gọi và trả kết quả về nó
+    //Kiểm tra có đúng order id không
+    let checkOrderId = true;
+    let order;
+    try {
+      order = await this.orderService.findOne(orderId)
+    } catch (error) {
+      return {
+        statusCode: HttpStatus.OK,
+        message: 'Order not found',
+      };
+    }
+    console.log("order = ", order);
+    console.log("order total value ", order.total_value);
+    // Kiểm tra số tiền "giá trị của vnp_Amout/100" trùng khớp với số tiền của đơn hàng trong CSDL của bạn
+    let checkAmount = order.total_value == parseFloat(vnp_Params["vnp_Amount"])/100; 
+    if (secureHash === signed) { //kiểm tra checksum
+      if (checkOrderId) {
+        if (checkAmount) {
+          if (paymentStatus == "0") { //kiểm tra tình trạng giao dịch trước khi cập nhật tình trạng thanh toán
+            if (rspCode == "00") {
+              //thanh cong
+              //paymentStatus = '1'
+              // Ở đây cập nhật trạng thái giao dịch thanh toán thành công vào CSDL của bạn
+              const payment = await this.create({
+                payment_method: 2,
+                vnp_amount: parseFloat(vnp_Params["vnp_Amount"])/100,
+                vnp_bank_code: vnp_Params['vnp_BankCode'],
+                vnp_bank_tran_no: vnp_Params['vnp_BankTranNo'],
+                vnp_card_type: VnpCardType[vnp_Params['vnp_CardType'] as keyof typeof VnpCardType],
+                vnp_order_info: vnp_Params['vnp_BankTranNo'],
+                vnp_paydate: vnp_Params['vnp_PayDate'],
+                vnp_response_code: vnp_Params['vnp_ResponseCode'],
+                vnp_transaction_no: vnp_Params['vnp_TransactionNo'],
+                vnp_transaction_status: vnp_Params['vnp_TransactionStatus'],
+              });
+              await PaymentEntity.save(payment);
+              this.orderService.updateOrderPayment(orderId, payment.id)
+              return {
+                statusCode: HttpStatus.OK,
+                message: 'Thành công!',
+              };
+            }
+            else {
+              //that bai
+              //paymentStatus = '2'
+              // Ở đây cập nhật trạng thái giao dịch thanh toán thất bại vào CSDL của bạn
+              return {
+                statusCode: HttpStatus.OK,
+                message: 'Thất bại',
+              };
+            }
+          }
+          else {
+            return {
+              statusCode: HttpStatus.OK,
+              message: 'This order has been updated to the payment status',
+            };
+          }
+        }
+        else {
+          return {
+            statusCode: HttpStatus.OK,
+            message: 'Amount invalid',
+          };
+        }
+      }
+      else {
+        return {
+          statusCode: HttpStatus.OK,
+          message: 'Order not found',
+        };
+      }
+    }
+    else {
+      return {
+        statusCode: HttpStatus.OK,
+        message: 'Checksum failed!',
+      };
+    }
+  }
+
+  // Format date helper function
+  formatDate(date: Date, format: string): string {
+    const yyyymmdd = date.toISOString().slice(0, 10).replace(/-/g, ''); // YYYYMMDD
+    const hhmmss = date.toTimeString().slice(0, 8).replace(/:/g, ''); // HHMMSS
+    return format === 'yyyymmddHHmmss' ? yyyymmdd + hhmmss : hhmmss;
+  }
+
+  sortObject(obj) {
+    let sorted = {};
+    let str = [];
+    let key;
+    for (key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        str.push(encodeURIComponent(key));
+      }
+    }
+    str.sort();
+    for (key = 0; key < str.length; key++) {
+      sorted[str[key]] = encodeURIComponent(obj[str[key]]).replace(/%20/g, "+");
+    }
+    return sorted;
+  }
+
+  async create(createPaymentDto: CreatePaymentDto): Promise<PaymentEntity | undefined> {
+    return PaymentEntity.create({
+      payment_method: 2,
+      vnp_amount: createPaymentDto.vnp_amount,
+      vnp_bank_code: createPaymentDto.vnp_bank_code,
+      vnp_bank_tran_no: createPaymentDto.vnp_bank_tran_no,
+      vnp_card_type: createPaymentDto.vnp_card_type,
+      vnp_order_info: createPaymentDto.vnp_order_info,
+      vnp_paydate: createPaymentDto.vnp_paydate,
+      vnp_response_code: createPaymentDto.vnp_response_code,
+      vnp_transaction_no: createPaymentDto.vnp_transaction_no,
+      vnp_transaction_status: createPaymentDto.vnp_transaction_status
+    })
+  }
+}

frontend/.gitignore

@@ -24,4 +24,7 @@ yarn-error.log*
 
 .env
 note_dev.txt
-object.json
+object.json
+test.json
+data.json
+# src/data/*

frontend/package-lock.json

@@ -8,11 +8,13 @@
       "name": "test-app",
       "version": "0.1.0",
       "dependencies": {
+        "@observablehq/plot": "^0.6.16",
         "@testing-library/jest-dom": "^5.17.0",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
         "axios": "^1.7.7",
         "bootstrap": "^5.3.3",
+        "html2pdf.js": "^0.10.2",
         "js-cookie": "^3.0.5",
         "jsonwebtoken": "^9.0.2",
         "react": "^18.3.1",
@@ -3433,6 +3435,20 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@observablehq/plot": {
+      "version": "0.6.16",
+      "resolved": "https://registry.npmjs.org/@observablehq/plot/-/plot-0.6.16.tgz",
+      "integrity": "sha512-LRi9Rn93yUx90MIo2Md7+vazxO3Wiat14but2ttCER0xVS+jnfoUjuCGoz6H7bz/lgI9CFcW0HWlvWjMFjAv8g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3": "^7.9.0",
+        "interval-tree-1d": "^1.0.0",
+        "isoformat": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -4774,6 +4790,13 @@
       "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==",
       "license": "MIT"
     },
+    "node_modules/@types/raf": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.3.tgz",
+      "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
@@ -5813,6 +5836,18 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
     "node_modules/autoprefixer": {
       "version": "10.4.20",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
@@ -6218,6 +6253,15 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "license": "MIT"
     },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -6261,6 +6305,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/binary-search-bounds": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz",
+      "integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA==",
+      "license": "MIT"
+    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -6431,6 +6481,18 @@
         "node-int64": "^0.4.0"
       }
     },
+    "node_modules/btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==",
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "btoa": "bin/btoa.js"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
@@ -6555,6 +6617,33 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/canvg": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
+      "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "@types/raf": "^3.4.0",
+        "core-js": "^3.8.3",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^2.0.0",
+        "svg-pathdata": "^6.0.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/canvg/node_modules/regenerator-runtime": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
@@ -7032,6 +7121,15 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/css-loader": {
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
@@ -7365,6 +7463,416 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
       "license": "MIT"
     },
+    "node_modules/d3": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "3",
+        "d3-axis": "3",
+        "d3-brush": "3",
+        "d3-chord": "3",
+        "d3-color": "3",
+        "d3-contour": "4",
+        "d3-delaunay": "6",
+        "d3-dispatch": "3",
+        "d3-drag": "3",
+        "d3-dsv": "3",
+        "d3-ease": "3",
+        "d3-fetch": "3",
+        "d3-force": "3",
+        "d3-format": "3",
+        "d3-geo": "3",
+        "d3-hierarchy": "3",
+        "d3-interpolate": "3",
+        "d3-path": "3",
+        "d3-polygon": "3",
+        "d3-quadtree": "3",
+        "d3-random": "3",
+        "d3-scale": "4",
+        "d3-scale-chromatic": "3",
+        "d3-selection": "3",
+        "d3-shape": "3",
+        "d3-time": "3",
+        "d3-time-format": "4",
+        "d3-timer": "3",
+        "d3-transition": "3",
+        "d3-zoom": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-axis": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz",
+      "integrity": "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-brush": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz",
+      "integrity": "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "3",
+        "d3-transition": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-chord": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz",
+      "integrity": "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-contour": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.2.tgz",
+      "integrity": "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-delaunay": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz",
+      "integrity": "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==",
+      "license": "ISC",
+      "dependencies": {
+        "delaunator": "5"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz",
+      "integrity": "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==",
+      "license": "ISC",
+      "dependencies": {
+        "commander": "7",
+        "iconv-lite": "0.6",
+        "rw": "1"
+      },
+      "bin": {
+        "csv2json": "bin/dsv2json.js",
+        "csv2tsv": "bin/dsv2dsv.js",
+        "dsv2dsv": "bin/dsv2dsv.js",
+        "dsv2json": "bin/dsv2json.js",
+        "json2csv": "bin/json2dsv.js",
+        "json2dsv": "bin/json2dsv.js",
+        "json2tsv": "bin/json2dsv.js",
+        "tsv2csv": "bin/dsv2dsv.js",
+        "tsv2json": "bin/dsv2json.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dsv/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-fetch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz",
+      "integrity": "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dsv": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-force": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz",
+      "integrity": "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-quadtree": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
+      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-geo": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-hierarchy": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz",
+      "integrity": "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-polygon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz",
+      "integrity": "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-quadtree": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz",
+      "integrity": "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-random": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale-chromatic": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
+      }
+    },
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
+      "dependencies": {
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -7567,6 +8075,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/delaunator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
+      "integrity": "sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==",
+      "license": "ISC",
+      "dependencies": {
+        "robust-predicates": "^3.0.2"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -7796,6 +8313,13 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
+    "node_modules/dompurify": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.7.tgz",
+      "integrity": "sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q==",
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optional": true
+    },
     "node_modules/domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
@@ -8149,6 +8673,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
+    },
     "node_modules/escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -9132,6 +9662,12 @@
         "bser": "2.1.1"
       }
     },
+    "node_modules/fflate": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
+      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
+      "license": "MIT"
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -10149,6 +10685,30 @@
         }
       }
     },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "license": "MIT",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/html2pdf.js": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/html2pdf.js/-/html2pdf.js-0.10.2.tgz",
+      "integrity": "sha512-WyHVeMb18Bp7vYTmBv1GVsThH//K7SRfHdSdhHPkl4JvyQarNQXnailkYn0QUbRRmnN5rdbbmSIGEsPZtzPy2Q==",
+      "license": "MIT",
+      "dependencies": {
+        "es6-promise": "^4.2.5",
+        "html2canvas": "^1.0.0",
+        "jspdf": "^2.3.1"
+      }
+    },
     "node_modules/htmlparser2": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -10430,6 +10990,24 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/interval-tree-1d": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/interval-tree-1d/-/interval-tree-1d-1.0.4.tgz",
+      "integrity": "sha512-wY8QJH+6wNI0uh4pDQzMvl+478Qh7Rl4qLmqiluxALlNvl+I+o5x38Pw3/z7mDPTPS1dQalZJXsmbvxx5gclhQ==",
+      "license": "MIT",
+      "dependencies": {
+        "binary-search-bounds": "^2.0.0"
+      }
+    },
     "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -10957,6 +11535,12 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "license": "ISC"
     },
+    "node_modules/isoformat": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/isoformat/-/isoformat-0.2.1.tgz",
+      "integrity": "sha512-tFLRAygk9NqrRPhJSnNGh7g7oaVWDwR0wKh/GM2LgmPa50Eg4UfyaCO4I8k6EqJHl1/uh2RAD6g06n5ygEnrjQ==",
+      "license": "ISC"
+    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -13425,6 +14009,24 @@
         "npm": ">=6"
       }
     },
+    "node_modules/jspdf": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.2.tgz",
+      "integrity": "sha512-myeX9c+p7znDWPk0eTrujCzNjT+CXdXyk7YmJq5nD5V7uLLKmSXnlQ/Jn/kuo3X09Op70Apm0rQSnFWyGK8uEQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.23.2",
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "fflate": "^0.8.1"
+      },
+      "optionalDependencies": {
+        "canvg": "^3.0.6",
+        "core-js": "^3.6.0",
+        "dompurify": "^2.5.4",
+        "html2canvas": "^1.0.0-rc.5"
+      }
+    },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -17002,6 +17604,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rgbcolor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
+      "license": "MIT OR SEE LICENSE IN FEEL-FREE.md",
+      "optional": true,
+      "engines": {
+        "node": ">= 0.8.15"
+      }
+    },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -17018,6 +17630,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/robust-predicates": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz",
+      "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==",
+      "license": "Unlicense"
+    },
     "node_modules/rollup": {
       "version": "2.79.2",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
@@ -17116,6 +17734,12 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/rw": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/safe-array-concat": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
@@ -17735,6 +18359,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/stackblur-canvas": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
+      "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.14"
+      }
+    },
     "node_modules/stackframe": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
@@ -18291,6 +18925,16 @@
       "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
       "license": "MIT"
     },
+    "node_modules/svg-pathdata": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+      "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/svgo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
@@ -18575,6 +19219,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -19113,6 +19766,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",