고객센터 page 수정

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

View File

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

View File

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

View File

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

View File

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

View File

@ -67,7 +67,7 @@ import { BoardNoticeMockApi } from './apps/board/notice/api';
import { BoardNoticeOnelineMockApi } from './apps/board/notice-oneline/api';
import { BoardPopupMockApi } from './apps/board/popup/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';
export const mockApiServices = [
@ -140,6 +140,6 @@ export const mockApiServices = [
BoardNoticeOnelineMockApi,
BoardPopupMockApi,
BoardMessageMockApi,
BoardServiceMockApi,
BoardCustomerMockApi,
BoardCustomerTemplateMockApi,
];

View File

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

View File

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

View File

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

View File

@ -3,15 +3,15 @@ import { Route } from '@angular/router';
import { ListComponent } from './components/list.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';
export const serviceRoutes: Route[] = [
export const customerRoutes: Route[] = [
{
path: '',
component: ListComponent,
resolve: {
services: ServicesResolver,
customers: CustomersResolver,
},
},
{

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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