diff --git a/src/app/modules/admin/member/recommendation/components/list.component.ts b/src/app/modules/admin/member/partner-recommendation/components/list.component.ts
similarity index 84%
rename from src/app/modules/admin/member/recommendation/components/list.component.ts
rename to src/app/modules/admin/member/partner-recommendation/components/list.component.ts
index 9fed294..b62689d 100644
--- a/src/app/modules/admin/member/recommendation/components/list.component.ts
+++ b/src/app/modules/admin/member/partner-recommendation/components/list.component.ts
@@ -31,16 +31,16 @@ import { FuseConfirmationService } from '@fuse/services/confirmation';
import { User } from '../../user/models/user';
-import { Recommendation as Recommendation } from '../models/recommendation';
-import { RecommendationPagination as RecommendationPagination } from '../models/recommendation-pagination';
-import { RecommendationService as RecommendationService } from '../services/recommendation.service';
+import { PartnerRecommendation as PartnerRecommendation } from '../models/partner-recommendation';
+import { PartnerRecommendationPagination as PartnerRecommendationPagination } from '../models/partner-recommendation-pagination';
+import { PartnerRecommendationService as PartnerRecommendationService } from '../services/partner-recommendation.service';
import { Router } from '@angular/router';
import { MatDialog } from '@angular/material/dialog';
import { RegistComposeComponent } from '../compose/regist-compose.component';
@Component({
- selector: 'recommendation-list',
+ selector: 'partner-recommendation-list',
templateUrl: './list.component.html',
styles: [
/* language=SCSS */
@@ -74,15 +74,15 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
@ViewChild(MatSort) private _sort!: MatSort;
- recommendations$!: Observable
;
+ partnerRecommendations$!: Observable;
users$!: Observable;
__isSearchOpened1 = false;
__isSearchOpened2 = false;
isLoading = false;
searchInputControl = new FormControl();
- selectedRecommendation?: Recommendation;
- pagination?: RecommendationPagination;
+ selectedPartnerRecommendation?: PartnerRecommendation;
+ pagination?: PartnerRecommendationPagination;
private _unsubscribeAll: Subject = new Subject();
@@ -93,7 +93,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
private _changeDetectorRef: ChangeDetectorRef,
private _fuseConfirmationService: FuseConfirmationService,
private _formBuilder: FormBuilder,
- private _recommendationService: RecommendationService,
+ private _partnerRecommendationService: PartnerRecommendationService,
private router: Router,
private _matDialog: MatDialog
) {}
@@ -107,9 +107,9 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
ngOnInit(): void {
// Get the pagination
- this._recommendationService.pagination$
+ this._partnerRecommendationService.pagination$
.pipe(takeUntil(this._unsubscribeAll))
- .subscribe((pagination: RecommendationPagination | undefined) => {
+ .subscribe((pagination: PartnerRecommendationPagination | undefined) => {
// Update the pagination
this.pagination = pagination;
@@ -118,7 +118,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
});
// Get the products
- this.recommendations$ = this._recommendationService.recommendations$;
+ this.partnerRecommendations$ =
+ this._partnerRecommendationService.partnerRecommendations$;
}
/**
@@ -136,7 +137,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
// Mark for check
this._changeDetectorRef.markForCheck();
- // If the recommendation changes the sort order...
+ // If the partnerRecommendation changes the sort order...
this._sort.sortChange
.pipe(takeUntil(this._unsubscribeAll))
.subscribe(() => {
@@ -149,7 +150,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
.pipe(
switchMap(() => {
this.isLoading = true;
- return this._recommendationService.getRecommendations(
+ return this._partnerRecommendationService.getPartnerRecommendations(
this._paginator.pageIndex,
this._paginator.pageSize,
this._sort.active,
diff --git a/src/app/modules/admin/member/recommendation/compose/index.ts b/src/app/modules/admin/member/partner-recommendation/compose/index.ts
similarity index 100%
rename from src/app/modules/admin/member/recommendation/compose/index.ts
rename to src/app/modules/admin/member/partner-recommendation/compose/index.ts
diff --git a/src/app/modules/admin/member/recommendation/compose/regist-compose.component.html b/src/app/modules/admin/member/partner-recommendation/compose/regist-compose.component.html
similarity index 100%
rename from src/app/modules/admin/member/recommendation/compose/regist-compose.component.html
rename to src/app/modules/admin/member/partner-recommendation/compose/regist-compose.component.html
diff --git a/src/app/modules/admin/member/recommendation/compose/regist-compose.component.ts b/src/app/modules/admin/member/partner-recommendation/compose/regist-compose.component.ts
similarity index 100%
rename from src/app/modules/admin/member/recommendation/compose/regist-compose.component.ts
rename to src/app/modules/admin/member/partner-recommendation/compose/regist-compose.component.ts
diff --git a/src/app/modules/admin/member/recommendation/models/recommendation-pagination.ts b/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation-pagination.ts
similarity index 69%
rename from src/app/modules/admin/member/recommendation/models/recommendation-pagination.ts
rename to src/app/modules/admin/member/partner-recommendation/models/partner-recommendation-pagination.ts
index 842c3bf..7b46ebd 100644
--- a/src/app/modules/admin/member/recommendation/models/recommendation-pagination.ts
+++ b/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation-pagination.ts
@@ -1,4 +1,4 @@
-export interface RecommendationPagination {
+export interface PartnerRecommendationPagination {
length: number;
size: number;
page: number;
diff --git a/src/app/modules/admin/member/recommendation/models/recommendation.ts b/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts
similarity index 88%
rename from src/app/modules/admin/member/recommendation/models/recommendation.ts
rename to src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts
index 184be2b..2057f59 100644
--- a/src/app/modules/admin/member/recommendation/models/recommendation.ts
+++ b/src/app/modules/admin/member/partner-recommendation/models/partner-recommendation.ts
@@ -1,6 +1,6 @@
import { NumberValueAccessor } from '@angular/forms';
-export interface Recommendation {
+export interface PartnerRecommendation {
id: string;
signinId?: string;
nickname?: string;
diff --git a/src/app/modules/admin/member/recommendation/recommendation.module.ts b/src/app/modules/admin/member/partner-recommendation/partner-recommendation.module.ts
similarity index 89%
rename from src/app/modules/admin/member/recommendation/recommendation.module.ts
rename to src/app/modules/admin/member/partner-recommendation/partner-recommendation.module.ts
index 4475008..3729997 100644
--- a/src/app/modules/admin/member/recommendation/recommendation.module.ts
+++ b/src/app/modules/admin/member/partner-recommendation/partner-recommendation.module.ts
@@ -23,14 +23,14 @@ import { SharedModule } from 'app/shared/shared.module';
import { COMPONENTS } from './components';
import { COMPOSE } from './compose';
-import { recommendationRoutes } from './recommendation.routing';
+import { partnerRecommendationRoutes } from './partner-recommendation.routing';
@NgModule({
declarations: [COMPONENTS, COMPOSE],
imports: [
TranslocoModule,
SharedModule,
- RouterModule.forChild(recommendationRoutes),
+ RouterModule.forChild(partnerRecommendationRoutes),
MatButtonModule,
MatFormFieldModule,
@@ -48,4 +48,4 @@ import { recommendationRoutes } from './recommendation.routing';
MatCheckboxModule,
],
})
-export class RecommendationModule {}
+export class PartnerRecommendationModule {}
diff --git a/src/app/modules/admin/member/recommendation/recommendation.routing.ts b/src/app/modules/admin/member/partner-recommendation/partner-recommendation.routing.ts
similarity index 55%
rename from src/app/modules/admin/member/recommendation/recommendation.routing.ts
rename to src/app/modules/admin/member/partner-recommendation/partner-recommendation.routing.ts
index 556d226..09265b7 100644
--- a/src/app/modules/admin/member/recommendation/recommendation.routing.ts
+++ b/src/app/modules/admin/member/partner-recommendation/partner-recommendation.routing.ts
@@ -2,9 +2,9 @@ import { Route } from '@angular/router';
import { ListComponent } from './components/list.component';
-import { RecommendationsResolver } from './resolvers/recommendation.resolver';
+import { PartnerRecommendationsResolver } from './resolvers/partner-recommendation.resolver';
-export const recommendationRoutes: Route[] = [
+export const partnerRecommendationRoutes: Route[] = [
// {
// path: '',
// pathMatch: 'full',
@@ -14,7 +14,7 @@ export const recommendationRoutes: Route[] = [
path: '',
component: ListComponent,
resolve: {
- Recommendations: RecommendationsResolver,
+ PartnerRecommendations: PartnerRecommendationsResolver,
},
},
];
diff --git a/src/app/modules/admin/member/recommendation/resolvers/recommendation.resolver.ts b/src/app/modules/admin/member/partner-recommendation/resolvers/partner-recommendation.resolver.ts
similarity index 64%
rename from src/app/modules/admin/member/recommendation/resolvers/recommendation.resolver.ts
rename to src/app/modules/admin/member/partner-recommendation/resolvers/partner-recommendation.resolver.ts
index bd52abf..7afce94 100644
--- a/src/app/modules/admin/member/recommendation/resolvers/recommendation.resolver.ts
+++ b/src/app/modules/admin/member/partner-recommendation/resolvers/partner-recommendation.resolver.ts
@@ -7,19 +7,19 @@ import {
} from '@angular/router';
import { catchError, Observable, throwError } from 'rxjs';
-import { Recommendation } from '../models/recommendation';
-import { RecommendationPagination } from '../models/recommendation-pagination';
-import { RecommendationService } from '../services/recommendation.service';
+import { PartnerRecommendation } from '../models/partner-recommendation';
+import { PartnerRecommendationPagination } from '../models/partner-recommendation-pagination';
+import { PartnerRecommendationService } from '../services/partner-recommendation.service';
@Injectable({
providedIn: 'root',
})
-export class RecommendationResolver implements Resolve {
+export class PartnerRecommendationResolver implements Resolve {
/**
* Constructor
*/
constructor(
- private _recommendationServiceService: RecommendationService,
+ private _partnerRecommendationServiceService: PartnerRecommendationService,
private _router: Router
) {}
@@ -36,9 +36,9 @@ export class RecommendationResolver implements Resolve {
resolve(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
- ): Observable {
- return this._recommendationServiceService
- .getRecommendationById(route.paramMap.get('id'))
+ ): Observable {
+ return this._partnerRecommendationServiceService
+ .getPartnerRecommendationById(route.paramMap.get('id'))
.pipe(
// Error here means the requested product is not available
catchError((error) => {
@@ -61,11 +61,13 @@ export class RecommendationResolver implements Resolve {
@Injectable({
providedIn: 'root',
})
-export class RecommendationsResolver implements Resolve {
+export class PartnerRecommendationsResolver implements Resolve {
/**
* Constructor
*/
- constructor(private _recommendationService: RecommendationService) {}
+ constructor(
+ private _partnerRecommendationService: PartnerRecommendationService
+ ) {}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
@@ -81,9 +83,9 @@ export class RecommendationsResolver implements Resolve {
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
): Observable<{
- pagination: RecommendationPagination;
- recommendations: Recommendation[];
+ pagination: PartnerRecommendationPagination;
+ partnerRecommendations: PartnerRecommendation[];
}> {
- return this._recommendationService.getRecommendations();
+ return this._partnerRecommendationService.getPartnerRecommendations();
}
}
diff --git a/src/app/modules/admin/member/partner-recommendation/services/partner-recommendation.service.ts b/src/app/modules/admin/member/partner-recommendation/services/partner-recommendation.service.ts
new file mode 100644
index 0000000..9f06595
--- /dev/null
+++ b/src/app/modules/admin/member/partner-recommendation/services/partner-recommendation.service.ts
@@ -0,0 +1,168 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import {
+ BehaviorSubject,
+ filter,
+ map,
+ Observable,
+ of,
+ switchMap,
+ take,
+ tap,
+ throwError,
+} from 'rxjs';
+
+import { PartnerRecommendation } from '../models/partner-recommendation';
+import { PartnerRecommendationPagination } from '../models/partner-recommendation-pagination';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class PartnerRecommendationService {
+ // Private
+ private __pagination = new BehaviorSubject<
+ PartnerRecommendationPagination | undefined
+ >(undefined);
+ private __partnerRecommendation = new BehaviorSubject<
+ PartnerRecommendation | undefined
+ >(undefined);
+ private __partnerRecommendations = new BehaviorSubject<
+ PartnerRecommendation[] | undefined
+ >(undefined);
+
+ /**
+ * Constructor
+ */
+ constructor(private _httpClient: HttpClient) {}
+
+ // -----------------------------------------------------------------------------------------------------
+ // @ Accessors
+ // -----------------------------------------------------------------------------------------------------
+
+ /**
+ * Getter for pagination
+ */
+ get pagination$(): Observable {
+ return this.__pagination.asObservable();
+ }
+
+ /**
+ * Getter for partnerRecommendation
+ */
+ get partnerRecommendation$(): Observable {
+ return this.__partnerRecommendation.asObservable();
+ }
+
+ /**
+ * Getter for partnerRecommendations
+ */
+ get partnerRecommendations$(): Observable<
+ PartnerRecommendation[] | undefined
+ > {
+ return this.__partnerRecommendations.asObservable();
+ }
+
+ // -----------------------------------------------------------------------------------------------------
+ // @ Public methods
+ // -----------------------------------------------------------------------------------------------------
+
+ /**
+ * Get partnerRecommendations
+ *
+ *
+ * @param page
+ * @param size
+ * @param sort
+ * @param order
+ * @param search
+ */
+ getPartnerRecommendations(
+ page: number = 0,
+ size: number = 10,
+ sort: string = 'name',
+ order: 'asc' | 'desc' | '' = 'asc',
+ search: string = ''
+ ): Observable<{
+ pagination: PartnerRecommendationPagination;
+ partnerRecommendations: PartnerRecommendation[];
+ }> {
+ return this._httpClient
+ .get<{
+ pagination: PartnerRecommendationPagination;
+ partnerRecommendations: PartnerRecommendation[];
+ }>('api/apps/member/partner-recommendation/partner-recommendations', {
+ params: {
+ page: '' + page,
+ size: '' + size,
+ sort,
+ order,
+ search,
+ },
+ })
+ .pipe(
+ tap((response) => {
+ this.__pagination.next(response.pagination);
+ this.__partnerRecommendations.next(response.partnerRecommendations);
+ })
+ );
+ }
+
+ /**
+ * Get product by id
+ */
+ getPartnerRecommendationById(
+ id: string | null
+ ): Observable {
+ return this.__partnerRecommendations.pipe(
+ take(1),
+ map((partnerRecommendations) => {
+ // Find the product
+ const partnerRecommendation =
+ partnerRecommendations?.find((item) => item.id === id) || undefined;
+
+ // Update the product
+ this.__partnerRecommendation.next(partnerRecommendation);
+
+ // Return the product
+ return partnerRecommendation;
+ }),
+ switchMap((product) => {
+ if (!product) {
+ return throwError('Could not found product with id of ' + id + '!');
+ }
+
+ return of(product);
+ })
+ );
+ }
+
+ /**
+ * Create product
+ */
+ createPartnerRecommendation(): Observable {
+ return this.partnerRecommendations$.pipe(
+ take(1),
+ switchMap((partnerRecommendations) =>
+ this._httpClient
+ .post(
+ 'api/apps/member/partner-recommendation/product',
+ {}
+ )
+ .pipe(
+ map((newPartnerRecommendation) => {
+ // Update the partnerRecommendations with the new product
+ if (!!partnerRecommendations) {
+ this.__partnerRecommendations.next([
+ newPartnerRecommendation,
+ ...partnerRecommendations,
+ ]);
+ }
+
+ // Return the new product
+ return newPartnerRecommendation;
+ })
+ )
+ )
+ );
+ }
+}
diff --git a/src/app/modules/admin/member/partner/partner.routing.ts b/src/app/modules/admin/member/partner/partner.routing.ts
index d80a846..aca5843 100644
--- a/src/app/modules/admin/member/partner/partner.routing.ts
+++ b/src/app/modules/admin/member/partner/partner.routing.ts
@@ -11,7 +11,7 @@ export const partnerRoutes: Route[] = [
// redirectTo: 'all',
// },
{
- path: '',
+ path: 'all',
component: ListComponent,
resolve: {
Partners: PartnersResolver,
diff --git a/src/app/modules/admin/member/recommendation/services/recommendation.service.ts b/src/app/modules/admin/member/recommendation/services/recommendation.service.ts
deleted file mode 100644
index 73eac28..0000000
--- a/src/app/modules/admin/member/recommendation/services/recommendation.service.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import {
- BehaviorSubject,
- filter,
- map,
- Observable,
- of,
- switchMap,
- take,
- tap,
- throwError,
-} from 'rxjs';
-
-import { Recommendation } from '../models/recommendation';
-import { RecommendationPagination } from '../models/recommendation-pagination';
-
-@Injectable({
- providedIn: 'root',
-})
-export class RecommendationService {
- // Private
- private __pagination = new BehaviorSubject<
- RecommendationPagination | undefined
- >(undefined);
- private __recommendation = new BehaviorSubject(
- undefined
- );
- private __recommendations = new BehaviorSubject(
- undefined
- );
-
- /**
- * Constructor
- */
- constructor(private _httpClient: HttpClient) {}
-
- // -----------------------------------------------------------------------------------------------------
- // @ Accessors
- // -----------------------------------------------------------------------------------------------------
-
- /**
- * Getter for pagination
- */
- get pagination$(): Observable {
- return this.__pagination.asObservable();
- }
-
- /**
- * Getter for recommendation
- */
- get recommendation$(): Observable {
- return this.__recommendation.asObservable();
- }
-
- /**
- * Getter for recommendations
- */
- get recommendations$(): Observable {
- return this.__recommendations.asObservable();
- }
-
- // -----------------------------------------------------------------------------------------------------
- // @ Public methods
- // -----------------------------------------------------------------------------------------------------
-
- /**
- * Get recommendations
- *
- *
- * @param page
- * @param size
- * @param sort
- * @param order
- * @param search
- */
- getRecommendations(
- page: number = 0,
- size: number = 10,
- sort: string = 'name',
- order: 'asc' | 'desc' | '' = 'asc',
- search: string = ''
- ): Observable<{
- pagination: RecommendationPagination;
- recommendations: Recommendation[];
- }> {
- return this._httpClient
- .get<{
- pagination: RecommendationPagination;
- recommendations: Recommendation[];
- }>('api/apps/member/recommendation/recommendations', {
- params: {
- page: '' + page,
- size: '' + size,
- sort,
- order,
- search,
- },
- })
- .pipe(
- tap((response) => {
- this.__pagination.next(response.pagination);
- this.__recommendations.next(response.recommendations);
- })
- );
- }
-
- /**
- * Get product by id
- */
- getRecommendationById(id: string | null): Observable {
- return this.__recommendations.pipe(
- take(1),
- map((recommendations) => {
- // Find the product
- const recommendation =
- recommendations?.find((item) => item.id === id) || undefined;
-
- // Update the product
- this.__recommendation.next(recommendation);
-
- // Return the product
- return recommendation;
- }),
- switchMap((product) => {
- if (!product) {
- return throwError('Could not found product with id of ' + id + '!');
- }
-
- return of(product);
- })
- );
- }
-
- /**
- * Create product
- */
- createRecommendation(): Observable {
- return this.recommendations$.pipe(
- take(1),
- switchMap((recommendations) =>
- this._httpClient
- .post('api/apps/member/recommendation/product', {})
- .pipe(
- map((newRecommendation) => {
- // Update the recommendations with the new product
- if (!!recommendations) {
- this.__recommendations.next([
- newRecommendation,
- ...recommendations,
- ]);
- }
-
- // Return the new product
- return newRecommendation;
- })
- )
- )
- );
- }
-}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 93deb7c..20053d4 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -6,8 +6,14 @@
"Casino Money": "Casino Money",
"Unconnected": "Unconnected",
"Project": "Project",
- "Partner": "Partner",
- "Recommendation": "Recommendation",
+ "partner-management": "partner-management",
+ "All Partner": "All Partner",
+ "Partner Mainoffice": "Partner Mainoffice",
+ "Partner Branch": "Partner Branch",
+ "Partner Division": "Partner Division",
+ "Partner Office": "Partner Office",
+ "Partner Store": "Partner Store",
+ "Partner Recommendation": "Recommendation",
"Coupon": "Coupon",
"Coupon Money Log": "Coupon Money Log",
"Coupon Log": "Coupon Log",
diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json
index 59bf5e3..7ccdaf3 100644
--- a/src/assets/i18n/ko.json
+++ b/src/assets/i18n/ko.json
@@ -7,8 +7,13 @@
"Unconnected": "장기미접속회원",
"Project": "프로젝트",
"partner-management": "파트너관리",
- "Partner": "파트너",
- "Recommendation": "추천코드등록",
+ "All Partner": "전체파트너",
+ "Partner Mainoffice": "본사",
+ "Partner Branch": "대본",
+ "Partner Division": "부본",
+ "Partner Office": "총판",
+ "Partner Store": "매장",
+ "Partner Recommendation": "추천코드등록",
"Coupon": "쿠폰발행리스트",
"Coupon Money Log": "쿠폰발행머니로그",
"Coupon Log": "쿠폰발행 로그",