Fix: 슈드민 결제, 입장 페이지 QA (#164)

* fix: 테이블 페이지네이션 클릭 로직 개선 * fix: 슈드민 결제 테이블 > 예매 방법 필드, 컬럼 추가
Nexters · Sep 10, 2024 · c2a0ac8 · c2a0ac8
1 parent 89f06da
commit c2a0ac8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git 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) => {
           </Styled.TableHeaderItem>
           <Styled.TableHeaderItem width={168}>결제 수단</Styled.TableHeaderItem>
           <Styled.TableHeaderItem width={148}>결제 일시</Styled.TableHeaderItem>
-          <Styled.TableHeaderItem width={100}>결제 방법</Styled.TableHeaderItem>
+          <Styled.TableHeaderItem width={100}>예매 방법</Styled.TableHeaderItem>
           {ticketStatus === 'CANCEL' && (
             <>
               <Styled.TableHeaderItem width={92} align="right">
                 취소 금액
               </Styled.TableHeaderItem>
-              <Styled.TableHeaderItem width={168}>취소 수단</Styled.TableHeaderItem>
               <Styled.TableHeaderItem width={148}>취소 일시</Styled.TableHeaderItem>
               <Styled.TableHeaderItem width={162}>취소 사유</Styled.TableHeaderItem>
             </>
@@ -75,17 +74,18 @@ const PaymentTable = ({ data, ticketStatus }: PaymentTableProps) => {
                 <Styled.TableItem align="right" width={92}>
                   {item.ticketPrice.toLocaleString()}원
                 </Styled.TableItem>
-                <Styled.TableItem width={168}>결제 수단</Styled.TableItem>
+                <Styled.TableItem width={168}>{getPaymentMeans(item.means)}</Styled.TableItem>
                 <Styled.TableItem width={148}>
                   {format(item.ticketCreatedAt, 'yyyy.MM.dd HH:mm')}
                 </Styled.TableItem>
-                <Styled.TableItem width={100}>{getPaymentMeans(item.means)}</Styled.TableItem>
+                <Styled.TableItem width={100}>
+                  {item.giftReceived ? '선물 예매' : '직접 예매'}
+                </Styled.TableItem>
                 {ticketStatus === 'CANCEL' && (
                   <>
                     <Styled.TableItem width={92} align="right">
                       {item.ticketPrice.toLocaleString()}원
                     </Styled.TableItem>
-                    <Styled.TableItem width={168}>취소 수단</Styled.TableItem>
                     <Styled.TableItem width={148}>
                       {format(item.canceledAt, 'yyyy.MM.dd HH:mm')}
                     </Styled.TableItem>

diff --git 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 && (
         <Pagination
           style={{ marginTop: 16 }}
-          current={currentPage}
+          current={currentPage + 1}
           total={totalElements}
           onChange={(page) => {
-            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
@@ -138,10 +138,10 @@ const PaymentPage = () => {
       {totalPages > 0 && (
         <Pagination
           style={{ marginTop: 16 }}
-          current={currentPage}
+          current={currentPage + 1}
           total={totalElements}
           onChange={(page) => {
-            setCurrentPage(page);
+            setCurrentPage(page - 1);
           }}
         />
       )}

diff --git 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;
   /** 취소 사유 */