bet/beteran-backend-app-browser
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

고객센터 page 수정

Browse Source
This commit is contained in:
이담 정 2022-07-14 18:17:04 +00:00
parent 0f0063844f
commit 4fc5f9f9f0
19 changed files with 169 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.routing.ts
View File

@ -491,10 +491,10 @@ export const appRoutes: Route[] = [
), ),
}, },
{ {
path: 'service', path: 'customer',
loadChildren: () => loadChildren: () =>
import('app/modules/admin/board/service/service.module').then( import('app/modules/admin/board/customer/customer.module').then(
(m: any) => m.ServiceModule (m: any) => m.CustomerModule
), ),
}, },
{ {

104
src/app/mock-api/apps/board/service/api.ts → src/app/mock-api/apps/board/customer/api.ts
View File

@ -1,13 +1,13 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { assign, cloneDeep } from 'lodash-es'; import { assign, cloneDeep } from 'lodash-es';
import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api'; import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api';
import { services as servicesData } from './data'; import { customers as customersData } from './data';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class BoardServiceMockApi { export class BoardCustomerMockApi {
private _services: any[] = servicesData; private _customers: any[] = customersData;
/** /**
* Constructor * Constructor
@ -26,10 +26,10 @@ export class BoardServiceMockApi {
*/ */
registerHandlers(): void { registerHandlers(): void {
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Services - GET // @ Customers - GET
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
this._fuseMockApiService this._fuseMockApiService
.onGet('api/apps/board/service/services', 300) .onGet('api/apps/board/customer/customers', 300)
.reply(({ request }) => { .reply(({ request }) => {
// Get available queries // Get available queries
const search = request.params.get('search'); const search = request.params.get('search');
@ -38,12 +38,12 @@ export class BoardServiceMockApi {
const page = parseInt(request.params.get('page') ?? '1', 10); const page = parseInt(request.params.get('page') ?? '1', 10);
const size = parseInt(request.params.get('size') ?? '10', 10); const size = parseInt(request.params.get('size') ?? '10', 10);
// Clone the services // Clone the customers
let services: any[] | null = cloneDeep(this._services); let customers: any[] | null = cloneDeep(this._customers);
// Sort the services // Sort the customers
if (sort === 'sku' || sort === 'name' || sort === 'active') { if (sort === 'sku' || sort === 'name' || sort === 'active') {
services.sort((a, b) => { customers.sort((a, b) => {
const fieldA = a[sort].toString().toUpperCase(); const fieldA = a[sort].toString().toUpperCase();
const fieldB = b[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase();
return order === 'asc' return order === 'asc'
@ -51,15 +51,15 @@ export class BoardServiceMockApi {
: fieldB.localeCompare(fieldA); : fieldB.localeCompare(fieldA);
}); });
} else { } else {
services.sort((a, b) => customers.sort((a, b) =>
order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort]
); );
} }
// If search exists... // If search exists...
if (search) { if (search) {
// Filter the services // Filter the customers
services = services.filter( customers = customers.filter(
(contact: any) => (contact: any) =>
contact.name && contact.name &&
contact.name.toLowerCase().includes(search.toLowerCase()) contact.name.toLowerCase().includes(search.toLowerCase())
@ -67,32 +67,32 @@ export class BoardServiceMockApi {
} }
// Paginate - Start // Paginate - Start
const servicesLength = services.length; const customersLength = customers.length;
// Calculate pagination details // Calculate pagination details
const begin = page * size; const begin = page * size;
const end = Math.min(size * (page + 1), servicesLength); const end = Math.min(size * (page + 1), customersLength);
const lastPage = Math.max(Math.ceil(servicesLength / size), 1); const lastPage = Math.max(Math.ceil(customersLength / size), 1);
// Prepare the pagination object // Prepare the pagination object
let pagination = {}; let pagination = {};
// If the requested page number is bigger than // If the requested page number is bigger than
// the last possible page number, return null for // the last possible page number, return null for
// services but also send the last possible page so // customers but also send the last possible page so
// the app can navigate to there // the app can navigate to there
if (page > lastPage) { if (page > lastPage) {
services = null; customers = null;
pagination = { pagination = {
lastPage, lastPage,
}; };
} else { } else {
// Paginate the results by size // Paginate the results by size
services = services.slice(begin, end); customers = customers.slice(begin, end);
// Prepare the pagination mock-api // Prepare the pagination mock-api
pagination = { pagination = {
length: servicesLength, length: customersLength,
size: size, size: size,
page: page, page: page,
lastPage: lastPage, lastPage: lastPage,
@ -105,39 +105,39 @@ export class BoardServiceMockApi {
return [ return [
200, 200,
{ {
services, customers,
pagination, pagination,
}, },
]; ];
}); });
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Service - GET // @ Customer - GET
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
this._fuseMockApiService this._fuseMockApiService
.onGet('api/apps/board/service/service') .onGet('api/apps/board/customer/customer')
.reply(({ request }) => { .reply(({ request }) => {
// Get the id from the params // Get the id from the params
const id = request.params.get('id'); const id = request.params.get('id');
// Clone the services // Clone the customers
const services = cloneDeep(this._services); const customers = cloneDeep(this._customers);
// Find the service // Find the customer
const service = services.find((item: any) => item.id === id); const customer = customers.find((item: any) => item.id === id);
// Return the response // Return the response
return [200, service]; return [200, customer];
}); });
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Service - POST // @ Customer - POST
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
this._fuseMockApiService this._fuseMockApiService
.onPost('api/apps/board/service/service') .onPost('api/apps/board/customer/customer')
.reply(() => { .reply(() => {
// Generate a new service // Generate a new customer
const newService = { const newCustomer = {
id: FuseMockApiUtils.guid(), id: FuseMockApiUtils.guid(),
category: '', category: '',
name: 'A New User', name: 'A New User',
@ -159,54 +159,54 @@ export class BoardServiceMockApi {
active: false, active: false,
}; };
// Unshift the new service // Unshift the new customer
this._services.unshift(newService); this._customers.unshift(newCustomer);
// Return the response // Return the response
return [200, newService]; return [200, newCustomer];
}); });
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Service - PATCH // @ Customer - PATCH
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
this._fuseMockApiService this._fuseMockApiService
.onPatch('api/apps/board/service/service') .onPatch('api/apps/board/customer/customer')
.reply(({ request }) => { .reply(({ request }) => {
// Get the id and service // Get the id and customer
const id = request.body.id; const id = request.body.id;
const service = cloneDeep(request.body.service); const customer = cloneDeep(request.body.customer);
// Prepare the updated service // Prepare the updated customer
let updatedService = null; let updatedCustomer = null;
// Find the service and update it // Find the customer and update it
this._services.forEach((item, index, services) => { this._customers.forEach((item, index, customers) => {
if (item.id === id) { if (item.id === id) {
// Update the service // Update the customer
services[index] = assign({}, services[index], service); customers[index] = assign({}, customers[index], customer);
// Store the updated service // Store the updated customer
updatedService = services[index]; updatedCustomer = customers[index];
} }
}); });
// Return the response // Return the response
return [200, updatedService]; return [200, updatedCustomer];
}); });
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Service - DELETE // @ Customer - DELETE
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
this._fuseMockApiService this._fuseMockApiService
.onDelete('api/apps/board/service/service') .onDelete('api/apps/board/customer/customer')
.reply(({ request }) => { .reply(({ request }) => {
// Get the id // Get the id
const id = request.params.get('id'); const id = request.params.get('id');
// Find the service and delete it // Find the customer and delete it
this._services.forEach((item, index) => { this._customers.forEach((item, index) => {
if (item.id === id) { if (item.id === id) {
this._services.splice(index, 1); this._customers.splice(index, 1);
} }
}); });

2
src/app/mock-api/apps/board/service/data.ts → src/app/mock-api/apps/board/customer/data.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable */ /* eslint-disable */
export const services = [ export const customers = [
{ {
id: 'on00', id: 'on00',
totalPartnerCount: '5', totalPartnerCount: '5',

6
src/app/mock-api/common/navigation/data.ts
View File

@ -357,11 +357,11 @@ export const defaultNavigation: FuseNavigationItem[] = [
link: '/board/message', link: '/board/message',
}, },
{ {
id: 'board.service', id: 'board.customer',
title: 'Service', title: 'Customer',
type: 'basic', type: 'basic',
icon: 'heroicons_outline:academic-cap', icon: 'heroicons_outline:academic-cap',
link: '/board/service', link: '/board/customer',
}, },
{ {
id: 'board.customer-template', id: 'board.customer-template',

4
src/app/mock-api/index.ts
View File

@ -67,7 +67,7 @@ import { BoardNoticeMockApi } from './apps/board/notice/api';
import { BoardNoticeOnelineMockApi } from './apps/board/notice-oneline/api'; import { BoardNoticeOnelineMockApi } from './apps/board/notice-oneline/api';
import { BoardPopupMockApi } from './apps/board/popup/api'; import { BoardPopupMockApi } from './apps/board/popup/api';
import { BoardMessageMockApi } from './apps/board/message/api'; import { BoardMessageMockApi } from './apps/board/message/api';
import { BoardServiceMockApi } from './apps/board/service/api'; import { BoardCustomerMockApi } from './apps/board/customer/api';
import { BoardCustomerTemplateMockApi } from './apps/board/customer-template/api'; import { BoardCustomerTemplateMockApi } from './apps/board/customer-template/api';
export const mockApiServices = [ export const mockApiServices = [
@ -140,6 +140,6 @@ export const mockApiServices = [
BoardNoticeOnelineMockApi, BoardNoticeOnelineMockApi,
BoardPopupMockApi, BoardPopupMockApi,
BoardMessageMockApi, BoardMessageMockApi,
BoardServiceMockApi, BoardCustomerMockApi,
BoardCustomerTemplateMockApi, BoardCustomerTemplateMockApi,
]; ];

0
src/app/modules/admin/board/service/components/index.ts → src/app/modules/admin/board/customer/components/index.ts
View File

70
src/app/modules/admin/board/service/components/list.component.html → src/app/modules/admin/board/customer/components/list.component.html
View File

@ -15,19 +15,19 @@
<div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4"> <div class="flex shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Memo --> <!-- Memo -->
<!-- <mat-form-field> <!-- <mat-form-field>
<ng-container *ngIf="services$ | async as services"> <ng-container *ngIf="customers$ | async as customers">
<ng-container <ng-container
*ngFor="let service of services; trackBy: __trackByFn" *ngFor="let customer of customers; trackBy: __trackByFn"
> >
<div <div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b" class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
> >
<fieldset> <fieldset>
총 파트너수:{{ service.totalPartnerCount }} 총 보유머니:{{ 총 파트너수:{{ customer.totalPartnerCount }} 총 보유머니:{{
service.totalHoldingMoney customer.totalHoldingMoney
}} }}
총 콤프:{{ service.totalComp }} 총 합계:{{ 총 콤프:{{ customer.totalComp }} 총 합계:{{
service.total customer.total
}} }}
</fieldset> </fieldset>
</div> </div>
@ -151,8 +151,8 @@
<div <div
class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto" class="flex flex-col flex-auto sm:mb-18 overflow-hidden sm:overflow-y-auto"
> >
<ng-container *ngIf="services$ | async as services"> <ng-container *ngIf="customers$ | async as customers">
<ng-container *ngIf="services.length > 0; else noService"> <ng-container *ngIf="customers.length > 0; else noCustomer">
<div class="grid"> <div class="grid">
<!-- Header --> <!-- Header -->
<div <div
@ -182,9 +182,9 @@
<div class="hidden sm:block">비고</div> <div class="hidden sm:block">비고</div>
</div> </div>
<!-- Rows --> <!-- Rows -->
<ng-container *ngIf="services$ | async as services"> <ng-container *ngIf="customers$ | async as customers">
<ng-container <ng-container
*ngFor="let service of services; trackBy: __trackByFn" *ngFor="let customer of customers; trackBy: __trackByFn"
> >
<div <div
class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b" class="inventory-grid grid items-center gap-4 py-3 px-6 md:px-8 border-b"
@ -228,22 +228,22 @@
<!-- 매장수 --> <!-- 매장수 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'"> <button mat-flat-button [color]="'primary'">
{{ service.branchCount }} {{ customer.branchCount }}
</button> </button>
<button mat-flat-button [color]="'primary'"> <button mat-flat-button [color]="'primary'">
{{ service.divisionCount }} {{ customer.divisionCount }}
</button> </button>
<button mat-flat-button [color]="'primary'"> <button mat-flat-button [color]="'primary'">
{{ service.officeCount }} {{ customer.officeCount }}
</button> </button>
<button mat-flat-button [color]="'primary'"> <button mat-flat-button [color]="'primary'">
{{ service.storeCount }} {{ customer.storeCount }}
</button> </button>
</div> </div>
<!-- 회원수 --> <!-- 회원수 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'"> <button mat-flat-button [color]="'primary'">
{{ service.memberCount }} {{ customer.memberCount }}
</button> </button>
</div> </div>
<!-- id --> <!-- id -->
@ -255,35 +255,35 @@
class="hidden sm:block truncate" class="hidden sm:block truncate"
(click)="viewUserDetail(user.id!)" (click)="viewUserDetail(user.id!)"
> >
{{ service.id }} {{ customer.id }}
</div> </div>
</ng-container> </ng-container>
</ng-container> </ng-container>
<!-- nickname --> <!-- nickname -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.nickname }} {{ customer.nickname }}
</div> </div>
<!-- accountHolder --> <!-- accountHolder -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.accountHolder }} {{ customer.accountHolder }}
</div> </div>
<!-- 연락처 --> <!-- 연락처 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.phoneNumber }} {{ customer.phoneNumber }}
</div> </div>
<!-- 정산 --> <!-- 정산 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.calculateType }} {{ customer.calculateType }}
</div> </div>
<!-- 보유금 --> <!-- 보유금 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
캐쉬{{ service.ownCash }} 콤프{{ service.ownComp }} 쿠폰{{ 캐쉬{{ customer.ownCash }} 콤프{{ customer.ownComp }} 쿠폰{{
service.ownCoupon customer.ownCoupon
}} }}
</div> </div>
<!-- gameMoney --> <!-- gameMoney -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.gameMoney }} {{ customer.gameMoney }}
</div> </div>
<!-- casinoCash --> <!-- casinoCash -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
@ -296,34 +296,34 @@
</div> </div>
<!-- todayComp --> <!-- todayComp -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.todayComp }}P {{ customer.todayComp }}P
</div> </div>
<!-- 총입출 --> <!-- 총입출 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
입금{{ service.totalDeposit }} 출금{{ 입금{{ customer.totalDeposit }} 출금{{
service.totalWithdraw customer.totalWithdraw
}} }}
차익{{ service.balance }} 차익{{ customer.balance }}
</div> </div>
<!-- log --> <!-- log -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
가입{{ service.registDate }} 최종{{ 가입{{ customer.registDate }} 최종{{
service.finalSigninDate customer.finalSigninDate
}} }}
IP{{ service.ip }} IP{{ customer.ip }}
</div> </div>
<!-- state --> <!-- state -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.state }} {{ customer.state }}
</div> </div>
<!-- 회원수 --> <!-- 회원수 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
{{ service.memberCount }} {{ customer.memberCount }}
</div> </div>
<!-- 비고 --> <!-- 비고 -->
<div class="hidden sm:block truncate"> <div class="hidden sm:block truncate">
<button mat-flat-button [color]="'primary'"> <button mat-flat-button [color]="'primary'">
{{ service.note }} {{ customer.note }}
</button> </button>
</div> </div>
</div> </div>
@ -343,11 +343,11 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-template #noService> <ng-template #noCustomer>
<div <div
class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center" class="p-8 sm:p-16 border-t text-4xl font-semibold tracking-tight text-center"
> >
There are no services! There are no customers!
</div> </div>
</ng-template> </ng-template>
</div> </div>

26
src/app/modules/admin/board/service/components/list.component.ts → src/app/modules/admin/board/customer/components/list.component.ts
View File

@ -30,13 +30,13 @@ import { fuseAnimations } from '@fuse/animations';
import { FuseConfirmationService } from '@fuse/services/confirmation'; import { FuseConfirmationService } from '@fuse/services/confirmation';
import { User } from '../../../member/user/models/user'; import { User } from '../../../member/user/models/user';
import { Service } from '../models/service'; import { Customer } from '../models/customer';
import { ServicePagination } from '../models/service-pagination'; import { CustomerPagination } from '../models/customer-pagination';
import { ServiceService } from '../services/service.service'; import { CustomerService } from '../services/customer.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@Component({ @Component({
selector: 'service-list', selector: 'customer-list',
templateUrl: './list.component.html', templateUrl: './list.component.html',
styles: [ styles: [
/* language=SCSS */ /* language=SCSS */
@ -66,13 +66,13 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatPaginator) private _paginator!: MatPaginator; @ViewChild(MatPaginator) private _paginator!: MatPaginator;
@ViewChild(MatSort) private _sort!: MatSort; @ViewChild(MatSort) private _sort!: MatSort;
services$!: Observable<Service[] | undefined>; customers$!: Observable<Customer[] | undefined>;
users$!: Observable<User[] | undefined>; users$!: Observable<User[] | undefined>;
isLoading = false; isLoading = false;
searchInputControl = new FormControl(); searchInputControl = new FormControl();
selectedService?: Service; selectedCustomer?: Customer;
pagination?: ServicePagination; pagination?: CustomerPagination;
private _unsubscribeAll: Subject<any> = new Subject<any>(); private _unsubscribeAll: Subject<any> = new Subject<any>();
@ -83,7 +83,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
private _changeDetectorRef: ChangeDetectorRef, private _changeDetectorRef: ChangeDetectorRef,
private _fuseConfirmationService: FuseConfirmationService, private _fuseConfirmationService: FuseConfirmationService,
private _formBuilder: FormBuilder, private _formBuilder: FormBuilder,
private _serviceService: ServiceService, private _customerService: CustomerService,
private router: Router private router: Router
) {} ) {}
@ -96,9 +96,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/ */
ngOnInit(): void { ngOnInit(): void {
// Get the pagination // Get the pagination
this._serviceService.pagination$ this._customerService.pagination$
.pipe(takeUntil(this._unsubscribeAll)) .pipe(takeUntil(this._unsubscribeAll))
.subscribe((pagination: ServicePagination | undefined) => { .subscribe((pagination: CustomerPagination | undefined) => {
// Update the pagination // Update the pagination
this.pagination = pagination; this.pagination = pagination;
@ -107,7 +107,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
}); });
// Get the products // Get the products
this.services$ = this._serviceService.services$; this.customers$ = this._customerService.customers$;
} }
/** /**
@ -125,7 +125,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
// Mark for check // Mark for check
this._changeDetectorRef.markForCheck(); this._changeDetectorRef.markForCheck();
// If the service changes the sort order... // If the customer changes the sort order...
this._sort.sortChange this._sort.sortChange
.pipe(takeUntil(this._unsubscribeAll)) .pipe(takeUntil(this._unsubscribeAll))
.subscribe(() => { .subscribe(() => {
@ -138,7 +138,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
.pipe( .pipe(
switchMap(() => { switchMap(() => {
this.isLoading = true; this.isLoading = true;
return this._serviceService.getServices( return this._customerService.getCustomers(
this._paginator.pageIndex, this._paginator.pageIndex,
this._paginator.pageSize, this._paginator.pageSize,
this._sort.active, this._sort.active,

6
src/app/modules/admin/board/service/service.module.ts → src/app/modules/admin/board/customer/customer.module.ts
View File

@ -22,14 +22,14 @@ import { SharedModule } from 'app/shared/shared.module';
import { COMPONENTS } from './components'; import { COMPONENTS } from './components';
import { serviceRoutes } from './service.routing'; import { customerRoutes } from './customer.routing';
@NgModule({ @NgModule({
declarations: [COMPONENTS], declarations: [COMPONENTS],
imports: [ imports: [
TranslocoModule, TranslocoModule,
SharedModule, SharedModule,
RouterModule.forChild(serviceRoutes), RouterModule.forChild(customerRoutes),
MatButtonModule, MatButtonModule,
MatFormFieldModule, MatFormFieldModule,
@ -47,4 +47,4 @@ import { serviceRoutes } from './service.routing';
MatCheckboxModule, MatCheckboxModule,
], ],
}) })
export class ServiceModule {} export class CustomerModule {}

6
src/app/modules/admin/board/service/service.routing.ts → src/app/modules/admin/board/customer/customer.routing.ts
View File

@ -3,15 +3,15 @@ import { Route } from '@angular/router';
import { ListComponent } from './components/list.component'; import { ListComponent } from './components/list.component';
import { ViewComponent } from '../../member/user/components/view.component'; import { ViewComponent } from '../../member/user/components/view.component';
import { ServicesResolver } from './resolvers/service.resolver'; import { CustomersResolver } from './resolvers/customer.resolver';
import { UserResolver } from '../../member/user/resolvers/user.resolver'; import { UserResolver } from '../../member/user/resolvers/user.resolver';
export const serviceRoutes: Route[] = [ export const customerRoutes: Route[] = [
{ {
path: '', path: '',
component: ListComponent, component: ListComponent,
resolve: { resolve: {
services: ServicesResolver, customers: CustomersResolver,
}, },
}, },
{ {

2
src/app/modules/admin/board/service/models/service-pagination.ts → src/app/modules/admin/board/customer/models/customer-pagination.ts
View File

@ -1,4 +1,4 @@
export interface ServicePagination { export interface CustomerPagination {
length: number; length: number;
size: number; size: number;
page: number; page: number;

2
src/app/modules/admin/board/service/models/service.ts → src/app/modules/admin/board/customer/models/customer.ts
View File

@ -1,4 +1,4 @@
export interface Service { export interface Customer {
id?: string; id?: string;
totalPartnerCount?: number; totalPartnerCount?: number;
totalHoldingMoney?: number; totalHoldingMoney?: number;

24
src/app/modules/admin/board/service/resolvers/service.resolver.ts → src/app/modules/admin/board/customer/resolvers/customer.resolver.ts
View File

@ -7,19 +7,19 @@ import {
} from '@angular/router'; } from '@angular/router';
import { catchError, Observable, throwError } from 'rxjs'; import { catchError, Observable, throwError } from 'rxjs';
import { Service } from '../models/service'; import { Customer } from '../models/customer';
import { ServicePagination } from '../models/service-pagination'; import { CustomerPagination } from '../models/customer-pagination';
import { ServiceService } from '../services/service.service'; import { CustomerService } from '../services/customer.service';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class ServiceResolver implements Resolve<any> { export class CustomerResolver implements Resolve<any> {
/** /**
* Constructor * Constructor
*/ */
constructor( constructor(
private _serviceService: ServiceService, private _customerService: CustomerService,
private _router: Router private _router: Router
) {} ) {}
@ -36,8 +36,8 @@ export class ServiceResolver implements Resolve<any> {
resolve( resolve(
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot state: RouterStateSnapshot
): Observable<Service | undefined> { ): Observable<Customer | undefined> {
return this._serviceService.getServiceById(route.paramMap.get('id')).pipe( return this._customerService.getCustomerById(route.paramMap.get('id')).pipe(
// Error here means the requested product is not available // Error here means the requested product is not available
catchError((error) => { catchError((error) => {
// Log the error // Log the error
@ -59,11 +59,11 @@ export class ServiceResolver implements Resolve<any> {
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class ServicesResolver implements Resolve<any> { export class CustomersResolver implements Resolve<any> {
/** /**
* Constructor * Constructor
*/ */
constructor(private _serviceService: ServiceService) {} constructor(private _customerService: CustomerService) {}
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
// @ Public methods // @ Public methods
@ -79,9 +79,9 @@ export class ServicesResolver implements Resolve<any> {
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot state: RouterStateSnapshot
): Observable<{ ): Observable<{
pagination: ServicePagination; pagination: CustomerPagination;
services: Service[]; customers: Customer[];
}> { }> {
return this._serviceService.getServices(); return this._customerService.getCustomers();
} }
} }

72
src/app/modules/admin/board/service/services/service.service.ts → src/app/modules/admin/board/customer/services/customer.service.ts
View File

@ -12,19 +12,19 @@ import {
throwError, throwError,
} from 'rxjs'; } from 'rxjs';
import { Service } from '../models/service'; import { Customer } from '../models/customer';
import { ServicePagination } from '../models/service-pagination'; import { CustomerPagination } from '../models/customer-pagination';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class ServiceService { export class CustomerService {
// Private // Private
private __pagination = new BehaviorSubject<ServicePagination | undefined>( private __pagination = new BehaviorSubject<CustomerPagination | undefined>(
undefined undefined
); );
private __service = new BehaviorSubject<Service | undefined>(undefined); private __customer = new BehaviorSubject<Customer | undefined>(undefined);
private __services = new BehaviorSubject<Service[] | undefined>(undefined); private __customers = new BehaviorSubject<Customer[] | undefined>(undefined);
/** /**
* Constructor * Constructor
@ -38,22 +38,22 @@ export class ServiceService {
/** /**
* Getter for pagination * Getter for pagination
*/ */
get pagination$(): Observable<ServicePagination | undefined> { get pagination$(): Observable<CustomerPagination | undefined> {
return this.__pagination.asObservable(); return this.__pagination.asObservable();
} }
/** /**
* Getter for service * Getter for customer
*/ */
get service$(): Observable<Service | undefined> { get customer$(): Observable<Customer | undefined> {
return this.__service.asObservable(); return this.__customer.asObservable();
} }
/** /**
* Getter for services * Getter for customers
*/ */
get services$(): Observable<Service[] | undefined> { get customers$(): Observable<Customer[] | undefined> {
return this.__services.asObservable(); return this.__customers.asObservable();
} }
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
@ -61,7 +61,7 @@ export class ServiceService {
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
/** /**
* Get Services * Get customers
* *
* *
* @param page * @param page
@ -70,21 +70,21 @@ export class ServiceService {
* @param order * @param order
* @param search * @param search
*/ */
getServices( getCustomers(
page: number = 0, page: number = 0,
size: number = 10, size: number = 10,
sort: string = 'name', sort: string = 'name',
order: 'asc' | 'desc' | '' = 'asc', order: 'asc' | 'desc' | '' = 'asc',
search: string = '' search: string = ''
): Observable<{ ): Observable<{
pagination: ServicePagination; pagination: CustomerPagination;
services: Service[]; customers: Customer[];
}> { }> {
return this._httpClient return this._httpClient
.get<{ .get<{
pagination: ServicePagination; pagination: CustomerPagination;
services: Service[]; customers: Customer[];
}>('api/apps/board/service/services', { }>('api/apps/board/customer/customers', {
params: { params: {
page: '' + page, page: '' + page,
size: '' + size, size: '' + size,
@ -96,7 +96,7 @@ export class ServiceService {
.pipe( .pipe(
tap((response) => { tap((response) => {
this.__pagination.next(response.pagination); this.__pagination.next(response.pagination);
this.__services.next(response.services); this.__customers.next(response.customers);
}) })
); );
} }
@ -104,18 +104,18 @@ export class ServiceService {
/** /**
* Get product by id * Get product by id
*/ */
getServiceById(id: string | null): Observable<Service> { getCustomerById(id: string | null): Observable<Customer> {
return this.__services.pipe( return this.__customers.pipe(
take(1), take(1),
map((services) => { map((customers) => {
// Find the product // Find the product
const service = services?.find((item) => item.id === id) || undefined; const customer = customers?.find((item) => item.id === id) || undefined;
// Update the product // Update the product
this.__service.next(service); this.__customer.next(customer);
// Return the product // Return the product
return service; return customer;
}), }),
switchMap((product) => { switchMap((product) => {
if (!product) { if (!product) {
@ -130,21 +130,21 @@ export class ServiceService {
/** /**
* Create product * Create product
*/ */
createService(): Observable<Service> { createCustomer(): Observable<Customer> {
return this.services$.pipe( return this.customers$.pipe(
take(1), take(1),
switchMap((services) => switchMap((customers) =>
this._httpClient this._httpClient
.post<Service>('api/apps/board/service/product', {}) .post<Customer>('api/apps/board/customer/product', {})
.pipe( .pipe(
map((newService) => { map((newCustomer) => {
// Update the services with the new product // Update the customers with the new product
if (!!services) { if (!!customers) {
this.__services.next([newService, ...services]); this.__customers.next([newCustomer, ...customers]);
} }
// Return the new product // Return the new product
return newService; return newCustomer;
}) })
) )
) )

2
src/app/modules/admin/board/notice/components/list.component.ts
View File

@ -32,7 +32,7 @@ import { FuseConfirmationService } from '@fuse/services/confirmation';
import { User } from '../../../member/user/models/user'; import { User } from '../../../member/user/models/user';
import { Notice } from '../models/notice'; import { Notice } from '../models/notice';
import { NoticePagination } from '../models/notice-pagination'; import { NoticePagination } from '../models/notice-pagination';
import { NoticeService } from '../services/notice.service'; import { NoticeService } from '../service/notice.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@Component({ @Component({

2
src/app/modules/admin/board/notice/resolvers/notice.resolver.ts
View File

@ -9,7 +9,7 @@ import { catchError, Observable, throwError } from 'rxjs';
import { Notice } from '../models/notice'; import { Notice } from '../models/notice';
import { NoticePagination } from '../models/notice-pagination'; import { NoticePagination } from '../models/notice-pagination';
import { NoticeService } from '../services/notice.service'; import { NoticeService } from '../service/notice.service';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',

0
src/app/modules/admin/board/notice/services/notice.service.ts → src/app/modules/admin/board/notice/service/notice.service.ts
View File

2
src/assets/i18n/en.json
View File

@ -44,6 +44,6 @@
"Notice Oneline": "Notice Oneline", "Notice Oneline": "Notice Oneline",
"Popup": "Pop Up", "Popup": "Pop Up",
"Message": "Message", "Message": "Message",
"Service": "Service Center", "Customer": "Customer",
"Customer Template": "Custoner Template" "Customer Template": "Custoner Template"
} }

2
src/assets/i18n/ko.json
View File

@ -50,6 +50,6 @@
"Notice Oneline": "한줄공지", "Notice Oneline": "한줄공지",
"Popup": "팝업", "Popup": "팝업",
"Message": "쪽지함", "Message": "쪽지함",
"Service": "고객센터", "Customer": "고객센터",
"Customer Template": "고객센터템플릿" "Customer Template": "고객센터템플릿"
} }