[Release] develop -> main

messages/en/reservation.json

@@ -172,7 +172,7 @@
   "complete": {
     "title": "Reservation Complete",
     "subtitle": "We will confirm it after review.",
-    "emailNotice": "A confirmation email has been sent. Please check your inbox or spam folder.",
+    "emailNotice": "You will receive a confirmation email within 24 hours. If you do not see the email, please check your spam folder.",
     "missingData": "Reservation details not found.",
     "cta": "My Bookings",
     "dateTime": "{date} at {time}"

messages/ko/reservation.json

@@ -172,7 +172,7 @@
   "complete": {
     "title": "예약 완료",
     "subtitle": "검토 후 확정 안내를 드릴게요.",
-    "emailNotice": "예약 확인 이메일을 보내드렸어요. 받은편지함 또는 스팸함을 확인해 주세요.",
+    "emailNotice": "24시간 이내 예약 확정 메일을 받아보실 수 있습니다. 메일이 보이지 않으면 스팸함을 확인해 주세요.",
     "missingData": "예약 정보를 찾을 수 없습니다.",
     "cta": "예약 내역",
     "dateTime": "{date} {time}"

src/models/admin/index.ts

@@ -62,6 +62,8 @@ export interface AdminUserListItem {
   age_group?: string | null;
   topic_interest?: string[];
   phone?: string | null;
+  referral_source?: string | null;
+  signup_platform?: 'web' | 'iOS' | null;
   marketing_consent: boolean;
   created_at?: string | null;
 }

src/models/reservation/index.ts

@@ -106,6 +106,11 @@ export interface ReservationProgramInfo {
   updated_at?: string;
 }
 
+export interface ReservationPromotionInfo {
+  promotion_code?: string | null;
+  promotion_code_rate?: number | null;
+}
+
 export interface ReservationDetail {
   id: number;
   reservation_code?: string;
@@ -129,6 +134,7 @@ export interface ReservationDetail {
   currency?: string;
   payment_amount?: number | null;
   display_order_id?: string;
+  promotion_code_info?: ReservationPromotionInfo | null;
   refund_info?: { currency: string; amount: number; status: string } | null;
   admin_notes?: string | null;
   created_at?: string | null;

src/pages/admin/reservations/index.tsx

@@ -34,6 +34,7 @@ import type {
   AdminReservationDetail,
   AdminReservationListStatus,
   AvailabilityOption,
+  ReservationPromotionInfo,
 } from '@/models';
 import {
   useGetAdminReservationDetailQuery,
@@ -114,6 +115,37 @@ const formatStatus = (value?: string | null) => {
   }
 };
 
+const formatPromotionRate = (value?: number | null) => {
+  if (typeof value !== 'number' || !Number.isFinite(value)) return '-';
+
+  if (value <= 1) {
+    return new Intl.NumberFormat('ko-KR', {
+      style: 'percent',
+      maximumFractionDigits: 1,
+    }).format(value);
+  }
+
+  return `${value}%`;
+};
+
+const getReservationPromotionInfo = (
+  reservation?: AdminReservationDetail | null
+): ReservationPromotionInfo | null => {
+  const candidate = reservation?.promotion_code_info;
+
+  if (!candidate) return null;
+
+  const hasPromotionCode =
+    typeof candidate.promotion_code === 'string' && candidate.promotion_code.trim().length > 0;
+  const hasPromotionRate = typeof candidate.promotion_code_rate === 'number';
+
+  if (!hasPromotionCode && !hasPromotionRate) {
+    return null;
+  }
+
+  return candidate;
+};
+
 const normalizeReservationStatus = (value?: string | null) => {
   if (!value) return '';
   if (value === 'pending') return 'request';
@@ -267,6 +299,7 @@ export default function AdminReservationsPage() {
   );
 
   const selectedReservation = reservationDetailQuery.data?.reservation ?? null;
+  const selectedReservationPromotionInfo = getReservationPromotionInfo(selectedReservation);
   const availableActions = useMemo(
     () => getReservationActions(selectedReservation?.status),
     [selectedReservation?.status]
@@ -686,6 +719,24 @@ export default function AdminReservationsPage() {
                       label="대표 방문일시"
                       value={formatDateTime(selectedReservation.visit_date)}
                     />
+                    <DetailField
+                      label="프로모션 적용"
+                      value={selectedReservationPromotionInfo ? '적용' : '미적용'}
+                    />
+                    {selectedReservationPromotionInfo && (
+                      <DetailField
+                        label="프로모션 코드"
+                        value={selectedReservationPromotionInfo.promotion_code || '-'}
+                      />
+                    )}
+                    {selectedReservationPromotionInfo && (
+                      <DetailField
+                        label="할인율"
+                        value={formatPromotionRate(
+                          selectedReservationPromotionInfo.promotion_code_rate
+                        )}
+                      />
+                    )}
                     <DetailField label="통화" value={selectedReservation.currency || '-'} />
                     <DetailField
                       label="생성일"

src/pages/admin/users/index.tsx

@@ -49,6 +49,12 @@ const GENDER_LABELS: Record<string, string> = {
   noselect: '미입력',
 };
 
+const SIGNUP_PLATFORM_LABELS: Record<string, string> = {
+  web: 'Web',
+  ios: 'iOS',
+  iOS: 'iOS',
+};
+
 const formatDate = (value?: string | null) => {
   if (!value) return '-';
 
@@ -70,6 +76,11 @@ const formatGender = (value?: string | null) => {
   return GENDER_LABELS[value] ?? value;
 };
 
+const formatSignupPlatform = (value?: string | null) => {
+  if (!value) return '-';
+  return SIGNUP_PLATFORM_LABELS[value] ?? value;
+};
+
 const buildUserProfileSummary = (user: AdminUserListItem) => {
   const parts = [user.country ?? '', formatGender(user.gender), user.age_group ?? ''].filter(
     (value) => value.length > 0
@@ -141,6 +152,9 @@ export default function AdminUsersPage() {
         user.email,
         user.country,
         user.phone,
+        user.referral_source,
+        user.signup_platform,
+        formatSignupPlatform(user.signup_platform),
         formatRole(user.role),
         formatGender(user.gender),
         user.age_group,
@@ -237,7 +251,7 @@ export default function AdminUsersPage() {
     <div css={page}>
       <AdminPageHeader
         title="회원관리"
-        description="회원 목록을 조회하고 국가와 마케팅 동의 여부로 필터링합니다."
+        description="회원 목록을 조회하고 유입경로와 가입경로를 포함한 주요 정보를 확인합니다."
         actions={
           <div css={headerActions}>
             <button
@@ -349,6 +363,8 @@ export default function AdminUsersPage() {
                   <th>프로필</th>
                   <th>역할</th>
                   <th>연락처</th>
+                  <th>유입경로</th>
+                  <th>가입경로</th>
                   <th>마케팅</th>
                   <th>가입일</th>
                   <th>액션</th>
@@ -385,6 +401,16 @@ export default function AdminUsersPage() {
                         {user.phone || '-'}
                       </Text>
                     </td>
+                    <td>
+                      <Text typo="body10" css={secondaryCellText}>
+                        {user.referral_source || '-'}
+                      </Text>
+                    </td>
+                    <td>
+                      <Text typo="body10" css={secondaryCellText}>
+                        {formatSignupPlatform(user.signup_platform)}
+                      </Text>
+                    </td>
                     <td>
                       <span css={consentChip(user.marketing_consent)}>
                         {user.marketing_consent ? '동의' : '미동의'}
@@ -505,7 +531,7 @@ const tableWrap = css`
 
 const table = css`
   width: 100%;
-  min-width: 1180px;
+  min-width: 1420px;
   border-collapse: collapse;
 
   thead tr {

src/utils/admin-excel.ts

@@ -43,6 +43,12 @@ const USER_GENDER_LABELS: Record<string, string> = {
   noselect: '미입력',
 };
 
+const USER_SIGNUP_PLATFORM_LABELS: Record<string, string> = {
+  web: 'Web',
+  ios: 'iOS',
+  iOS: 'iOS',
+};
+
 const padNumber = (value: number) => String(value).padStart(2, '0');
 
 const getDateStamp = (value = new Date()) =>
@@ -100,6 +106,8 @@ const formatUserRole = (role: string | null | undefined) =>
   formatOptionalText(role ? (USER_ROLE_LABELS[role] ?? role) : role);
 const formatUserGender = (gender: string | null | undefined) =>
   formatOptionalText(gender ? (USER_GENDER_LABELS[gender] ?? gender) : gender);
+const formatUserSignupPlatform = (platform: string | null | undefined) =>
+  formatOptionalText(platform ? (USER_SIGNUP_PLATFORM_LABELS[platform] ?? platform) : platform);
 const formatMarketingConsent = (value: boolean | null | undefined) => (value ? '동의' : '미동의');
 
 const toCellText = (value: ExcelCellValue) => String(value);
@@ -298,6 +306,8 @@ const buildUserWorksheet = (users: AdminUserListItem[]): ExcelWorksheet => ({
       '연령대',
       '관심 주제',
       '연락처',
+      '유입경로',
+      '가입경로',
       '마케팅 동의',
       '가입일',
     ],
@@ -311,6 +321,8 @@ const buildUserWorksheet = (users: AdminUserListItem[]): ExcelWorksheet => ({
       formatOptionalText(user.age_group),
       formatListValue(user.topic_interest),
       formatOptionalText(user.phone),
+      formatOptionalText(user.referral_source),
+      formatUserSignupPlatform(user.signup_platform),
       formatMarketingConsent(user.marketing_consent),
       formatDateTime(user.created_at),
     ]),