diff --git a/apps/super-admin/src/components/PaymentTable/PaymentTable.tsx b/apps/super-admin/src/components/PaymentTable/PaymentTable.tsx
index 0fc2ac20..a1f41f42 100644
--- a/apps/super-admin/src/components/PaymentTable/PaymentTable.tsx
+++ b/apps/super-admin/src/components/PaymentTable/PaymentTable.tsx
@@ -41,13 +41,12 @@ const PaymentTable = ({ data, ticketStatus }: PaymentTableProps) => {
결제 수단
결제 일시
- 결제 방법
+ 예매 방법
{ticketStatus === 'CANCEL' && (
<>
취소 금액
- 취소 수단
취소 일시
취소 사유
>
@@ -75,17 +74,18 @@ const PaymentTable = ({ data, ticketStatus }: PaymentTableProps) => {
{item.ticketPrice.toLocaleString()}원
- 결제 수단
+ {getPaymentMeans(item.means)}
{format(item.ticketCreatedAt, 'yyyy.MM.dd HH:mm')}
- {getPaymentMeans(item.means)}
+
+ {item.giftReceived ? '선물 예매' : '직접 예매'}
+
{ticketStatus === 'CANCEL' && (
<>
{item.ticketPrice.toLocaleString()}원
- 취소 수단
{format(item.canceledAt, 'yyyy.MM.dd HH:mm')}
diff --git a/apps/super-admin/src/pages/EntrancePage/index.tsx b/apps/super-admin/src/pages/EntrancePage/index.tsx
index 2965ac56..81a5baa5 100644
--- a/apps/super-admin/src/pages/EntrancePage/index.tsx
+++ b/apps/super-admin/src/pages/EntrancePage/index.tsx
@@ -123,10 +123,10 @@ const EntrancePage = () => {
{totalPages > 0 && (
{
- setCurrentPage(page);
+ setCurrentPage(page - 1);
}}
/>
)}
diff --git a/apps/super-admin/src/pages/PaymentPage/index.tsx b/apps/super-admin/src/pages/PaymentPage/index.tsx
index ff430a68..3e47e1d1 100644
--- a/apps/super-admin/src/pages/PaymentPage/index.tsx
+++ b/apps/super-admin/src/pages/PaymentPage/index.tsx
@@ -138,10 +138,10 @@ const PaymentPage = () => {
{totalPages > 0 && (
{
- setCurrentPage(page);
+ setCurrentPage(page - 1);
}}
/>
)}
diff --git a/packages/api/src/types/adminReservation.ts b/packages/api/src/types/adminReservation.ts
index 911aa76b..d251b6cc 100644
--- a/packages/api/src/types/adminReservation.ts
+++ b/packages/api/src/types/adminReservation.ts
@@ -8,7 +8,9 @@ export type AdminReservationResponse = ReservationResponse & {
/** 결제자 연락처 */
payerPhoneNumber: string;
/** 결제 수단 */
- paymentMeans: string;
+ means: string;
+ /** 선물 예매 여부 */
+ giftReceived: boolean;
/** 취소 일시 */
canceledAt: string;
/** 취소 사유 */