diff --git a/.circleci/config.yml b/.circleci/config.yml
index ed51a17..5807703 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,7 +71,7 @@ jobs:
                 name: test
                 command: yarn test:cov
             - store_test_results:
-                path: ./server/coverage
+                path: ./packages/server/coverage
     build_client:
         executor: node
         steps:
diff --git a/.idea/internet-banking.iml b/.idea/internet-banking.iml
index 14c8281..ce7c0aa 100644
--- a/.idea/internet-banking.iml
+++ b/.idea/internet-banking.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/packages/client/dist" />
       <excludeFolder url="file://$MODULE_DIR$/packages/server/coverage" />
       <excludeFolder url="file://$MODULE_DIR$/packages/server/dist" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
@@ -10,5 +11,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="client" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 274d270..9e70245 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/packages/client/.idea/client.iml" filepath="$PROJECT_DIR$/packages/client/.idea/client.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/internet-banking.iml" filepath="$PROJECT_DIR$/.idea/internet-banking.iml" />
     </modules>
   </component>
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
new file mode 100644
index 0000000..5eaf42e
--- /dev/null
+++ b/.idea/webResources.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebResourcesPaths">
+    <contentEntries>
+      <entry url="file://$PROJECT_DIR$/packages/client">
+        <entryData>
+          <resourceRoots>
+            <path value="file://$PROJECT_DIR$/packages/client/public" />
+          </resourceRoots>
+        </entryData>
+      </entry>
+    </contentEntries>
+  </component>
+</project>
\ No newline at end of file
diff --git a/packages/client/package.json b/packages/client/package.json
index 7b7c3ca..57927d7 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -6,7 +6,7 @@
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit --passWithNoTests",
     "lint": "vue-cli-service lint --fix",
-    "format": "prettier --write --ext .js,.ts,.vue"
+    "format": "prettier --write \"src/**/*.{ts,vue,js}\""
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.29",
diff --git a/packages/client/src/admins/components/Partner/PartnerDetailModal.vue b/packages/client/src/admins/components/Partner/PartnerDetailModal.vue
new file mode 100644
index 0000000..80506ef
--- /dev/null
+++ b/packages/client/src/admins/components/Partner/PartnerDetailModal.vue
@@ -0,0 +1,171 @@
+<template>
+    <el-dialog
+        close-on-press-escape
+        :close-on-click-modal="false"
+        :visible="localVisible"
+        @close="handleOnClose"
+        @closed="handleClosed"
+        fullscreen
+        modal-fade
+        v-loading="isLoading || !isLoaded"
+    >
+        <template #title>
+            <el-page-header
+                title="Back"
+                content="Details"
+                @back="handleOnClose"
+            />
+        </template>
+        <el-tabs tab-position="top">
+            <el-tab-pane label="Info">
+                <el-form
+                    ref="form"
+                    label-position="left"
+                    :model="info"
+                    :rules="editInfoRules"
+                >
+                    <el-form-item label="Public Key" prop="publicKey">
+                        <el-input
+                            readonly
+                            type="password"
+                            show-password
+                            v-model="info.publicKey"
+                        />
+                    </el-form-item>
+                    <el-collapse>
+                        <el-collapse-item title="More">
+                            <el-form-item
+                                label="New Password"
+                                prop="newPassword"
+                            >
+                                <el-input
+                                    readonly
+                                    show-password
+                                    type="password"
+                                    v-model="info.newPassword"
+                                />
+                            </el-form-item>
+                        </el-collapse-item>
+                    </el-collapse>
+                </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="Transactions">
+                <el-row>
+                    <el-col>
+                        <el-card>
+                            <template #header>
+                                <h2>Total transaction</h2>
+                            </template>
+                            <p>{{ stat.transCount }}</p>
+                        </el-card>
+                    </el-col>
+                    <el-col>
+                        <el-card>
+                            <template #header>
+                                <h2>Total amount</h2>
+                            </template>
+                            <p>{{ stat.transSum | vndFormat }}</p>
+                        </el-card>
+                    </el-col>
+                </el-row>
+                <el-divider />
+                <el-table :data="transactions"></el-table>
+            </el-tab-pane>
+        </el-tabs>
+    </el-dialog>
+</template>
+
+<script lang="ts">
+import { Component, Ref, Vue } from "vue-property-decorator";
+import { Form } from "element-ui";
+import { axiosInstance } from "@/utils/axios";
+
+@Component({
+    name: "partner-detail-modal",
+})
+export default class PartnerDetailModal extends Vue {
+    @Ref("form") form!: Form;
+
+    localVisible = false;
+    isLoading = false;
+    isLoaded = false;
+
+    transactions: Transaction[] = [];
+
+    info = {
+        publicKey: "",
+        newPassword: "",
+    };
+    editInfoRules = {
+        publicKey: [{ type: "string", required: false }],
+        newPassword: [{ type: "string", min: 6, required: false }],
+    };
+    stat = {
+        transCount: 0,
+        transSum: 0,
+    };
+
+    handleOnClose() {
+        this.form.resetFields();
+        this.localVisible = false;
+    }
+    handleClosed() {
+        this.isLoaded = false;
+        this.$router.replace({
+            name: "partner-management",
+        });
+    }
+
+    get partnerId() {
+        return this.$route.params.id;
+    }
+
+    fetchTransaction() {
+        axiosInstance
+            .get<Paginate<PartnerTransLog>>(
+                `/admin/partner/${this.partnerId}/transactions`,
+            )
+            .then(({ data }) => {
+                this.transactions = data.items.map((item) => item.transaction);
+            });
+
+        axiosInstance
+            .get(`/admin/partner/${this.partnerId}/transaction-total`)
+            .then(({ data }) => {
+                console.debug(data);
+                this.stat = data[0];
+            });
+    }
+
+    fetchInfo() {
+        this.isLoading = true;
+        axiosInstance
+            .get<Partner>(`/admin/partner/${this.partnerId}`)
+            .then(({ data }) => {
+                this.info = {
+                    publicKey: data.publicKey,
+                    newPassword: "",
+                };
+            })
+            .catch((error) => {
+                this.$notify({
+                    title: "Error",
+                    type: "error",
+                    message: error + "",
+                });
+            })
+            .finally(() => {
+                this.isLoading = false;
+                this.isLoaded = true;
+            });
+    }
+
+    mounted() {
+        this.localVisible = true;
+        this.fetchInfo();
+        this.fetchTransaction();
+    }
+}
+</script>
+
+<style lang="scss"></style>
diff --git a/packages/client/src/admins/pages/PartnerManagement.vue b/packages/client/src/admins/pages/PartnerManagement.vue
new file mode 100644
index 0000000..aa7118e
--- /dev/null
+++ b/packages/client/src/admins/pages/PartnerManagement.vue
@@ -0,0 +1,62 @@
+<template>
+    <div class="partner-management">
+        <el-table v-loading="isLoading" stripe border fit :data="partners">
+            <el-table-column label="id" prop="id" />
+            <el-table-column label="type" prop="type" />
+            <el-table-column label="actions" align="right">
+                <template slot-scope="{ row }">
+                    <el-button type="link" @click="() => showDetail(row)"
+                        >Details</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+        <router-view />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { axiosInstance } from "@/utils/axios";
+
+@Component({
+    name: "admin-partner-management",
+})
+export default class AdminPartnerManagement extends Vue {
+    partners: Partner[] = [];
+    isLoading = false;
+
+    async fetch() {
+        this.isLoading = true;
+        try {
+            const { data } = await axiosInstance.get<Partner[]>(
+                "/admin/partner",
+            );
+            this.partners = data;
+        } catch (e) {
+            this.$notify({
+                type: "error",
+                title: "Error",
+                message: e?.response?.data?.message || e + "",
+            });
+        } finally {
+            this.isLoading = false;
+        }
+    }
+
+    showDetail(row: Partner) {
+        this.$router.push({
+            name: "partner-detail",
+            params: {
+                id: row.id,
+            },
+        });
+    }
+
+    mounted() {
+        this.fetch();
+    }
+}
+</script>
+
+<style lang="scss"></style>
diff --git a/packages/client/src/components/History/History.vue b/packages/client/src/components/History/History.vue
index 8250255..4cc3845 100644
--- a/packages/client/src/components/History/History.vue
+++ b/packages/client/src/components/History/History.vue
@@ -33,7 +33,6 @@ import {
     Icon,
     Input,
     InputNumber,
-    Message,
     Option,
     Popconfirm,
     Select,
diff --git a/packages/client/src/override.d.ts b/packages/client/src/override.d.ts
index 2a176c9..fa3058c 100644
--- a/packages/client/src/override.d.ts
+++ b/packages/client/src/override.d.ts
@@ -1,5 +1,3 @@
-import { library } from "@fortawesome/fontawesome-svg-core";
-import Vue from "vue";
 import { AxiosRequestConfig } from "axios";
 
 declare module "vue/types/vue" {
diff --git a/packages/client/src/router/admin.ts b/packages/client/src/router/admin.ts
index 077f71b..b91492d 100644
--- a/packages/client/src/router/admin.ts
+++ b/packages/client/src/router/admin.ts
@@ -49,10 +49,20 @@ const routes: Array<RouteConfig> = [
                         path: "partner",
                         name: "partner-management",
                         component: () =>
-                            import("@/admins/pages/UserManagement.vue"),
+                            import("@/admins/pages/PartnerManagement.vue"),
                         meta: {
                             role: ["ADMIN"],
                         },
+                        children: [
+                            {
+                                path: ":id",
+                                name: "partner-detail",
+                                component: () =>
+                                    import(
+                                        "@/admins/components/Partner/PartnerDetailModal.vue"
+                                    ),
+                            },
+                        ],
                     },
                 ],
             },
diff --git a/packages/client/src/router/index.ts b/packages/client/src/router/index.ts
index 066ed3f..98b9258 100644
--- a/packages/client/src/router/index.ts
+++ b/packages/client/src/router/index.ts
@@ -3,8 +3,7 @@ import VueRouter, { RouteConfig } from "vue-router";
 import AppLoad from "@/container/AppLoad.vue";
 import { Component } from "vue-property-decorator";
 import AppStore from "@/store";
-import AppLayout from "@/container/AppLayout.vue";
-import NotFound from "../views/NotFound.vue";
+import NotFound from "@/views/NotFound.vue";
 
 Vue.use(VueRouter);
 Component.registerHooks(["beforeRouteUpdate"]);
diff --git a/packages/client/src/types/partner.d.ts b/packages/client/src/types/partner.d.ts
new file mode 100644
index 0000000..abe35ef
--- /dev/null
+++ b/packages/client/src/types/partner.d.ts
@@ -0,0 +1,12 @@
+declare interface Partner {
+    id: string;
+    publicKey: string;
+}
+
+declare interface PartnerTransLog {
+    id: string;
+    client: Partner;
+    transaction: Transaction;
+    createdAt: Date;
+    updatedAt: Date;
+}
diff --git a/packages/client/src/types/transaction.d.ts b/packages/client/src/types/transaction.d.ts
index 621bb69..fa515e2 100644
--- a/packages/client/src/types/transaction.d.ts
+++ b/packages/client/src/types/transaction.d.ts
@@ -1,4 +1,4 @@
-declare class Transaction {
+declare interface Transaction {
     id: number;
     note: string;
     sourceAccount: string;
@@ -7,4 +7,7 @@ declare class Transaction {
     bankType: string;
     isDebtPay: boolean;
     isMyBankSend: boolean;
+
+    createdAt: Date;
+    updatedAt: Date;
 }
diff --git a/packages/client/src/views/Home.vue b/packages/client/src/views/Home.vue
index f37b41f..e182430 100644
--- a/packages/client/src/views/Home.vue
+++ b/packages/client/src/views/Home.vue
@@ -6,8 +6,8 @@
 
 <script>
 import Vue from "vue";
-import AppPaymentAccount from "@/components/BankAccountList/PaymentAccount";
-import { Aside, Container, Main } from "element-ui";
+import AppPaymentAccount from "@/components/BankAccountList/PaymentAccount.vue";
+import { Aside, Main } from "element-ui";
 
 Vue.use(Aside);
 Vue.use(Main);
diff --git a/packages/server/package.json b/packages/server/package.json
index b5ef63d..d93da5d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -100,6 +100,7 @@
     },
     "lint-staged": {
         "*.{js,ts}": [
+            "yarn format",
             "yarn lint"
         ]
     }
diff --git a/packages/server/src/dto/client.dto.ts b/packages/server/src/dto/client.dto.ts
index 1dd9e80..3ce2832 100644
--- a/packages/server/src/dto/client.dto.ts
+++ b/packages/server/src/dto/client.dto.ts
@@ -8,15 +8,15 @@ import {
     Min,
 } from "class-validator";
 import { Type } from "class-transformer";
-import { BankTypeEnum } from "@src/models/ReceiverList";
+import { ClientType } from "@src/models";
 
 export class CheckAccountDto {
     @ApiProperty({
         type: "integer",
-        example: 1234567890,
+        example: 12345678,
     })
     @IsInt()
-    @Min(10 ** 9) // 10 digits
+    @Min(10 ** 6) // 6 digits
     accountNumber: number;
 }
 export class CheckAccountResponseDto {
@@ -63,15 +63,11 @@ export class SendMoneyDtoV2 extends CheckAccountDto {
     @ApiProperty()
     @IsString()
     @IsNotEmpty()
-    sourceAccount: string;
+    sourceAccount?: string;
 
     @ApiProperty()
     @IsOptional()
-    note: string;
-
-    @ApiProperty()
-    @IsEnum(BankTypeEnum)
-    bankType: BankTypeEnum;
+    note?: string;
 }
 
 export class SendMoneyRequestV2Dto {
@@ -87,3 +83,20 @@ export class SendMoneyRequestV2Dto {
     @IsNotEmpty()
     signature: string;
 }
+
+export class UpdateClientDto {
+    @ApiProperty({ required: false })
+    @IsOptional()
+    @IsString()
+    secret?: string;
+
+    @ApiProperty({ required: false })
+    @IsOptional()
+    @IsString()
+    publicKey?: string;
+
+    @ApiProperty({ enum: ClientType, required: false })
+    @IsOptional()
+    @IsEnum(ClientType)
+    type?: ClientType;
+}
diff --git a/packages/server/src/middlewares/client-request.interceptor.ts b/packages/server/src/middlewares/client-request.interceptor.ts
index cc68c12..fa69c61 100644
--- a/packages/server/src/middlewares/client-request.interceptor.ts
+++ b/packages/server/src/middlewares/client-request.interceptor.ts
@@ -55,6 +55,7 @@ export class ClientRequestInterceptor implements NestInterceptor {
                 data,
             });
         }
+        req.client = client;
 
         return next.handle();
     }
diff --git a/packages/server/src/migrations/1594634609229-transaction_nullable.ts b/packages/server/src/migrations/1594634609229-transaction_nullable.ts
new file mode 100644
index 0000000..927eb5f
--- /dev/null
+++ b/packages/server/src/migrations/1594634609229-transaction_nullable.ts
@@ -0,0 +1,55 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class TransactionNullable1594634609229 implements MigrationInterface {
+    name = "transactionNullable1594634609229";
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `CREATE TABLE "client_transaction_log" ("id" BIGSERIAL NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "updated_at" TIMESTAMP NOT NULL DEFAULT now(), "deleted_at" TIMESTAMP, "client_id" character varying, "transaction_id" bigint, CONSTRAINT "PK_bd0db14d7c0d3ad6b4b77941041" PRIMARY KEY ("id"))`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "client" ADD "type" character varying NOT NULL DEFAULT 'PGP'`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "transaction" ALTER COLUMN "note" DROP NOT NULL`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "transaction" ALTER COLUMN "sourceAccount" DROP NOT NULL`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "transaction" ALTER COLUMN "isRemitterCharge" SET DEFAULT false`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "dept_remind" ALTER COLUMN "completeNote" SET DEFAULT ''`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "client_transaction_log" ADD CONSTRAINT "FK_1cebaaee39c0409db0f00e85348" FOREIGN KEY ("client_id") REFERENCES "client"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "client_transaction_log" ADD CONSTRAINT "FK_a04534cdcd0fcf128b764e0dff6" FOREIGN KEY ("transaction_id") REFERENCES "transaction"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+        );
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(
+            `ALTER TABLE "client_transaction_log" DROP CONSTRAINT "FK_a04534cdcd0fcf128b764e0dff6"`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "client_transaction_log" DROP CONSTRAINT "FK_1cebaaee39c0409db0f00e85348"`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "dept_remind" ALTER COLUMN "completeNote" DROP DEFAULT`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "transaction" ALTER COLUMN "isRemitterCharge" DROP DEFAULT`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "transaction" ALTER COLUMN "sourceAccount" SET NOT NULL`,
+        );
+        await queryRunner.query(
+            `ALTER TABLE "transaction" ALTER COLUMN "note" SET NOT NULL`,
+        );
+        await queryRunner.query(`ALTER TABLE "client" DROP COLUMN "type"`);
+        await queryRunner.query(`DROP TABLE "client_transaction_log"`);
+    }
+}
diff --git a/packages/server/src/models/Client.ts b/packages/server/src/models/Client.ts
index ca084a5..7c4f995 100644
--- a/packages/server/src/models/Client.ts
+++ b/packages/server/src/models/Client.ts
@@ -1,19 +1,36 @@
-import { Column, Entity, PrimaryColumn } from "typeorm";
-import { Exclude } from "class-transformer";
+import { Column, Entity, OneToMany, PrimaryColumn } from "typeorm";
+import { Exclude, Expose } from "class-transformer";
+import { ClientTransactionLog } from "@src/models/ClientTransactionLog";
+
+export enum ClientType {
+    PGP = "PGP",
+    RSA = "RSA",
+}
 
 @Entity()
+@Exclude()
 export class Client {
     @PrimaryColumn()
+    @Expose()
     id: string;
 
     @Column()
-    @Exclude()
     secret: string;
 
     @Column({ nullable: true })
-    @Exclude()
+    @Expose({ groups: ["admin"] })
     publicKey: string;
 
+    @Column({ enum: ClientType, default: ClientType.PGP })
+    @Expose()
+    type: ClientType;
+
+    @OneToMany(() => ClientTransactionLog, (log) => log.client, {
+        lazy: true,
+    })
+    @Expose({ groups: ["admin"] })
+    logs: ClientTransactionLog[];
+
     constructor(data: Partial<Client>) {
         Object.assign(this, data);
     }
diff --git a/packages/server/src/models/ClientTransactionLog.ts b/packages/server/src/models/ClientTransactionLog.ts
new file mode 100644
index 0000000..c6695d6
--- /dev/null
+++ b/packages/server/src/models/ClientTransactionLog.ts
@@ -0,0 +1,17 @@
+import { Base } from "@src/models/Base";
+import { Entity, JoinColumn, ManyToOne } from "typeorm";
+import { Client } from "@src/models/Client";
+import { Transaction } from "@src/models/Transaction";
+
+@Entity({
+    name: "client_transaction_log",
+})
+export class ClientTransactionLog extends Base<ClientTransactionLog> {
+    @ManyToOne(() => Client, { onDelete: "NO ACTION" })
+    @JoinColumn({ name: "client_id" })
+    client: Client;
+
+    @ManyToOne(() => Transaction)
+    @JoinColumn({ name: "transaction_id" })
+    transaction: Transaction;
+}
diff --git a/packages/server/src/models/Transaction.ts b/packages/server/src/models/Transaction.ts
index 1c3dfa7..c554fa8 100644
--- a/packages/server/src/models/Transaction.ts
+++ b/packages/server/src/models/Transaction.ts
@@ -7,13 +7,13 @@ import { User } from "@src/models/User";
     name: "transaction",
 })
 export class Transaction extends Base<Transaction> {
-    @Column()
+    @Column({ nullable: true })
     note: string;
 
-    @Column()
+    @Column({ nullable: true })
     sourceAccount: string;
 
-    @Column()
+    @Column({ nullable: false })
     desAccount: string;
 
     @ManyToOne(() => User, {
diff --git a/packages/server/src/modules/admin/admin.controller.ts b/packages/server/src/modules/admin/admin.controller.ts
index c3c53f2..f10d251 100644
--- a/packages/server/src/modules/admin/admin.controller.ts
+++ b/packages/server/src/modules/admin/admin.controller.ts
@@ -16,6 +16,7 @@ import {
     ApiBearerAuth,
     ApiConsumes,
     ApiOkResponse,
+    ApiParam,
     ApiTags,
 } from "@nestjs/swagger";
 import { ForRoles } from "@src/guards/role.decorator";
@@ -31,6 +32,8 @@ import { RoleGuard } from "@src/guards/role.guard";
 import { JwtGuard } from "@src/guards/jwt.guard";
 import { Request } from "express";
 import { PaginateQueryDto, PaginationDto } from "@src/dto/paginate.dto";
+import { TransformClassToPlain } from "class-transformer";
+import { UpdateClientDto } from "@src/dto/client.dto";
 
 @Controller("admin")
 @ApiTags("admin")
@@ -90,4 +93,51 @@ export class AdminController {
     deleteEmployee(@Param("id") id: number) {
         return this.adminService.deleteEmployee(id);
     }
+
+    @Get("partner")
+    @ForRoles(AdminRole.ADMIN)
+    @TransformClassToPlain({ groups: ["admin"] })
+    getPartners() {
+        return this.adminService.getPartners();
+    }
+
+    @Get("partner/:id")
+    @ForRoles(AdminRole.ADMIN)
+    @ApiParam({ type: String, name: "id" })
+    @TransformClassToPlain({ groups: ["admin"] })
+    getPartnerDetails(@Param("id") id: string) {
+        return this.adminService.getPartner(id);
+    }
+
+    @Put("partner/:id")
+    @ForRoles(AdminRole.ADMIN)
+    @ApiParam({ type: String, name: "id" })
+    @TransformClassToPlain({ groups: ["admin"] })
+    updatePartner(@Body() body: UpdateClientDto, @Param("id") id: string) {
+        return this.adminService.updatePartner(id, body);
+    }
+
+    @Get("partner/:id/transactions")
+    @ForRoles(AdminRole.ADMIN)
+    @ApiParam({ type: String, name: "id" })
+    @TransformClassToPlain({ groups: ["admin"] })
+    getPartnerTransactions(
+        @Param("id") id: string,
+        @Query() q: PaginateQueryDto,
+        @Req() req: Request,
+    ) {
+        return this.adminService.getPartnerTransactions(id, {
+            route: req.path,
+            limit: q.limit,
+            page: q.page,
+        });
+    }
+
+    @Get("partner/:id/transaction-total")
+    @ForRoles(AdminRole.ADMIN)
+    @ApiParam({ type: String, name: "id" })
+    @TransformClassToPlain({ groups: ["admin"] })
+    getPartnerTransactionsTotal(@Param("id") id: string) {
+        return this.adminService.getPartnerTransactionSum(id);
+    }
 }
diff --git a/packages/server/src/modules/admin/admin.module.ts b/packages/server/src/modules/admin/admin.module.ts
index 590b349..64661ad 100644
--- a/packages/server/src/modules/admin/admin.module.ts
+++ b/packages/server/src/modules/admin/admin.module.ts
@@ -3,9 +3,11 @@ import { TypeOrmModule } from "@nestjs/typeorm";
 import { Admin } from "@src/models/Admin";
 import { AdminService } from "@src/modules/admin/admin.service";
 import { AdminController } from "./admin.controller";
+import { Client } from "@src/models";
+import { ClientTransactionLog } from "@src/models/ClientTransactionLog";
 
 @Module({
-    imports: [TypeOrmModule.forFeature([Admin])],
+    imports: [TypeOrmModule.forFeature([Admin, Client, ClientTransactionLog])],
     providers: [AdminService],
     controllers: [AdminController],
     exports: [TypeOrmModule, AdminService],
diff --git a/packages/server/src/modules/admin/admin.service.ts b/packages/server/src/modules/admin/admin.service.ts
index c448723..f9d8634 100644
--- a/packages/server/src/modules/admin/admin.service.ts
+++ b/packages/server/src/modules/admin/admin.service.ts
@@ -18,6 +18,9 @@ import { BankTypeEnum } from "@src/models/ReceiverList";
 import { InjectRepository } from "@nestjs/typeorm";
 import { DepositLog } from "@src/models/DepositLog";
 import { IPaginationOptions, paginate } from "nestjs-typeorm-paginate/index";
+import { Client } from "@src/models";
+import { UpdateClientDto } from "@src/dto/client.dto";
+import { ClientTransactionLog } from "@src/models/ClientTransactionLog";
 
 @Injectable()
 @Console()
@@ -25,6 +28,14 @@ export class AdminService {
     constructor(
         @InjectRepository(Admin)
         private readonly adminRepo: Repository<Admin>,
+
+        @InjectRepository(Client)
+        private readonly partnerRepo: Repository<Client>,
+
+        @InjectRepository(ClientTransactionLog)
+        private readonly partnerTransactionRepo: Repository<
+            ClientTransactionLog
+        >,
     ) {}
 
     async findById(id: number) {
@@ -189,4 +200,52 @@ export class AdminService {
     async deleteEmployee(id: number) {
         return await getRepository(Admin).softDelete(id);
     }
+
+    getPartners() {
+        return this.partnerRepo.find();
+    }
+
+    getPartner(id: string) {
+        return this.partnerRepo.findOne({
+            where: {
+                id,
+            },
+        });
+    }
+
+    updatePartner(id: string, dto: UpdateClientDto) {
+        return this.partnerRepo.update(
+            { id },
+            {
+                secret: dto.secret
+                    ? PasswordEncoder.encode(dto.secret)
+                    : undefined,
+                publicKey: dto.publicKey
+                    ? Buffer.from(dto.publicKey, "utf-8").toString("base64")
+                    : undefined,
+                type: dto.type,
+            },
+        );
+    }
+
+    getPartnerTransactions(id: string, options: IPaginationOptions) {
+        return paginate(this.partnerTransactionRepo, options, {
+            where: {
+                client: {
+                    id,
+                },
+            },
+        });
+    }
+
+    async getPartnerTransactionSum(id: string) {
+        return await this.partnerTransactionRepo
+            .createQueryBuilder("log")
+            .where("log.client_id = :id", { id })
+            .leftJoin(Transaction, "trans", "trans.id = log.transaction_id")
+            .select("COUNT(log.client_id) as transCount")
+            .addSelect("SUM(trans.amount) as transSum")
+            .groupBy("log.client_id")
+            .getRawOne();
+    }
 }
diff --git a/packages/server/src/modules/auth/auth.service.ts b/packages/server/src/modules/auth/auth.service.ts
index 8655eaf..eca86e7 100644
--- a/packages/server/src/modules/auth/auth.service.ts
+++ b/packages/server/src/modules/auth/auth.service.ts
@@ -1,8 +1,9 @@
 import {
     ForbiddenException,
     Injectable,
-    InternalServerErrorException, UnauthorizedException,
-} from '@nestjs/common';
+    InternalServerErrorException,
+    UnauthorizedException,
+} from "@nestjs/common";
 import { JwtService } from "@nestjs/jwt";
 import { JwtConfig } from "@src/config/jwt.config";
 import { AccessTokenDto } from "@src/dto/auth.dto";
diff --git a/packages/server/src/modules/client/client.controller.spec.ts b/packages/server/src/modules/client/client.controller.spec.ts
index b170657..0c8d188 100644
--- a/packages/server/src/modules/client/client.controller.spec.ts
+++ b/packages/server/src/modules/client/client.controller.spec.ts
@@ -2,7 +2,7 @@ import * as moment from "moment";
 import { INestApplication } from "@nestjs/common";
 import { Test } from "@nestjs/testing";
 import { TypeOrmModule } from "@nestjs/typeorm";
-import { BankTypeEnum, Client } from "@src/models";
+import { Client } from "@src/models";
 import * as request from "supertest";
 import { ClientService } from "@src/modules/client/client.service";
 import { MockTypeORMConfig } from "@src/utils/typeorm-mock";
@@ -168,9 +168,10 @@ describe("ClientController", () => {
     });
 
     test("partner-should-be-verify", async () => {
+        const user = await createUser();
         await createClient();
-        const sendData: SendMoneyDto = {
-            accountNumber: 1234567890,
+        const sendData: SendMoneyDtoV2 = {
+            accountNumber: +user.accountNumber,
             amount: 500000,
         };
         const body = await createSignBody(sendData);
@@ -180,7 +181,7 @@ describe("ClientController", () => {
             .digest("hex");
 
         const res = await request(app.getHttpServer())
-            .post("/partner/send/")
+            .post("/partner/send/v2")
             .set("x-partner-time", moment().unix().toString())
             .set("x-partner-hash", hash)
             .auth(testClient.id, testClient.secret)
@@ -191,13 +192,12 @@ describe("ClientController", () => {
     });
 
     test("partner-cant-be-verify-when-diff-json-order-keys", async () => {
-        await app
-            .get(ClientService)
-            .create(testClient.id, testClient.secret, testClient.publicKey);
+        const user = await createUser();
+        await createClient();
         const pgpClient = app.get(PGPService);
-        const sendData: SendMoneyDto = {
+        const sendData: SendMoneyDtoV2 = {
             amount: 500000,
-            accountNumber: 1234567890,
+            accountNumber: +user.accountNumber,
         };
         const signature = await pgpClient.sign(
             JSON.stringify(sendData),
@@ -219,7 +219,7 @@ describe("ClientController", () => {
             .digest("hex");
 
         const res = await request(app.getHttpServer())
-            .post("/partner/send")
+            .post("/partner/send/v2")
             .set("x-partner-time", moment().unix().toString())
             .set("x-partner-hash", hash)
             .auth(testClient.id, testClient.secret)
@@ -229,12 +229,11 @@ describe("ClientController", () => {
     });
 
     test("partner-denied-because-wrong-signature", async () => {
-        await app
-            .get(ClientService)
-            .create(testClient.id, testClient.secret, testClient.publicKey);
+        const user = await createUser();
+        await createClient();
         const pgpClient = app.get(PGPService);
-        const sendData: SendMoneyDto = {
-            accountNumber: 1234567890,
+        const sendData: SendMoneyDtoV2 = {
+            accountNumber: +user.accountNumber,
             amount: 500000,
         };
         const signature = await pgpClient.sign(
@@ -255,7 +254,7 @@ describe("ClientController", () => {
             .digest("hex");
 
         const res = await request(app.getHttpServer())
-            .post("/partner/send")
+            .post("/partner/send/v2")
             .set("x-partner-time", moment().unix().toString())
             .set("x-partner-hash", hash)
             .auth(testClient.id, testClient.secret)
@@ -266,15 +265,12 @@ describe("ClientController", () => {
 
     test("partner-send-ok", async () => {
         const user = await createUser();
-        await app
-            .get(ClientService)
-            .create(testClient.id, testClient.secret, testClient.publicKey);
+        await createClient();
         const sendData: SendMoneyDtoV2 = {
             amount: 500000,
             accountNumber: +user.accountNumber,
             sourceAccount: "123456789",
             note: "dance",
-            bankType: BankTypeEnum.PGP,
         };
 
         const body = await createSignBody(sendData);
@@ -296,15 +292,12 @@ describe("ClientController", () => {
 
     test("partner-send-failed-because-account-not-exist", async () => {
         const user = await createUser();
-        await app
-            .get(ClientService)
-            .create(testClient.id, testClient.secret, testClient.publicKey);
+        await createClient();
         const sendData: SendMoneyDtoV2 = {
             amount: 500000,
             accountNumber: +user.accountNumber + 1000,
             sourceAccount: "123456789",
             note: "dance",
-            bankType: BankTypeEnum.PGP,
         };
 
         const body = await createSignBody(sendData);
diff --git a/packages/server/src/modules/client/client.controller.ts b/packages/server/src/modules/client/client.controller.ts
index d39c5fb..aea306d 100644
--- a/packages/server/src/modules/client/client.controller.ts
+++ b/packages/server/src/modules/client/client.controller.ts
@@ -1,7 +1,9 @@
 import {
     Body,
     Controller,
+    GoneException,
     Post,
+    Req,
     UseGuards,
     UseInterceptors,
 } from "@nestjs/common";
@@ -13,6 +15,7 @@ import {
     ApiForbiddenResponse,
     ApiHeader,
     ApiNotFoundResponse,
+    ApiOperation,
     ApiTags,
     ApiUnauthorizedResponse,
 } from "@nestjs/swagger";
@@ -21,12 +24,12 @@ import * as moment from "moment";
 import {
     CheckAccountDto,
     CheckAccountResponseDto,
-    SendMoneyRequestDto,
     SendMoneyRequestV2Dto,
 } from "@src/dto/client.dto";
 import { ClientRequestInterceptor } from "@src/middlewares/client-request.interceptor";
 import { ClientService } from "./client.service";
 import { TransformClassToPlain } from "class-transformer";
+import { Request } from "express";
 
 @Controller("partner")
 @ApiTags("partner")
@@ -66,17 +69,26 @@ export class ClientController {
     @Post("send")
     @ApiAcceptedResponse({ description: "Accepted send request" })
     @UseInterceptors(ClientRequestInterceptor)
-    makeTransaction(@Body() body: SendMoneyRequestDto) {
-        return body;
+    @ApiOperation({
+        deprecated: true,
+        description: "This API is deprecated, move to /api/partner/send/v2",
+    })
+    makeTransaction() {
+        throw new GoneException(
+            "This API is deprecated, move to /api/partner/send/v2",
+        );
     }
 
     @Post("send/v2")
     @ApiAcceptedResponse({ description: "Accepted send request" })
     @UseInterceptors(ClientRequestInterceptor)
     @TransformClassToPlain({ groups: ["partner"] })
-    makeTransactionV2(@Body() body: SendMoneyRequestV2Dto) {
+    makeTransactionV2(
+        @Body() body: SendMoneyRequestV2Dto,
+        @Req() req: Request,
+    ) {
         return this.clientService.createTransaction(
-            body.data.bankType,
+            req.client,
             body.data.accountNumber.toString(),
             body.data.sourceAccount,
             body.data.note,
diff --git a/packages/server/src/modules/client/client.module.ts b/packages/server/src/modules/client/client.module.ts
index 9ca061f..bce9218 100644
--- a/packages/server/src/modules/client/client.module.ts
+++ b/packages/server/src/modules/client/client.module.ts
@@ -14,11 +14,16 @@ import { ClientCheckMiddleware } from "@src/middlewares/client-check.middleware"
 import { ConfigModule } from "@nestjs/config";
 import { ClientRequestLog } from "@src/models/ClientRequestLog";
 import { UserModule } from "@src/modules/users/user.module";
+import { ClientTransactionLog } from "@src/models/ClientTransactionLog";
 
 @Module({
     imports: [
         ConfigModule,
-        TypeOrmModule.forFeature([Client, ClientRequestLog]),
+        TypeOrmModule.forFeature([
+            Client,
+            ClientRequestLog,
+            ClientTransactionLog,
+        ]),
         ConsoleModule,
         CryptoModule,
         UserModule,
diff --git a/packages/server/src/modules/client/client.service.ts b/packages/server/src/modules/client/client.service.ts
index 85cc5be..9559f1e 100644
--- a/packages/server/src/modules/client/client.service.ts
+++ b/packages/server/src/modules/client/client.service.ts
@@ -1,6 +1,6 @@
 import { BadRequestException, Injectable } from "@nestjs/common";
 import { randomBytes } from "crypto";
-import { FindOneOptions, getRepository, Repository } from "typeorm";
+import { FindOneOptions, getConnection, Repository } from "typeorm";
 import { Client } from "@src/models/Client";
 import { PasswordEncoder } from "@src/utils/passwordEncoder";
 import { Command, Console } from "nestjs-console";
@@ -9,6 +9,7 @@ import { InjectRepository } from "@nestjs/typeorm";
 import { BankTypeEnum } from "@src/models/ReceiverList";
 import { Transaction } from "@src/models/Transaction";
 import { UserService } from "@src/modules/users/user.service";
+import { ClientTransactionLog } from "@src/models/ClientTransactionLog";
 
 @Injectable()
 @Console()
@@ -59,10 +60,10 @@ export class ClientService {
     }
 
     async createTransaction(
-        clientId: BankTypeEnum,
+        client: Client,
         accountNumber: string,
         sourceAccount: string,
-        note: string,
+        note = "",
         amount: number,
     ) {
         const user = await this.userService.findByAccountNumber(accountNumber);
@@ -72,20 +73,38 @@ export class ClientService {
             );
         }
 
-        const transaction = new Transaction({
-            sourceAccount: sourceAccount,
-            desAccount: accountNumber,
-            note: note,
-            amount: amount,
-            isMyBankSend: false,
-            isDebtPay: false,
-            isRemitterCharge: false,
-        });
+        const runner = getConnection().createQueryRunner();
+        await runner.startTransaction();
+        try {
+            const transactionObject = new Transaction({
+                sourceAccount: sourceAccount,
+                desAccount: accountNumber,
+                note: note,
+                amount: amount,
+                isMyBankSend: false,
+                isDebtPay: false,
+                isRemitterCharge: false,
+            });
 
-        if (clientId === BankTypeEnum.RSA)
-            transaction.bankType = BankTypeEnum.RSA;
-        if (clientId === BankTypeEnum.PGP)
-            transaction.bankType = BankTypeEnum.PGP;
-        return await getRepository(Transaction).save(transaction);
+            if (client.type.toString() === BankTypeEnum.RSA)
+                transactionObject.bankType = BankTypeEnum.RSA;
+            if (client.type.toString() === BankTypeEnum.PGP)
+                transactionObject.bankType = BankTypeEnum.PGP;
+            const transaction = await runner.manager.save(transactionObject);
+
+            const transactionLog = new ClientTransactionLog({
+                transaction,
+                client,
+            });
+            await runner.manager.save(transactionLog);
+            await runner.commitTransaction();
+
+            return transaction;
+        } catch (e) {
+            await runner.rollbackTransaction();
+            throw e;
+        } finally {
+            await runner.release();
+        }
     }
 }
diff --git a/packages/server/src/utils/typeorm-mock.ts b/packages/server/src/utils/typeorm-mock.ts
index f2d666f..1e78da4 100644
--- a/packages/server/src/utils/typeorm-mock.ts
+++ b/packages/server/src/utils/typeorm-mock.ts
@@ -9,6 +9,7 @@ import {
     Transaction,
     User,
 } from "@src/models";
+import { ClientTransactionLog } from "@src/models/ClientTransactionLog";
 
 export class MockTypeORMConfig implements TypeOrmOptionsFactory {
     createTypeOrmOptions(
@@ -28,6 +29,7 @@ export class MockTypeORMConfig implements TypeOrmOptionsFactory {
                 OTP,
                 ReceiverList,
                 Transaction,
+                ClientTransactionLog,
             ],
             autoLoadEntities: true,
             name: "default",