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

수정

Browse Source
This commit is contained in:
이담 정 2022-07-24 14:19:51 +00:00
parent b0e5604bec
commit 7c94200594
15 changed files with 74 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/mock-api/apps/member/casino-money/api.ts
View File

@ -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);

2
src/app/mock-api/apps/member/coupon-log/api.ts
View File

@ -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);

8
src/app/mock-api/apps/member/coupon-money-log/api.ts
View File

@ -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();

8
src/app/mock-api/apps/member/coupon/api.ts
View File

@ -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();

2
src/app/mock-api/apps/member/coupon/data.ts
View File

@ -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',

8
src/app/mock-api/apps/member/partner-branch/api.ts
View File

@ -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();

8
src/app/mock-api/apps/member/partner-division/api.ts
View File

@ -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();

8
src/app/mock-api/apps/member/partner-office/api.ts
View File

@ -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();

8
src/app/mock-api/apps/member/partner-store/api.ts
View File

@ -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();

2
src/app/mock-api/apps/member/unconnected/api.ts
View File

@ -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);

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

@ -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',
},
],
},
],
},

4
src/app/modules/admin/member/coupon/components/list.component.html
View File

@ -111,6 +111,7 @@
<hr style="margin: 7px 0px" />
닉네임
</div>
<div>금액</div>
<div class="hidden md:block">
쿠폰시작일
<hr style="margin: 7px 0px" />
@ -136,6 +137,9 @@
<hr style="margin: 7px 0px" />
{{ coupon.issuedCouponNickname }}
</div>
<div>
{{ coupon.issuedCouponMoney }}
</div>
<div>
{{ coupon.issuedCoupons }}
</div>

2
src/app/modules/admin/member/coupon/models/coupon.ts
View File

@ -7,7 +7,7 @@ export interface Coupon {
couponGroupNumber?: string; // 쿠폰그룹번호
couponSerialNumber?: string; // 쿠폰시리얼넘버
issuedCoupons?: string; // 쿠폰발행수
issuedCouponPrice?: number; // 발행금액
issuedCouponMoney?: number; // 발행금액
couponStartDate?: Date; // 쿠폰시작일
couponFinishDate?: Date; // 쿠폰종료일
useOrNot?: string;

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

@ -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",

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

@ -14,6 +14,7 @@
"Partner Office": "총판",
"Partner Store": "매장",
"Partner Recommendation": "추천코드등록",
"Coupon-management": "쿠폰관리",
"Coupon": "쿠폰발행리스트",
"Coupon Money Log": "쿠폰발행머니로그",
"Coupon Log": "쿠폰발행 로그",