웹입출금정산 수정

src/app/mock-api/apps/bank/web-calculate/data.ts

@@ -2,57 +2,43 @@
 
 export const webCalculates = [
   {
-    rank: '회원',
+    id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
-    level: 4,
+    webDepositIdx: 1,
-    id: 'aa100',
+    webDepositId: 'onon6',
-    nickname: 'aa100',
+    webDepositNickname: '가가가',
-    paymentDue: 50000,
+    webDepositRank: '회원',
-    calculateType: '롤링',
+    nameOfDepositer: '가가가',
-    accountHolder: '광주은행2sss',
+    webDepositAmountOfPayment: 100000,
-    note: '@',
+    webDepositRegistrationDate: '2022-06-13 12:57',
-    registrationDate: '2022-06-18 13:14',
+    webDepositComfirmDate: '2022-06-13 12:58',
-    processDate: '000-0-0 0:0',
+
-    deposit: 41200000,
+    webWithdrawIdx: 1,
-    withdraw: 19000000,
+    webWithdrawId: 'aa100',
-    total: 22200000,
+    webWithdrawNickname: 'aa100',
-    gameMoney: 67131,
+    webWithdrawRank: '회원',
-    highRank: '[매장]kgon5',
+    accountHolder: '광주은행 예금주22 565656565656',
-    state: '신청',
+    webWithdrawAmountOfPayment: 5000000,
+    webWithdrawRegistrationDate: '2022-06-08 18:31',
+    webWithdrawConfirmDate: '2022-06-12 20:13',
   },
   {
-    rank: '회원',
+    id: '7eb7c859-1347-4317-96b6-9476a7e2ba3c',
-    level: 1,
+    webDepositIdx: 2,
-    id: 'onon6',
+    webDepositId: 'onon6',
-    nickname: '가가가',
+    webDepositNickname: '가가가',
-    paymentDue: 100000,
+    webDepositRank: '회원',
-    calculateType: '롤링',
+    nameOfDepositer: '가가가',
-    accountHolder: '가가가',
+    webDepositAmountOfPayment: 100000,
-    note: '',
+    webDepositRegistrationDate: '2022-06-13 12:56',
-    registrationDate: '2022-06-13 12:57',
+    webDepositComfirmDate: '2022-06-13 12:57',
-    processDate: '2022-06-13 12:58',
+
-    deposit: 200000,
+    webWithdrawIdx: 2,
-    withdraw: 0,
+    webWithdrawId: 'aa100',
-    total: 200000,
+    webWithdrawNickname: 'aa100',
-    gameMoney: 0,
+    webWithdrawRank: '회원',
-    highRank: '[매장]on04',
+    accountHolder: '광주은행 예금주22 565656565656',
-    state: '완료',
+    webWithdrawAmountOfPayment: 14000000,
-  },
+    webWithdrawRegistrationDate: '2022-06-10 18:31',
-  {
+    webWithdrawConfirmDate: '2022-06-10 20:13',
-    rank: '회원',
-    level: 1,
-    id: 'onon6',
-    nickname: '가가가',
-    paymentDue: 100000,
-    calculateType: '롤링',
-    accountHolder: '가가가',
-    note: '',
-    registrationDate: '2022-06-13 12:56',
-    processDate: '2022-06-13 12:57',
-    deposit: 200000,
-    withdraw: 0,
-    total: 200000,
-    gameMoney: 0,
-    highRank: '[매장]on04',
-    state: '완료',
   },
 ];

src/app/modules/admin/bank/deposit/components/list.component.html

@@ -22,7 +22,7 @@
   </div>
 
   <!-- Memo -->
-  <!-- <div
+  <div
     class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
   >
     <mat-form-field
@@ -32,7 +32,7 @@
       <textarea matInput cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
     </mat-form-field>
     <button mat-flat-button [color]="'primary'">메모저장</button>
-  </div> -->
+  </div>
 
   <!-- Search -->
   <div

src/app/modules/admin/bank/web-calculate/components/list.component.html

@@ -10,35 +10,33 @@
       <mat-progress-bar [mode]="'indeterminate'"></mat-progress-bar>
     </div>
     <!-- Title -->
-    <div class="text-4xl font-extrabold tracking-tight">웹 입/출금정산</div>
+    <div class="text-4xl font-extrabold tracking-tight">웹 입출금 정산</div>
     <!-- Actions -->
     <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
-      <!-- Memo -->
+      <!-- Search -->
-      <mat-form-field>
+      <button mat-icon-button (click)="__onClickSearch()">
-        <input matInput type="text" />
+        <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
-      </mat-form-field>
+      </button>
-      <button mat-flat-button [color]="'primary'">메모저장</button>
+    </div>
+  </div>
+  <!-- Search -->
+  <div
+    *ngIf="__isSearchOpened"
+    class="relative flex flex-col sm:flex-row flex-0 sm:items-center sm:justify-between py-4 px-6 md:px-8 border-b"
+  >
+    <!-- Actions -->
+    <div fxLayout="row wrap" class="items-center mt-6 sm:mt-0 sm:ml-0">
       <!-- SelectBox -->
-      <mat-form-field>
+      <mat-form-field fxFlex class="bet-mat-form-field-wrapper-mb-0 mr-2">
-        <mat-select placeholder="내용">
+        <mat-select placeholder="검색어">
-          <mat-option value="">카지노콤프</mat-option>
-          <mat-option value="">슬롯콤프</mat-option>
-          <mat-option value="">배팅콤프</mat-option>
-          <mat-option value="">첫충콤프</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <mat-form-field>
-        <mat-select placeholder="아이디">
           <mat-option value="">아이디</mat-option>
           <mat-option value="">닉네임</mat-option>
-          <mat-option value="">이름</mat-option>
-          <mat-option value="">사이트</mat-option>
-          <mat-option value="">파트너수동지급</mat-option>
         </mat-select>
       </mat-form-field>
       <!-- Search -->
       <mat-form-field
-        class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64"
+        fxFlex
+        class="fuse-mat-rounded min-w-64 bet-mat-form-field-wrapper-mb-0 mr-2"
       >
         <mat-icon
           class="icon-size-5"
@@ -49,28 +47,26 @@
           matInput
           [formControl]="searchInputControl"
           [autocomplete]="'off'"
-          [placeholder]="'Search'"
+          [placeholder]="'Search user'"
         />
       </mat-form-field>
-      <!-- Search button -->
+      <!-- Add user button -->
       <button
-        class="ml-4"
+        fxFlex
         mat-flat-button
+        style="position: fixed; margin-top: 4px"
         [color]="'primary'"
         (click)="__createProduct()"
       >
-        <!-- <mat-icon [svgIcon]="'heroicons_outline:plus'"></mat-icon> -->
+        <mat-icon [svgIcon]="'heroicons_outline:search'"></mat-icon>
-        <span class="ml-2 mr-1">검색하기</span>
+        <span class="ml-2 mr-1">Search</span>
       </button>
     </div>
   </div>
 
   <!-- Main -->
+  <div>웹입금</div>
   <div class="flex flex-auto overflow-hidden">
-    <div class="hidden sm:block truncate">
-      <button mat-flat-button [color]="'primary'">입금 처리</button>
-      <button mat-flat-button [color]="'primary'">대기 처리</button>
-    </div>
     <!-- Products list -->
     <div
       class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
@@ -81,39 +77,21 @@
             <!-- Header -->
             <div
               class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
-              matSort
-              matSortDisableClear
             >
-              <div></div>
+              <div>번호</div>
-              <div class="hidden sm:block">등급</div>
+              <div>
-              <div class="hidden sm:block">레벨</div>
+                아이디
-              <div class="hidden sm:block">아이디</div>
+                <hr style="margin: 7px 0px" />
-              <div class="hidden sm:block">닉네임</div>
+                닉네임
-              <div class="hidden sm:block">입금예정금액</div>
-              <div class="hidden sm:block">정산종류</div>
-              <div class="hidden sm:block">회원정보</div>
-              <div class="hidden sm:block">비고</div>
-              <div class="hidden sm:block">등록날짜</div>
-              <div class="hidden sm:block">처리날짜</div>
-              <div class="hidden sm:block">입금출금</div>
-              <div class="hidden sm:block">게임중머니</div>
-              <div class="hidden sm:block">카지노->캐쉬</div>
-              <div class="hidden sm:block">상위</div>
-              <div class="hidden sm:block">상태</div>
-              <div class="hidden sm:block">배팅정보</div>
-              <div class="hidden sm:block">삭제</div>
-              <!-- <div class="hidden md:block" [mat-sort-header]="'sku'">SKU</div>
-              <div [mat-sort-header]="'name'">Name</div>
-              <div class="hidden sm:block" [mat-sort-header]="'price'">
-                Price
               </div>
-              <div class="hidden lg:block" [mat-sort-header]="'stock'">
+              <div>등급</div>
-                Stock
+              <div class="hidden sm:block">입금자이름</div>
+              <div class="hidden md:block">결제금액</div>
+              <div class="hidden md:block">
+                신청일
+                <hr style="margin: 7px 0px" />
+                확인일
               </div>
-              <div class="hidden lg:block" [mat-sort-header]="'active'">
-                Active
-              </div>
-              <div class="hidden sm:block">Details</div> -->
             </div>
             <!-- Rows -->
             <ng-container *ngIf="webCalculates$ | async as webCalculates">
@@ -123,200 +101,103 @@
                 <div
                   class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
                 >
-                  <!-- rank -->
+                  <div>
-                  <div class="hidden sm:block truncate">
+                    {{ webCalculate.webDepositIdx }}
-                    {{ webCalculate.rank }}
                   </div>
-                  <!-- level -->
+                  <div>
-                  <div class="hidden sm:block truncate">
+                    {{ webCalculate.webDepositId }}
-                    LV.{{ webCalculate.level }}
+                    <hr style="margin: 7px 0px" />
+                    {{ webCalculate.webDepositNickname }}
                   </div>
-                  <!-- id -->
+                  <div>{{ webCalculate.webDepositRank }}</div>
-                  <ng-container *ngIf="users$ | async as users">
+                  <div class="hidden sm:block">
-                    <ng-container
+                    {{ webCalculate.nameOfDepositer }}
-                      *ngFor="let user of users; trackBy: __trackByFn"
-                    >
-                      <div class="hidden sm:block truncate">
-                        {{ webCalculate.id }}
-                      </div>
-                    </ng-container>
-                  </ng-container>
-
-                  <!-- nickname -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.nickname }}
                   </div>
-
+                  <div class="hidden md:block">
-                  <!-- paymentDue -->
+                    {{ webCalculate.webDepositAmountOfPayment }}원
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.paymentDue }}원
                   </div>
-
+                  <div class="hidden md:block">
-                  <!-- calculateType -->
+                    {{ webCalculate.webDepositRegistrationDate }}
-                  <div class="hidden sm:block truncate">
+                    <hr style="margin: 7px 0px" />
-                    {{ webCalculate.calculateType }}
+                    {{ webCalculate.webDepositComfirmDate }}
                   </div>
-
-                  <!-- accountHolder -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.accountHolder }}
-                  </div>
-
-                  <!-- note -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.note }}
-                  </div>
-
-                  <!-- registrationDate -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.registrationDate }}
-                  </div>
-
-                  <!-- processDate -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.processDate }}
-                  </div>
-
-                  <!-- depositWithdrawal -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.deposit }}원 {{ webCalculate.withdraw }}원
-                    {{ webCalculate.total }}원
-                  </div>
-
-                  <!-- gameMoney -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.gameMoney }}
-                  </div>
-
-                  <!-- casinoCash -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니확인
-                    </button>
-                    <button mat-flat-button [color]="'primary'">
-                      게임머니회수
-                    </button>
-                  </div>
-
-                  <!-- highRank -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      {{ webCalculate.highRank }}
-                    </button>
-                  </div>
-
-                  <!-- state -->
-                  <div class="hidden sm:block truncate">
-                    {{ webCalculate.state }}
-                  </div>
-
-                  <!-- bettingInformation -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">
-                      배팅리스트
-                    </button>
-                  </div>
-
-                  <!-- delete -->
-                  <div class="hidden sm:block truncate">
-                    <button mat-flat-button [color]="'primary'">취소</button>
-                  </div>
-                  <!-- Image -->
-                  <!-- <div class="flex items-center">
-                    <div
-                      class="relative flex flex-0 items-center justify-center w-12 h-12 mr-6 rounded overflow-hidden border"
-                    >
-                      <img
-                        class="w-8"
-                        *ngIf="user.thumbnail"
-                        [alt]="'Product thumbnail image'"
-                        [src]="user.thumbnail"
-                      />
-                      <div
-                        class="flex items-center justify-center w-full h-full text-xs font-semibold leading-none text-center uppercase"
-                        *ngIf="!user.thumbnail"
-                      >
-                        NO THUMB
-                      </div>
-                    </div>
-                  </div> -->
-
-                  <!-- SKU -->
-                  <!-- <div class="hidden md:block truncate">
-                    {{ user.sku }}
-                  </div> -->
-
-                  <!-- Name -->
-                  <!-- <div class="truncate">
-                    {{ user.name }}
-                  </div> -->
-
-                  <!-- Price -->
-                  <!-- <div class="hidden sm:block">
-                    {{ user.price | currency: "USD":"symbol":"1.2-2" }}
-                  </div> -->
-
-                  <!-- Stock -->
-                  <!-- <div class="hidden lg:flex items-center">
-                    <div class="min-w-4">{{ user.stock }}</div> -->
-                  <!-- Low stock -->
-                  <!-- <div
-                      class="flex items-end ml-2 w-1 h-4 bg-red-200 rounded overflow-hidden"
-                      *ngIf="user.stock < 20"
-                    >
-                      <div class="flex w-full h-1/3 bg-red-600"></div>
-                    </div> -->
-                  <!-- Medium stock -->
-                  <!-- <div
-                      class="flex items-end ml-2 w-1 h-4 bg-orange-200 rounded overflow-hidden"
-                      *ngIf="user.stock >= 20 && user.stock < 30"
-                    >
-                      <div class="flex w-full h-2/4 bg-orange-400"></div>
-                    </div> -->
-                  <!-- High stock -->
-                  <!-- <div
-                      class="flex items-end ml-2 w-1 h-4 bg-green-100 rounded overflow-hidden"
-                      *ngIf="user.stock >= 30"
-                    >
-                      <div class="flex w-full h-full bg-green-400"></div>
-                    </div>
-                  </div> -->
-
-                  <!-- Active -->
-                  <!-- <div class="hidden lg:block">
-                    <ng-container *ngIf="user.active">
-                      <mat-icon
-                        class="text-green-400 icon-size-5"
-                        [svgIcon]="'heroicons_solid:check'"
-                      ></mat-icon>
-                    </ng-container>
-                    <ng-container *ngIf="!user.active">
-                      <mat-icon
-                        class="text-gray-400 icon-size-5"
-                        [svgIcon]="'heroicons_solid:x'"
-                      ></mat-icon>
-                    </ng-container>
-                  </div> -->
-
-                  <!-- Details button -->
-                  <!-- <div>
-                    <button
-                      class="min-w-10 min-h-7 h-7 px-2 leading-6"
-                      mat-stroked-button
-                      (click)="__toggleDetails(user.id)"
-                    >
-                      <mat-icon
-                        class="icon-size-5"
-                        [svgIcon]="
-                          selectedUser?.id === user.id
-                            ? 'heroicons_solid:chevron-up'
-                            : 'heroicons_solid:chevron-down'
-                        "
-                      ></mat-icon>
-                    </button>
-                  </div> -->
                 </div>
               </ng-container>
+              <div>합계&nbsp;&nbsp;&nbsp;71,300,000원</div>
+            </ng-container>
+          </div>
+        </ng-container>
+      </ng-container>
+
+      <ng-template #noWebCalculate>
+        <div
+          class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
+        >
+          There are no Data!
+        </div>
+      </ng-template>
+    </div>
+  </div>
+  <!-- Main -->
+  <div>웹출금</div>
+  <div class="flex flex-auto overflow-hidden">
+    <!-- Products list -->
+    <div
+      class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
+    >
+      <ng-container *ngIf="webCalculates$ | async as webCalculates">
+        <ng-container *ngIf="webCalculates.length > 0; else noWebCalculate">
+          <div class="grid">
+            <!-- Header -->
+            <div
+              class="inventory-grid z-10 sticky top-0 grid gap-4 py-4 px-6 md:px-8 shadow text-md font-semibold text-secondary bg-gray-50 dark:bg-black dark:bg-opacity-5"
+            >
+              <div>번호</div>
+              <div>
+                아이디
+                <hr style="margin: 7px 0px" />
+                닉네임
+              </div>
+              <div>등급</div>
+              <div class="hidden sm:block">예금주</div>
+              <div class="hidden md:block">결제금액</div>
+              <div class="hidden md:block">
+                신청일
+                <hr style="margin: 7px 0px" />
+                확인일
+              </div>
+            </div>
+            <!-- Rows -->
+            <ng-container *ngIf="webCalculates$ | async as webCalculates">
+              <ng-container
+                *ngFor="let webCalculate of webCalculates; trackBy: __trackByFn"
+              >
+                <div
+                  class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
+                >
+                  <div>
+                    {{ webCalculate.webWithdrawIdx }}
+                  </div>
+                  <div>
+                    {{ webCalculate.webWithdrawId }}
+                    <hr style="margin: 7px 0px" />
+                    {{ webCalculate.webWithdrawNickname }}
+                  </div>
+                  <div>{{ webCalculate.webWithdrawRank }}</div>
+                  <div class="hidden sm:block">
+                    {{ webCalculate.accountHolder }}
+                  </div>
+                  <div class="hidden md:block">
+                    {{ webCalculate.webWithdrawAmountOfPayment }}원
+                  </div>
+                  <div class="hidden md:block">
+                    {{ webCalculate.webWithdrawRegistrationDate }}
+                    <hr style="margin: 7px 0px" />
+                    {{ webCalculate.webWithdrawConfirmDate }}
+                  </div>
+                </div>
+              </ng-container>
+              <div>합계&nbsp;&nbsp;&nbsp;19,010,000원</div>
             </ng-container>
           </div>
 
@@ -336,13 +217,9 @@
         <div
           class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
         >
-          There are no Web Calculate!
+          There are no Data!
         </div>
       </ng-template>
     </div>
-    <div class="hidden sm:block truncate">
-      <button mat-flat-button [color]="'primary'">입금 처리</button>
-      <button mat-flat-button [color]="'primary'">대기 처리</button>
-    </div>
   </div>
 </div>

src/app/modules/admin/bank/web-calculate/components/list.component.ts

@@ -35,24 +35,28 @@ import { WebCalculatePagination } from '../models/web-calculate-pagination';
 import { WebCalculateService } from '../services/web-calculate.service';
 
 @Component({
-  selector: 'bank-list',
+  selector: 'web-calculate-list',
   templateUrl: './list.component.html',
   styles: [
     /* language=SCSS */
     `
       .inventory-grid {
-        grid-template-columns: 60px auto 40px;
+        /*                     번호  아이디 등급  입금자 결제 */
+        grid-template-columns: 40px 140px 100px auto 140px;
 
         @screen sm {
-          grid-template-columns: 60px auto 60px 72px;
+          /*                     번호  아이디 등급  입금자 결제   신청 */
+          grid-template-columns: 40px 140px 100px auto 140px 140px;
         }
 
         @screen md {
-          grid-template-columns: 60px 60px auto 112px 72px;
+          /*                     번호  아이디  등급  입금자 결제  신청 */
+          grid-template-columns: 40px 140px 100px auto 140px 140px;
         }
 
         @screen lg {
-          grid-template-columns: 60px 60px auto 112px 96px 96px 72px;
+          /*                     번호  아이디 등급  입금자 결제   신청   */
+          grid-template-columns: 40px 100px auto 40px 140px 140px;
         }
       }
     `,
@@ -68,6 +72,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   webCalculates$!: Observable<WebCalculate[] | undefined>;
   users$!: Observable<User[] | undefined>;
 
+  __isSearchOpened = false;
   isLoading = false;
   searchInputControl = new FormControl();
   selectedWebCalculate?: WebCalculate;
@@ -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
    *

src/app/modules/admin/bank/web-calculate/models/web-calculate.ts

@@ -1,18 +1,20 @@
 export interface WebCalculate {
-  id?: string;
+  id: string;
-  rank?: string;
+  webDepositIdx?: number; //  웹입금 idx
-  level?: string;
+  webDepositId?: string; //  웹입금 아이디
-  nickname?: string;
+  webDepositNickname?: string; //  웹입금 닉네임
-  paymentDue?: number;
+  webDepositRank?: string; //  웹입금 등급
-  calculateType?: string;
+  nameOfDepositer?: string; //  입금자명
+  webDepositAmountOfPayment?: number; //  웹입금 결제금액
+  webDepositRegistrationDate?: Date; //  웹입금 신청일
+  webDepositComfirmDate?: Date; //  웹입금 확인일
+
+  webWithdrawIdx?: number; //  웹출금 idx
+  webWithdrawId?: string; //  웹출금 아이디
+  webWithdrawNickname?: string; //  웹출금 닉네임
+  webWithdrawRank?: string; //  웹출금 등급
   accountHolder?: string;
-  note?: string;
+  webWithdrawAmountOfPayment?: number; //  웹출금 결제금액
-  registrationDate?: string;
+  webWithdrawRegistrationDate?: Date; //  웹출금 신청일
-  processDate?: string;
+  webWithdrawConfirmDate?: Date; //  웹출금 확인일
-  deposit?: number;
-  withdraw?: number;
-  total?: number;
-  gameMoney?: number;
-  highRank?: string;
-  state?: string;
 }