From 7c94200594da53e5d205095d19afc5d5b38605d4 Mon Sep 17 00:00:00 2001 From: JUNG YI DAM Date: Sun, 24 Jul 2022 14:19:51 +0000 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mock-api/apps/member/casino-money/api.ts | 2 +- .../mock-api/apps/member/coupon-log/api.ts | 2 +- .../apps/member/coupon-money-log/api.ts | 8 +++- src/app/mock-api/apps/member/coupon/api.ts | 8 +++- src/app/mock-api/apps/member/coupon/data.ts | 2 +- .../apps/member/partner-branch/api.ts | 8 +++- .../apps/member/partner-division/api.ts | 8 +++- .../apps/member/partner-office/api.ts | 8 +++- .../mock-api/apps/member/partner-store/api.ts | 8 +++- .../mock-api/apps/member/unconnected/api.ts | 2 +- src/app/mock-api/common/navigation/data.ts | 47 +++++++++++-------- .../coupon/components/list.component.html | 4 ++ .../admin/member/coupon/models/coupon.ts | 2 +- src/assets/i18n/en.json | 1 + src/assets/i18n/ko.json | 1 + 15 files changed, 74 insertions(+), 37 deletions(-) diff --git a/src/app/mock-api/apps/member/casino-money/api.ts b/src/app/mock-api/apps/member/casino-money/api.ts index 3b48ab6..ac47b4d 100644 --- a/src/app/mock-api/apps/member/casino-money/api.ts +++ b/src/app/mock-api/apps/member/casino-money/api.ts @@ -33,7 +33,7 @@ export class MemberCasinoMoneyMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); diff --git a/src/app/mock-api/apps/member/coupon-log/api.ts b/src/app/mock-api/apps/member/coupon-log/api.ts index 41e1dd2..ce7ea9e 100644 --- a/src/app/mock-api/apps/member/coupon-log/api.ts +++ b/src/app/mock-api/apps/member/coupon-log/api.ts @@ -33,7 +33,7 @@ export class MemberCouponLogMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'issuedCouponId'; 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); diff --git a/src/app/mock-api/apps/member/coupon-money-log/api.ts b/src/app/mock-api/apps/member/coupon-money-log/api.ts index 3901ea0..2cbf573 100644 --- a/src/app/mock-api/apps/member/coupon-money-log/api.ts +++ b/src/app/mock-api/apps/member/coupon-money-log/api.ts @@ -33,7 +33,7 @@ export class MemberCouponMoneyLogMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'issuedCouponId'; 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); @@ -42,7 +42,11 @@ export class MemberCouponMoneyLogMockApi { let couponMoneyLogs: any[] | null = cloneDeep(this._couponMoneyLogs); // Sort the couponMoneyLogs - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'issuedCouponId' || + sort === 'useCouponId' || + sort === 'retrieveCouponId' + ) { couponMoneyLogs.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/coupon/api.ts b/src/app/mock-api/apps/member/coupon/api.ts index 2d704fb..9913c12 100644 --- a/src/app/mock-api/apps/member/coupon/api.ts +++ b/src/app/mock-api/apps/member/coupon/api.ts @@ -33,7 +33,7 @@ export class MemberCouponMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'issuedCouponId'; 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); @@ -42,7 +42,11 @@ export class MemberCouponMockApi { let coupons: any[] | null = cloneDeep(this._coupons); // Sort the coupons - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'issuedCouponId' || + sort === 'couponGroupNumber' || + sort === 'useOrNot' + ) { coupons.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/coupon/data.ts b/src/app/mock-api/apps/member/coupon/data.ts index 128b828..c80468e 100644 --- a/src/app/mock-api/apps/member/coupon/data.ts +++ b/src/app/mock-api/apps/member/coupon/data.ts @@ -10,7 +10,7 @@ export const coupons = [ couponGroupNumber: '6L03ER50103AZOVS', couponSerialNumber: '3GWL2T6RQJ4WJLRTQMBIRFEO', issuedCoupons: '1/1', - issuedCouponPrice: 50000, + issuedCouponMoney: 50000, couponStartDate: '2022-06-12 00:00', couponFinishDate: '2022-07-12 23:59', useOrNot: 'Y', diff --git a/src/app/mock-api/apps/member/partner-branch/api.ts b/src/app/mock-api/apps/member/partner-branch/api.ts index 0eba1aa..b63f861 100644 --- a/src/app/mock-api/apps/member/partner-branch/api.ts +++ b/src/app/mock-api/apps/member/partner-branch/api.ts @@ -33,7 +33,7 @@ export class MemberPartnerBranchMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); @@ -42,7 +42,11 @@ export class MemberPartnerBranchMockApi { let partnerBranchs: any[] | null = cloneDeep(this._partnerBranchs); // Sort the partnerBranchs - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'signinId' || + sort === 'nickname' || + sort === 'accountHolder' + ) { partnerBranchs.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/partner-division/api.ts b/src/app/mock-api/apps/member/partner-division/api.ts index 4b9ff47..8a9b252 100644 --- a/src/app/mock-api/apps/member/partner-division/api.ts +++ b/src/app/mock-api/apps/member/partner-division/api.ts @@ -33,7 +33,7 @@ export class MemberPartnerDivisionMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); @@ -42,7 +42,11 @@ export class MemberPartnerDivisionMockApi { let partnerDivisions: any[] | null = cloneDeep(this._partnerDivisions); // Sort the partnerDivisions - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'signinId' || + sort === 'nickname' || + sort === 'accountHolder' + ) { partnerDivisions.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/partner-office/api.ts b/src/app/mock-api/apps/member/partner-office/api.ts index 8970aa0..3d5b70c 100644 --- a/src/app/mock-api/apps/member/partner-office/api.ts +++ b/src/app/mock-api/apps/member/partner-office/api.ts @@ -33,7 +33,7 @@ export class MemberPartnerOfficeMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); @@ -42,7 +42,11 @@ export class MemberPartnerOfficeMockApi { let partnerOffices: any[] | null = cloneDeep(this._partnerOffices); // Sort the partnerOffices - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'signinId' || + sort === 'nickname' || + sort === 'accountHolder' + ) { partnerOffices.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/partner-store/api.ts b/src/app/mock-api/apps/member/partner-store/api.ts index c35ba8c..504d7dd 100644 --- a/src/app/mock-api/apps/member/partner-store/api.ts +++ b/src/app/mock-api/apps/member/partner-store/api.ts @@ -33,7 +33,7 @@ export class MemberPartnerStoreMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); @@ -42,7 +42,11 @@ export class MemberPartnerStoreMockApi { let partnerStores: any[] | null = cloneDeep(this._partnerStores); // Sort the partnerStores - if (sort === 'sku' || sort === 'name' || sort === 'active') { + if ( + sort === 'signinId' || + sort === 'nickname' || + sort === 'accountHolder' + ) { partnerStores.sort((a, b) => { const fieldA = a[sort].toString().toUpperCase(); const fieldB = b[sort].toString().toUpperCase(); diff --git a/src/app/mock-api/apps/member/unconnected/api.ts b/src/app/mock-api/apps/member/unconnected/api.ts index eeb4118..8c6d910 100644 --- a/src/app/mock-api/apps/member/unconnected/api.ts +++ b/src/app/mock-api/apps/member/unconnected/api.ts @@ -33,7 +33,7 @@ export class MemberUnconnectedMockApi { .reply(({ request }) => { // Get available queries const search = request.params.get('search'); - const sort = request.params.get('sort') || 'name'; + const sort = request.params.get('sort') || 'signinId'; 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); diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts index a01070a..4654cbc 100644 --- a/src/app/mock-api/common/navigation/data.ts +++ b/src/app/mock-api/common/navigation/data.ts @@ -124,27 +124,34 @@ export const defaultNavigation: FuseNavigationItem[] = [ }, ], }, - { - id: 'member.coupon', - title: 'Coupon', - type: 'basic', - icon: 'heroicons_outline:academic-cap', - link: '/member/coupon', - }, - { - id: 'member.coupon-money-log', - title: 'Coupon Money Log', - type: 'basic', - icon: 'heroicons_outline:academic-cap', - link: '/member/coupon-money-log', - }, - { - id: 'member.coupon-log', - title: 'Coupon Log', - type: 'basic', - icon: 'heroicons_outline:academic-cap', - link: '/member/coupon-log', + id: 'apps.coupon', + title: 'Coupon-management', + type: 'collapsable', + icon: 'heroicons_outline:shopping-cart', + children: [ + { + id: 'member.coupon', + title: 'Coupon', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/member/coupon', + }, + { + id: 'member.coupon-money-log', + title: 'Coupon Money Log', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/member/coupon-money-log', + }, + { + id: 'member.coupon-log', + title: 'Coupon Log', + type: 'basic', + icon: 'heroicons_outline:academic-cap', + link: '/member/coupon-log', + }, + ], }, ], }, diff --git a/src/app/modules/admin/member/coupon/components/list.component.html b/src/app/modules/admin/member/coupon/components/list.component.html index 791a8f6..0bd9081 100644 --- a/src/app/modules/admin/member/coupon/components/list.component.html +++ b/src/app/modules/admin/member/coupon/components/list.component.html @@ -111,6 +111,7 @@
닉네임 +
금액
+
+ {{ coupon.issuedCouponMoney }} +
{{ coupon.issuedCoupons }}
diff --git a/src/app/modules/admin/member/coupon/models/coupon.ts b/src/app/modules/admin/member/coupon/models/coupon.ts index 290472a..0da42c2 100644 --- a/src/app/modules/admin/member/coupon/models/coupon.ts +++ b/src/app/modules/admin/member/coupon/models/coupon.ts @@ -7,7 +7,7 @@ export interface Coupon { couponGroupNumber?: string; // 쿠폰그룹번호 couponSerialNumber?: string; // 쿠폰시리얼넘버 issuedCoupons?: string; // 쿠폰발행수 - issuedCouponPrice?: number; // 발행금액 + issuedCouponMoney?: number; // 발행금액 couponStartDate?: Date; // 쿠폰시작일 couponFinishDate?: Date; // 쿠폰종료일 useOrNot?: string; diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 20053d4..1f9ef4e 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -14,6 +14,7 @@ "Partner Office": "Partner Office", "Partner Store": "Partner Store", "Partner Recommendation": "Recommendation", + "Coupon-management": "Coupon-management", "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 7ccdaf3..1d51cb1 100644 --- a/src/assets/i18n/ko.json +++ b/src/assets/i18n/ko.json @@ -14,6 +14,7 @@ "Partner Office": "총판", "Partner Store": "매장", "Partner Recommendation": "추천코드등록", + "Coupon-management": "쿠폰관리", "Coupon": "쿠폰발행리스트", "Coupon Money Log": "쿠폰발행머니로그", "Coupon Log": "쿠폰발행 로그",