diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 1d1862f..5728b6a 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -345,6 +345,13 @@ export const appRoutes: Route[] = [ 'app/modules/admin/report/statistics/statistics.module' ).then((m: any) => m.StatisticsModule), }, + { + path: 'money-log', + loadChildren: () => + import( + 'app/modules/admin/report/money-log/money-log.module' + ).then((m: any) => m.MoneyLogModule), + }, ], }, ], diff --git a/src/app/mock-api/apps/report/money-log/api.ts b/src/app/mock-api/apps/report/money-log/api.ts new file mode 100644 index 0000000..081cc10 --- /dev/null +++ b/src/app/mock-api/apps/report/money-log/api.ts @@ -0,0 +1,217 @@ +import { Injectable } from '@angular/core'; +import { assign, cloneDeep } from 'lodash-es'; +import { FuseMockApiService, FuseMockApiUtils } from '@fuse/lib/mock-api'; +import { moneyLogs as moneyLogsData } from './data'; + +@Injectable({ + providedIn: 'root', +}) +export class ReportMoneyLogMockApi { + private _moneyLogs: any[] = moneyLogsData; + + /** + * Constructor + */ + constructor(private _fuseMockApiService: FuseMockApiService) { + // Register Mock API handlers + this.registerHandlers(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Register Mock API handlers + */ + registerHandlers(): void { + // ----------------------------------------------------------------------------------------------------- + // @ MoneyLogs - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/report/money-log/money-logs', 300) + .reply(({ request }) => { + // Get available queries + const search = request.params.get('search'); + const sort = request.params.get('sort') || 'name'; + 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); + + // Clone the moneyLogs + let moneyLogs: any[] | null = cloneDeep(this._moneyLogs); + + // Sort the moneyLogs + if (sort === 'sku' || sort === 'name' || sort === 'active') { + moneyLogs.sort((a, b) => { + const fieldA = a[sort].toString().toUpperCase(); + const fieldB = b[sort].toString().toUpperCase(); + return order === 'asc' + ? fieldA.localeCompare(fieldB) + : fieldB.localeCompare(fieldA); + }); + } else { + moneyLogs.sort((a, b) => + order === 'asc' ? a[sort] - b[sort] : b[sort] - a[sort] + ); + } + + // If search exists... + if (search) { + // Filter the moneyLogs + moneyLogs = moneyLogs.filter( + (contact: any) => + contact.name && + contact.name.toLowerCase().includes(search.toLowerCase()) + ); + } + + // Paginate - Start + const moneyLogsLength = moneyLogs.length; + + // Calculate pagination details + const begin = page * size; + const end = Math.min(size * (page + 1), moneyLogsLength); + const lastPage = Math.max(Math.ceil(moneyLogsLength / size), 1); + + // Prepare the pagination object + let pagination = {}; + + // If the requested page number is bigger than + // the last possible page number, return null for + // moneyLogs but also send the last possible page so + // the app can navigate to there + if (page > lastPage) { + moneyLogs = null; + pagination = { + lastPage, + }; + } else { + // Paginate the results by size + moneyLogs = moneyLogs.slice(begin, end); + + // Prepare the pagination mock-api + pagination = { + length: moneyLogsLength, + size: size, + page: page, + lastPage: lastPage, + startIndex: begin, + endIndex: end - 1, + }; + } + + // Return the response + return [ + 200, + { + moneyLogs, + pagination, + }, + ]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ MoneyLog - GET + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onGet('api/apps/report/money-log/money-log') + .reply(({ request }) => { + // Get the id from the params + const id = request.params.get('id'); + + // Clone the moneyLogs + const moneyLogs = cloneDeep(this._moneyLogs); + + // Find the moneyLog + const moneyLog = moneyLogs.find((item: any) => item.id === id); + + // Return the response + return [200, moneyLog]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ MoneyLog - POST + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPost('api/apps/report/money-log/money-log') + .reply(() => { + // Generate a new moneyLog + const newMoneyLog = { + id: FuseMockApiUtils.guid(), + category: '', + name: 'A New User', + description: '', + tags: [], + sku: '', + barcode: '', + brand: '', + vendor: '', + stock: '', + reserved: '', + cost: '', + basePrice: '', + taxPercent: '', + price: '', + weight: '', + thumbnail: '', + images: [], + active: false, + }; + + // Unshift the new moneyLog + this._moneyLogs.unshift(newMoneyLog); + + // Return the response + return [200, newMoneyLog]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ MoneyLog - PATCH + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onPatch('api/apps/report/money-log/money-log') + .reply(({ request }) => { + // Get the id and moneyLog + const id = request.body.id; + const moneyLog = cloneDeep(request.body.moneyLog); + + // Prepare the updated moneyLog + let updatedMoneyLog = null; + + // Find the moneyLog and update it + this._moneyLogs.forEach((item, index, moneyLogs) => { + if (item.id === id) { + // Update the moneyLog + moneyLogs[index] = assign({}, moneyLogs[index], moneyLog); + + // Store the updated moneyLog + updatedMoneyLog = moneyLogs[index]; + } + }); + + // Return the response + return [200, updatedMoneyLog]; + }); + + // ----------------------------------------------------------------------------------------------------- + // @ MoneyLog - DELETE + // ----------------------------------------------------------------------------------------------------- + this._fuseMockApiService + .onDelete('api/apps/report/money-log/money-log') + .reply(({ request }) => { + // Get the id + const id = request.params.get('id'); + + // Find the moneyLog and delete it + this._moneyLogs.forEach((item, index) => { + if (item.id === id) { + this._moneyLogs.splice(index, 1); + } + }); + + // Return the response + return [200, true]; + }); + } +} diff --git a/src/app/mock-api/apps/report/money-log/data.ts b/src/app/mock-api/apps/report/money-log/data.ts new file mode 100644 index 0000000..3781426 --- /dev/null +++ b/src/app/mock-api/apps/report/money-log/data.ts @@ -0,0 +1,33 @@ +/* eslint-disable */ + +export const moneyLogs = [ + { + id: 'on00', + totalPartnerCount: '5', + totalHoldingMoney: 303675, + totalComp: 108933, + total: 412608, + branchCount: 1, + divisionCount: 1, + officeCount: 1, + storeCount: 1, + memberCount: 1, + nickname: 'on00', + accountHolder: '11', + phoneNumber: '010-1111-1111', + calculateType: '롤링', + ownCash: 50000, + ownComp: 1711, + ownCoupon: 50000, + gameMoney: 0, + todayComp: 0, + totalDeposit: 0, + totalWithdraw: 0, + balance: 0, + registDate: '2022-06-12 15:38', + finalSigninDate: '', + ip: '', + state: '정상', + note: '', + }, +]; diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts index 2030e36..e9a8a53 100644 --- a/src/app/mock-api/common/navigation/data.ts +++ b/src/app/mock-api/common/navigation/data.ts @@ -257,6 +257,13 @@ export const defaultNavigation: FuseNavigationItem[] = [ icon: 'heroicons_outline:academic-cap', link: '/report/statistics', }, + { + id: 'report.money-log', + title: 'Money Log', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/report/money-log', + }, ], }, ]; diff --git a/src/app/mock-api/index.ts b/src/app/mock-api/index.ts index ea00839..c68d13e 100644 --- a/src/app/mock-api/index.ts +++ b/src/app/mock-api/index.ts @@ -46,6 +46,7 @@ import { ReportMonthlyMockApi } from './apps/report/monthly/api'; import { ReportDailyPartnerMockApi } from './apps/report/daily-partner/api'; import { ReportTodayBetMockApi } from './apps/report/today-bet/api'; import { ReportStatisticsMockApi } from './apps/report/statistics/api'; +import { ReportMoneyLogMockApi } from './apps/report/money-log/api'; export const mockApiServices = [ AcademyMockApi, @@ -96,4 +97,5 @@ export const mockApiServices = [ ReportDailyPartnerMockApi, ReportTodayBetMockApi, ReportStatisticsMockApi, + ReportMoneyLogMockApi, ]; diff --git a/src/app/modules/admin/report/money-log/components/index.ts b/src/app/modules/admin/report/money-log/components/index.ts new file mode 100644 index 0000000..04759eb --- /dev/null +++ b/src/app/modules/admin/report/money-log/components/index.ts @@ -0,0 +1,3 @@ +import { ListComponent } from './list.component'; + +export const COMPONENTS = [ListComponent]; diff --git a/src/app/modules/admin/report/money-log/components/list.component.html b/src/app/modules/admin/report/money-log/components/list.component.html new file mode 100644 index 0000000..7b52769 --- /dev/null +++ b/src/app/modules/admin/report/money-log/components/list.component.html @@ -0,0 +1,355 @@ +
+ +
+ +
+ +
+ +
머니 활동 Logs
+ +
+ + + + + + + 40 + 60 + 80 + 100 + + + + + LV.1 + LV.2 + LV.3 + LV.4 + + + + + 정상 + 대기 + 탈퇴 + 휴면 + 블랙 + 정지 + + + + + 카지노제한 + 슬롯제한 + + + + + 계좌입금 + + + + + 카지노콤프 + 슬롯콤프 + 배팅콤프 + 첫충콤프 + + + + + + + + + + + + +
+
+ + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + +
+ There are no moneyLogs! +
+ +
+
+
diff --git a/src/app/modules/admin/report/money-log/components/list.component.ts b/src/app/modules/admin/report/money-log/components/list.component.ts new file mode 100644 index 0000000..ec75941 --- /dev/null +++ b/src/app/modules/admin/report/money-log/components/list.component.ts @@ -0,0 +1,198 @@ +import { + AfterViewInit, + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + OnDestroy, + OnInit, + ViewChild, + ViewEncapsulation, +} from '@angular/core'; +import { + FormBuilder, + FormControl, + FormGroup, + Validators, +} from '@angular/forms'; +import { MatCheckboxChange } from '@angular/material/checkbox'; +import { MatPaginator } from '@angular/material/paginator'; +import { MatSort } from '@angular/material/sort'; +import { + debounceTime, + map, + merge, + Observable, + Subject, + switchMap, + takeUntil, +} from 'rxjs'; +import { fuseAnimations } from '@fuse/animations'; +import { FuseConfirmationService } from '@fuse/services/confirmation'; + +import { User } from '../../../member/user/models/user'; +import { MoneyLog } from '../models/money-log'; +import { MoneyLogPagination } from '../models/money-log-pagination'; +import { MoneyLogService } from '../services/money-log.service'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'money-log-list', + templateUrl: './list.component.html', + styles: [ + /* language=SCSS */ + ` + .inventory-grid { + grid-template-columns: 60px auto 40px; + + @screen sm { + grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px; + } + + @screen md { + grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px; + } + + @screen lg { + grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px; + } + } + `, + ], + encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.OnPush, + animations: fuseAnimations, +}) +export class ListComponent implements OnInit, AfterViewInit, OnDestroy { + @ViewChild(MatPaginator) private _paginator!: MatPaginator; + @ViewChild(MatSort) private _sort!: MatSort; + + moneyLogs$!: Observable; + users$!: Observable; + + isLoading = false; + searchInputControl = new FormControl(); + selectedMoneyLog?: MoneyLog; + pagination?: MoneyLogPagination; + + private _unsubscribeAll: Subject = new Subject(); + + /** + * Constructor + */ + constructor( + private _changeDetectorRef: ChangeDetectorRef, + private _fuseConfirmationService: FuseConfirmationService, + private _formBuilder: FormBuilder, + private _moneyLogService: MoneyLogService, + private router: Router + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { + // Get the pagination + this._moneyLogService.pagination$ + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe((pagination: MoneyLogPagination | undefined) => { + // Update the pagination + this.pagination = pagination; + + // Mark for check + this._changeDetectorRef.markForCheck(); + }); + + // Get the products + this.moneyLogs$ = this._moneyLogService.moneyLogs$; + } + + /** + * After view init + */ + ngAfterViewInit(): void { + if (this._sort && this._paginator) { + // Set the initial sort + this._sort.sort({ + id: 'name', + start: 'asc', + disableClear: true, + }); + + // Mark for check + this._changeDetectorRef.markForCheck(); + + // If the moneyLog changes the sort order... + this._sort.sortChange + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + // Reset back to the first page + this._paginator.pageIndex = 0; + }); + + // Get products if sort or page changes + merge(this._sort.sortChange, this._paginator.page) + .pipe( + switchMap(() => { + this.isLoading = true; + return this._moneyLogService.getMoneyLogs( + this._paginator.pageIndex, + this._paginator.pageSize, + this._sort.active, + this._sort.direction + ); + }), + map(() => { + this.isLoading = false; + }) + ) + .subscribe(); + } + } + + /** + * On destroy + */ + ngOnDestroy(): void { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(null); + this._unsubscribeAll.complete(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + viewUserDetail(id: string): void { + let url: string = 'member/user/' + id; + this.router.navigateByUrl(url); + } + // ----------------------------------------------------------------------------------------------------- + // @ Private methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Create product + */ + __createProduct(): void {} + + /** + * Toggle product details + * + * @param productId + */ + __toggleDetails(productId: string): void {} + + /** + * Track by function for ngFor loops + * + * @param index + * @param item + */ + __trackByFn(index: number, item: any): any { + return item.id || index; + } +} diff --git a/src/app/modules/admin/report/money-log/models/money-log-pagination.ts b/src/app/modules/admin/report/money-log/models/money-log-pagination.ts new file mode 100644 index 0000000..9117a6a --- /dev/null +++ b/src/app/modules/admin/report/money-log/models/money-log-pagination.ts @@ -0,0 +1,8 @@ +export interface MoneyLogPagination { + length: number; + size: number; + page: number; + lastPage: number; + startIndex: number; + endIndex: number; +} diff --git a/src/app/modules/admin/report/money-log/models/money-log.ts b/src/app/modules/admin/report/money-log/models/money-log.ts new file mode 100644 index 0000000..f7b25f6 --- /dev/null +++ b/src/app/modules/admin/report/money-log/models/money-log.ts @@ -0,0 +1,29 @@ +export interface MoneyLog { + id?: string; + totalPartnerCount?: number; + totalHoldingMoney?: number; + totalComp?: number; + total?: number; + branchCount?: number; + divisionCount?: number; + officeCount?: number; + storeCount?: number; + memberCount?: number; + nickname?: string; + accountHolder?: string; + phoneNumber?: string; + calculateType?: string; + ownCash?: number; + ownComp?: number; + ownCoupon?: number; + gameMoney?: number; + todayComp?: number; + totalDeposit?: number; + totalWithdraw?: number; + balance?: number; + registDate?: string; + finalSigninDate?: string; + ip?: string; + state?: string; + note?: string; +} diff --git a/src/app/modules/admin/report/money-log/money-log.module.ts b/src/app/modules/admin/report/money-log/money-log.module.ts new file mode 100644 index 0000000..b2a9bf5 --- /dev/null +++ b/src/app/modules/admin/report/money-log/money-log.module.ts @@ -0,0 +1,50 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { MatButtonModule } from '@angular/material/button'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatInputModule } from '@angular/material/input'; +import { MatPaginatorModule } from '@angular/material/paginator'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +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 { MatGridListModule } from '@angular/material/grid-list'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatCheckboxModule } from '@angular/material/checkbox'; + +import { TranslocoModule } from '@ngneat/transloco'; + +import { SharedModule } from 'app/shared/shared.module'; + +import { COMPONENTS } from './components'; + +import { moneyLogRoutes } from './money-log.routing'; + +@NgModule({ + declarations: [COMPONENTS], + imports: [ + TranslocoModule, + SharedModule, + RouterModule.forChild(moneyLogRoutes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatPaginatorModule, + MatProgressBarModule, + MatRippleModule, + MatSortModule, + MatSelectModule, + MatTooltipModule, + MatGridListModule, + MatSlideToggleModule, + MatRadioModule, + MatCheckboxModule, + ], +}) +export class MoneyLogModule {} diff --git a/src/app/modules/admin/report/money-log/money-log.routing.ts b/src/app/modules/admin/report/money-log/money-log.routing.ts new file mode 100644 index 0000000..efc9a44 --- /dev/null +++ b/src/app/modules/admin/report/money-log/money-log.routing.ts @@ -0,0 +1,24 @@ +import { Route } from '@angular/router'; + +import { ListComponent } from './components/list.component'; +import { ViewComponent } from '../../member/user/components/view.component'; + +import { MoneyLogsResolver } from './resolvers/money-log.resolver'; +import { UserResolver } from '../../member/user/resolvers/user.resolver'; + +export const moneyLogRoutes: Route[] = [ + { + path: '', + component: ListComponent, + resolve: { + moneyLogs: MoneyLogsResolver, + }, + }, + { + path: ':id', + component: ViewComponent, + resolve: { + users: UserResolver, + }, + }, +]; diff --git a/src/app/modules/admin/report/money-log/resolvers/money-log.resolver.ts b/src/app/modules/admin/report/money-log/resolvers/money-log.resolver.ts new file mode 100644 index 0000000..de44504 --- /dev/null +++ b/src/app/modules/admin/report/money-log/resolvers/money-log.resolver.ts @@ -0,0 +1,87 @@ +import { Injectable } from '@angular/core'; +import { + ActivatedRouteSnapshot, + Resolve, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { catchError, Observable, throwError } from 'rxjs'; + +import { MoneyLog } from '../models/money-log'; +import { MoneyLogPagination } from '../models/money-log-pagination'; +import { MoneyLogService } from '../services/money-log.service'; + +@Injectable({ + providedIn: 'root', +}) +export class MoneyLogResolver implements Resolve { + /** + * Constructor + */ + constructor( + private _moneyLogService: MoneyLogService, + private _router: Router + ) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable { + return this._moneyLogService.getMoneyLogById(route.paramMap.get('id')).pipe( + // Error here means the requested product is not available + catchError((error) => { + // Log the error + console.error(error); + + // Get the parent url + const parentUrl = state.url.split('/').slice(0, -1).join('/'); + + // Navigate to there + this._router.navigateByUrl(parentUrl); + + // Throw an error + return throwError(error); + }) + ); + } +} + +@Injectable({ + providedIn: 'root', +}) +export class MoneyLogsResolver implements Resolve { + /** + * Constructor + */ + constructor(private _moneyLogService: MoneyLogService) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resolver + * + * @param route + * @param state + */ + resolve( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot + ): Observable<{ + pagination: MoneyLogPagination; + moneyLogs: MoneyLog[]; + }> { + return this._moneyLogService.getMoneyLogs(); + } +} diff --git a/src/app/modules/admin/report/money-log/services/money-log.service.ts b/src/app/modules/admin/report/money-log/services/money-log.service.ts new file mode 100644 index 0000000..6a59079 --- /dev/null +++ b/src/app/modules/admin/report/money-log/services/money-log.service.ts @@ -0,0 +1,153 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { + BehaviorSubject, + filter, + map, + Observable, + of, + switchMap, + take, + tap, + throwError, +} from 'rxjs'; + +import { MoneyLog } from '../models/money-log'; +import { MoneyLogPagination } from '../models/money-log-pagination'; + +@Injectable({ + providedIn: 'root', +}) +export class MoneyLogService { + // Private + private __pagination = new BehaviorSubject( + undefined + ); + private __moneyLog = new BehaviorSubject(undefined); + private __moneyLogs = new BehaviorSubject(undefined); + + /** + * Constructor + */ + constructor(private _httpClient: HttpClient) {} + + // ----------------------------------------------------------------------------------------------------- + // @ Accessors + // ----------------------------------------------------------------------------------------------------- + + /** + * Getter for pagination + */ + get pagination$(): Observable { + return this.__pagination.asObservable(); + } + + /** + * Getter for moneyLog + */ + get moneyLog$(): Observable { + return this.__moneyLog.asObservable(); + } + + /** + * Getter for moneyLogs + */ + get moneyLogs$(): Observable { + return this.__moneyLogs.asObservable(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Get moneyLogs + * + * + * @param page + * @param size + * @param sort + * @param order + * @param search + */ + getMoneyLogs( + page: number = 0, + size: number = 10, + sort: string = 'name', + order: 'asc' | 'desc' | '' = 'asc', + search: string = '' + ): Observable<{ + pagination: MoneyLogPagination; + moneyLogs: MoneyLog[]; + }> { + return this._httpClient + .get<{ + pagination: MoneyLogPagination; + moneyLogs: MoneyLog[]; + }>('api/apps/report/money-log/money-logs', { + params: { + page: '' + page, + size: '' + size, + sort, + order, + search, + }, + }) + .pipe( + tap((response) => { + this.__pagination.next(response.pagination); + this.__moneyLogs.next(response.moneyLogs); + }) + ); + } + + /** + * Get product by id + */ + getMoneyLogById(id: string | null): Observable { + return this.__moneyLogs.pipe( + take(1), + map((moneyLogs) => { + // Find the product + const moneyLog = moneyLogs?.find((item) => item.id === id) || undefined; + + // Update the product + this.__moneyLog.next(moneyLog); + + // Return the product + return moneyLog; + }), + switchMap((product) => { + if (!product) { + return throwError('Could not found product with id of ' + id + '!'); + } + + return of(product); + }) + ); + } + + /** + * Create product + */ + createMoneyLog(): Observable { + return this.moneyLogs$.pipe( + take(1), + switchMap((moneyLogs) => + this._httpClient + .post('api/apps/report/money-log/product', {}) + .pipe( + map((newMoneyLog) => { + // Update the moneyLogs with the new product + if (!!moneyLogs) { + this.__moneyLogs.next([newMoneyLog, ...moneyLogs]); + } + + // Return the new product + return newMoneyLog; + }) + ) + ) + ); + } +} diff --git a/src/app/modules/admin/report/monthly/services/monthly.service.ts b/src/app/modules/admin/report/monthly/services/monthly.service.ts index ab1046e..b36b09d 100644 --- a/src/app/modules/admin/report/monthly/services/monthly.service.ts +++ b/src/app/modules/admin/report/monthly/services/monthly.service.ts @@ -135,7 +135,7 @@ export class MonthlyService { take(1), switchMap((monthlys) => this._httpClient - .post('api/apps/result/monthly/product', {}) + .post('api/apps/report/monthly/product', {}) .pipe( map((newMonthly) => { // Update the monthlys with the new product diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 89a8ddd..83a38f2 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -28,5 +28,6 @@ "Monthly": "Monthly", "Daily Partner": "Daily Partner", "Today Bet": "Today Bet", - "Statistics": "Statistics" + "Statistics": "Statistics", + "Money Log": "Money Logs" } diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json index 362393d..e2b2951 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -29,5 +29,6 @@ "Monthly": "월 현황", "Daily Partner": "파트너 일일현황", "Today Bet": "금일 배팅자 목록", - "Statistics": "종목별매출통계" + "Statistics": "종목별매출통계", + "Money Log": "머니활동 Logs" }