diff --git a/src/app/mock-api/apps/bank/deposit/api.ts b/src/app/mock-api/apps/bank/deposit/api.ts
index ce81376..bc8543e 100644
--- a/src/app/mock-api/apps/bank/deposit/api.ts
+++ b/src/app/mock-api/apps/bank/deposit/api.ts
@@ -33,7 +33,7 @@ export class BankDepositMockApi {
.reply(({ request }) => {
// Get available queries
const search = request.params.get('search');
- const sort = request.params.get('sort') || 'name';
+ const sort = request.params.get('sort') || 'signinId';
const order = request.params.get('order') || 'asc';
const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10);
@@ -42,7 +42,7 @@ export class BankDepositMockApi {
let deposits: any[] | null = cloneDeep(this._deposits);
// Sort the deposits
- if (sort === 'sku' || sort === 'name' || sort === 'active') {
+ if (sort === 'signinId' || sort === 'nickname' || sort === 'state') {
deposits.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase();
diff --git a/src/app/mock-api/apps/bank/deposit/data.ts b/src/app/mock-api/apps/bank/deposit/data.ts
index a19b987..53697dc 100644
--- a/src/app/mock-api/apps/bank/deposit/data.ts
+++ b/src/app/mock-api/apps/bank/deposit/data.ts
@@ -2,11 +2,12 @@
export const deposits = [
{
+ id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
rank: '회원',
level: 4,
- id: 'aa100',
+ signinId: 'aa100',
nickname: 'aa100',
- paymentDue: 50000,
+ depositAmount: 50000,
calculateType: '롤링',
accountHolder: '광주은행2sss',
note: '@',
@@ -20,11 +21,12 @@ export const deposits = [
state: '신청',
},
{
+ id: '00b0292f-3d50-4669-a0c4-7a9d85efc98d',
rank: '회원',
level: 1,
- id: 'onon6',
+ signinId: 'onon6',
nickname: '가가가',
- paymentDue: 100000,
+ depositAmount: 100000,
calculateType: '롤링',
accountHolder: '가가가',
note: '',
@@ -38,11 +40,12 @@ export const deposits = [
state: '완료',
},
{
+ id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',
rank: '회원',
level: 1,
- id: 'onon6',
+ signinId: 'onon6',
nickname: '가가가',
- paymentDue: 100000,
+ depositAmount: 100000,
calculateType: '롤링',
accountHolder: '가가가',
note: '',
diff --git a/src/app/modules/admin/bank/deposit/components/list.component.html b/src/app/modules/admin/bank/deposit/components/list.component.html
index c2b0fec..327e835 100644
--- a/src/app/modules/admin/bank/deposit/components/list.component.html
+++ b/src/app/modules/admin/bank/deposit/components/list.component.html
@@ -10,16 +10,39 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
카지노콤프
슬롯콤프
@@ -27,7 +50,7 @@
첫충콤프
-
+
아이디
닉네임
@@ -38,7 +61,8 @@
-
+
-
+
+
+
+
+
+
-
-
-
-
-
-
등급
-
레벨
-
아이디
-
닉네임
-
입금예정금액
-
정산종류
-
회원정보
-
비고
-
등록날짜
-
처리날짜
-
입금출금
-
게임중머니
-
카지노->캐쉬
-
상위
-
상태
-
배팅정보
-
삭제
-
+
예금주
+
정산종류
+
비고
+
입금예정금액
+
+ 등록날짜
+
+ 처리날짜
+
+
입금출금
+
게임중머니
+
카지노->캐쉬
+
회원정보
+
배팅정보
+
삭제
@@ -123,198 +152,87 @@
-
-
- {{ deposit.rank }}
+
+
-
-
- LV.{{ deposit.level }}
-
-
-
-
-
- {{ deposit.id }}
-
-
-
-
-
-
+
{{ deposit.highRank }}
+
+ {{ deposit.signinId }}
+
{{ deposit.nickname }}
+
+ {{ deposit.state }}
-
-
-
- {{ deposit.paymentDue }}원
+
+ {{ deposit.rank }}
+
+ LV{{ deposit.level }}
-
-
-
- {{ deposit.calculateType }}
-
-
-
-
+
{{ deposit.accountHolder }}
-
-
-
- {{ deposit.note }}
-
-
-
-
+
{{ deposit.calculateType }}
+
{{ deposit.note }}
+
{{ deposit.depositAmount }}
+
{{ deposit.registrationDate }}
-
-
-
-
+
{{ deposit.processDate }}
-
-
-
- {{ deposit.deposit }}원 {{ deposit.withdraw }}원
- {{ deposit.total }}원
+
+ 입금{{ deposit.deposit }}
+
+ 출금{{ deposit.withdraw }}
+
+ 계{{ deposit.total }}
-
-
-
+
{{ deposit.gameMoney }}
-
-
-
-
+
+
+ 배팅정보
+
+
+
+
+ 취소
+
+
@@ -340,9 +258,15 @@
-
- 입금 처리
- 대기 처리
-
+
+
+
+ 입금처리
+
+
+
+
+ 대기처리
+
diff --git a/src/app/modules/admin/bank/deposit/components/list.component.ts b/src/app/modules/admin/bank/deposit/components/list.component.ts
index 8440f96..1ac4843 100644
--- a/src/app/modules/admin/bank/deposit/components/list.component.ts
+++ b/src/app/modules/admin/bank/deposit/components/list.component.ts
@@ -41,18 +41,22 @@ import { DepositService } from '../services/deposit.service';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ /* CB 상부 아이디 등급 예금주 정산종류 */
+ grid-template-columns: 20px 100px 100px 80px auto 40px;
@screen sm {
- grid-template-columns: 60px auto 60px 72px;
+ /* CB 상부 아이디 등급 예금주 정산종류 비고 예정 등록*/
+ grid-template-columns: 20px 100px 100px 80px auto 40px 20px 140px 140px;
}
@screen md {
- grid-template-columns: 60px 60px auto 112px 72px;
+ /* CB 상부 아이디 등급 예금주 정산종류 비고 예정 등록 입금출금 */
+ grid-template-columns: 20px 100px 100px 80px auto 40px 20px 100px 100px 100px;
}
@screen lg {
- grid-template-columns: 60px 60px auto 112px 96px 96px 72px;
+ /* CB 상부 아이디 등급 예금주 정산종류 비고 예정 등록 입금출금 게임중 카지노 회원 배팅 삭제*/
+ grid-template-columns: 20px 100px 100px 80px auto 40px 20px 140px 140px 140px 100px 100px 100px 100px 100px;
}
}
`,
@@ -68,6 +72,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
deposits$!: Observable
;
users$!: Observable;
+ __isSearchOpened = false;
isLoading = false;
searchInputControl = new FormControl();
selectedDeposit?: Deposit;
@@ -180,6 +185,14 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
__toggleDetails(productId: string): void {}
+ /**
+ * toggle the search
+ * Used in 'bar'
+ */
+ __onClickSearch(): void {
+ this.__isSearchOpened = !this.__isSearchOpened;
+ }
+
/**
* Track by function for ngFor loops
*
diff --git a/src/app/modules/admin/bank/deposit/deposit.module.ts b/src/app/modules/admin/bank/deposit/deposit.module.ts
index 580e8a9..0cfd6d5 100644
--- a/src/app/modules/admin/bank/deposit/deposit.module.ts
+++ b/src/app/modules/admin/bank/deposit/deposit.module.ts
@@ -11,6 +11,7 @@ import { MatRippleModule } from '@angular/material/core';
import { MatSortModule } from '@angular/material/sort';
import { MatSelectModule } from '@angular/material/select';
import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatCheckboxModule } from '@angular/material/checkbox';
import { TranslocoModule } from '@ngneat/transloco';
@@ -37,6 +38,7 @@ import { depositRoutes } from './deposit.routing';
MatSortModule,
MatSelectModule,
MatTooltipModule,
+ MatCheckboxModule,
],
})
export class DepositModule {}
diff --git a/src/app/modules/admin/bank/deposit/models/deposit.ts b/src/app/modules/admin/bank/deposit/models/deposit.ts
index 4ff3c39..b9da70e 100644
--- a/src/app/modules/admin/bank/deposit/models/deposit.ts
+++ b/src/app/modules/admin/bank/deposit/models/deposit.ts
@@ -1,9 +1,10 @@
export interface Deposit {
- id?: string;
+ id: string;
+ signinId?: string;
rank?: string;
level?: string;
nickname?: string;
- paymentDue?: number;
+ depositAmount?: number; // 입금예정금액
calculateType?: string;
accountHolder?: string;
note?: string;