From b5db56fd703dab73559f0cbeef207d65fe7038c0 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Fri, 7 Nov 2025 15:16:14 +0900 Subject: [PATCH] =?UTF-8?q?catch=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=20api=20=EC=82=AD=EC=A0=9C=20api=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=82=B4=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/ui/user-login-auth-info-wrap.tsx | 2 +- src/entities/account/ui/user-manage-wrap.tsx | 3 +- .../detail/account-holder-auth-detail.tsx | 3 +- .../detail/account-holder-search-detail.tsx | 3 +- .../ui/alimtalk/detail/alimtalk-detail.tsx | 3 +- .../ui/ars/detail/ars-detail.tsx | 336 ++++++++-------- .../ui/fund-account/detail/result-detail.tsx | 5 +- .../fund-account/detail/transfer-detail.tsx | 2 +- .../ui/fund-account/result-list-wrap.tsx | 7 +- .../ui/fund-account/transfer-list-wrap.tsx | 7 +- .../detail/link-payment-history-detail.tsx | 2 +- .../detail/link-payment-wait-detail.tsx | 2 +- .../link-payment-history-wrap.tsx | 5 +- .../link-payment-wait-send-wrap.tsx | 3 +- .../ui/payout/detail/payout-detail.tsx | 370 +++++++++--------- src/entities/alarm/ui/alarm-item.tsx | 3 +- src/entities/alarm/ui/alarm-list.tsx | 3 +- .../home/ui/day-status-box-container1.tsx | 3 +- .../home/ui/day-status-box-container2.tsx | 5 +- src/entities/home/ui/home-banner-list.tsx | 3 +- src/entities/home/ui/home-notice-list.tsx | 3 +- src/entities/merchant/ui/info-wrap.tsx | 3 +- .../merchant/ui/registration-status-wrap.tsx | 3 +- src/entities/payment/ui/info-wrap.tsx | 9 +- .../payment/ui/notification-data-wrap.tsx | 3 +- src/entities/settlement/ui/calendar-wrap.tsx | 3 +- .../ui/detail/settlement-detail.tsx | 4 +- src/entities/settlement/ui/list-wrap.tsx | 9 +- .../support/ui/detail/notice-detail.tsx | 3 +- src/entities/support/ui/detail/qna-detail.tsx | 3 +- .../api/use-download-confirmation-mutation.ts | 39 -- src/entities/transaction/model/types.ts | 10 +- .../ui/detail/all-transaction-detail.tsx | 3 +- .../transaction/ui/detail/billing-detail.tsx | 3 +- .../ui/detail/cash-receit-detail.tsx | 4 +- .../transaction/ui/detail/escrow-detail.tsx | 5 +- .../ui/section/amount-info-section.tsx | 20 +- .../ui/detail/tax-invoice-detail.tsx | 5 +- .../account-holder-auth-page.tsx | 5 +- .../account-holder-search-page.tsx | 2 +- .../additional-service/alimtalk/list-page.tsx | 4 +- .../alimtalk/setting-page.tsx | 2 +- .../additional-service/ars/list-page.tsx | 5 +- .../face-auth/face-auth-page.tsx | 5 +- .../key-in-payment/key-in-payment-page.tsx | 5 +- src/pages/additional-service/list-page.tsx | 3 +- .../additional-service/payout/list-page.tsx | 5 +- .../sms-payment/sms-payment-page.tsx | 7 +- src/pages/home/home-page.tsx | 5 +- src/pages/setting/setting-page.tsx | 11 +- src/pages/support/faq/list-page.tsx | 3 +- src/pages/support/notice/list-page.tsx | 3 +- src/pages/support/qna/list-page.tsx | 3 +- src/pages/support/qna/register-page.tsx | 3 +- .../all-transaction/cancel-page.tsx | 4 +- .../transaction/all-transaction/list-page.tsx | 6 +- src/pages/transaction/billing/charge-page.tsx | 2 +- src/pages/transaction/billing/list-page.tsx | 3 +- .../hand-written-issuance-page.tsx | 2 +- .../transaction/cash-receipt/list-page.tsx | 5 +- src/pages/transaction/escrow/list-page.tsx | 3 +- src/shared/api/api-url-transaction.ts | 4 - src/shared/ui/menu/index.tsx | 3 +- 63 files changed, 498 insertions(+), 507 deletions(-) delete mode 100644 src/entities/transaction/api/use-download-confirmation-mutation.ts diff --git a/src/entities/account/ui/user-login-auth-info-wrap.tsx b/src/entities/account/ui/user-login-auth-info-wrap.tsx index 3a34dbf..b131a8a 100644 --- a/src/entities/account/ui/user-login-auth-info-wrap.tsx +++ b/src/entities/account/ui/user-login-auth-info-wrap.tsx @@ -82,7 +82,7 @@ export const UserLoginAuthInfoWrap = ({ } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/account/ui/user-manage-wrap.tsx b/src/entities/account/ui/user-manage-wrap.tsx index 3ea5504..502ed74 100644 --- a/src/entities/account/ui/user-manage-wrap.tsx +++ b/src/entities/account/ui/user-manage-wrap.tsx @@ -9,6 +9,7 @@ import { UserListItem } from '@/entities/user/model/types'; import { useStore } from '@/shared/model/store'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const UserManageWrap = () => { const { t } = useTranslation(); @@ -33,7 +34,7 @@ export const UserManageWrap = () => { setUserItems(rs.content || []); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail.tsx b/src/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail.tsx index 18b10c5..2e03e4e 100644 --- a/src/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail.tsx +++ b/src/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail.tsx @@ -9,6 +9,7 @@ import { useTranslation } from 'react-i18next'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface AccountHolderAuthDetailProps { detailOn: boolean; @@ -37,7 +38,7 @@ export const AccountHolderAuthDetail = ({ setDetail(rs); }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/account-holder-search/detail/account-holder-search-detail.tsx b/src/entities/additional-service/ui/account-holder-search/detail/account-holder-search-detail.tsx index 478d1b4..45ef7c2 100644 --- a/src/entities/additional-service/ui/account-holder-search/detail/account-holder-search-detail.tsx +++ b/src/entities/additional-service/ui/account-holder-search/detail/account-holder-search-detail.tsx @@ -8,6 +8,7 @@ import { useTranslation } from 'react-i18next'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface AccountHolderSearchDetailProps { detailOn: boolean; @@ -36,7 +37,7 @@ export const AccountHolderSearchDetail = ({ setDetail(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/alimtalk/detail/alimtalk-detail.tsx b/src/entities/additional-service/ui/alimtalk/detail/alimtalk-detail.tsx index 63deda8..846eebc 100644 --- a/src/entities/additional-service/ui/alimtalk/detail/alimtalk-detail.tsx +++ b/src/entities/additional-service/ui/alimtalk/detail/alimtalk-detail.tsx @@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface AlimtalkDetailProps { detailOn: boolean; @@ -43,7 +44,7 @@ export const AlimtalkDetail = ({ setDetail(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/ars/detail/ars-detail.tsx b/src/entities/additional-service/ui/ars/detail/ars-detail.tsx index e9c6c40..6e4df89 100644 --- a/src/entities/additional-service/ui/ars/detail/ars-detail.tsx +++ b/src/entities/additional-service/ui/ars/detail/ars-detail.tsx @@ -14,183 +14,183 @@ import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; export interface ArsDetailProps { - detailOn: boolean; - setDetailOn: (detailOn: boolean) => void; - mid: string; - tid: string; + detailOn: boolean; + setDetailOn: (detailOn: boolean) => void; + mid: string; + tid: string; }; export const ArsDetail = ({ - detailOn, - setDetailOn, - mid, - tid + detailOn, + setDetailOn, + mid, + tid }: ArsDetailProps) => { - const { t } = useTranslation(); + const { t } = useTranslation(); - const [detail, setDetail] = useState(); - const [bottomSheetOn, setBottomSheetOn] = useState(false); + const [detail, setDetail] = useState(); + const [bottomSheetOn, setBottomSheetOn] = useState(false); - const { mutateAsync: extensionArsDetail } = useExtensionArsDetailMutation(); - const { mutateAsync: extensionArsResend } = useExtensionArsResendMutation(); + const { mutateAsync: extensionArsDetail } = useExtensionArsDetailMutation(); + const { mutateAsync: extensionArsResend } = useExtensionArsResendMutation(); - const callDetail = () => { - let arsDetailParams: ExtensionArsDetailParams = { - mid: mid, - tid: tid - }; - extensionArsDetail(arsDetailParams).then((rs: ExtensionArsDetailResponse) => { - setDetail(rs); - }).catch((e: any) => { - if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); - return; - } - }); - } + const callDetail = () => { + let arsDetailParams: ExtensionArsDetailParams = { + mid: mid, + tid: tid + }; + extensionArsDetail(arsDetailParams).then((rs: ExtensionArsDetailResponse) => { + setDetail(rs); + }).catch((e: any) => { + if (e.response?.data?.error?.message) { + snackBar(e.response?.data?.error?.message); + return; + } + }); + } - const arsResend = () => { - let arsResendParams: ExtensionArsResendParams = { - mid: mid, - tid: tid - }; - extensionArsResend(arsResendParams).then((rs: ExtensionArsResendResponse) => { - if (rs.status) { - snackBar(t('additionalService.ars.smsResendSuccess')); - setBottomSheetOn(false); - callDetail(); // 상세 정보 갱신 - } else { - const errorMessage = rs.error?.message || t('additionalService.ars.smsResendFailed'); - snackBar(`[${t('common.failed')}] ${errorMessage}`); - } - }).catch((error) => { - const errorMessage = error?.response?.data?.error?.message || - error?.message || - t('additionalService.ars.smsResendError'); - snackBar(`[${t('common.failed')}] ${errorMessage}`); - }); - } + const arsResend = () => { + let arsResendParams: ExtensionArsResendParams = { + mid: mid, + tid: tid + }; + extensionArsResend(arsResendParams).then((rs: ExtensionArsResendResponse) => { + if (rs.status) { + snackBar(t('additionalService.ars.smsResendSuccess')); + setBottomSheetOn(false); + callDetail(); // 상세 정보 갱신 + } + else{ + const errorMessage = rs.error?.message || t('additionalService.ars.smsResendFailed'); + snackBar(`[${t('common.failed')}] ${errorMessage}`); + } + }).catch((error) => { + const errorMessage = error?.response?.data?.error?.message || + error?.message || + t('additionalService.ars.smsResendError'); + snackBar(`[${t('common.failed')}] ${errorMessage}`); + }); + } - const onClickToOpenResendBottomSheet = () => { - if (!checkGrant(52, 'X')) { - showAlert(t('common.nopermission')); - return; - } - setBottomSheetOn(true); - }; - const onClickToClose = () => { - setDetailOn(false); - }; + const onClickToOpenResendBottomSheet = () => { + if(!checkGrant(52, 'X')){ + showAlert(t('common.nopermission')); + return; + } + setBottomSheetOn(true); + }; + const onClickToClose = () => { + setDetailOn(false); + }; - const getDate = (date?: string) => { - return (date) ? moment(date.substr(0, 8)).format('YYYY.MM.DD') : ''; - }; + const getDate = (date?: string) => { + return (date) ? moment(date.substr(0, 8)).format('YYYY.MM.DD') : ''; + }; - useEffect(() => { - if (!!mid && !!tid) { - callDetail(); - } - }, [mid, tid]); + useEffect(() => { + if (!!mid && !!tid) { + callDetail(); + } + }, [mid, tid]); - return ( - <> - -
-
-
{t('additionalService.ars.detailTitle')}
-
- -
-
-
-
- - {t('home.money', { value: new Intl.NumberFormat('en-US').format(Number(detail?.amount) || 0) })} - -
-
{detail?.corpName}
-
{getDate(detail?.paymentDate)}
-
-
-
-
{t('additionalService.ars.transactionInfo')}
-
    -
  • - {t('transaction.fields.mid')} - {detail?.mid} -
    • -
  • - {t('additionalService.ars.paymentMethod')} - {detail?.arsPaymentMethod} -
    • -
  • - {t('additionalService.ars.paymentStatus')} - {getArsPaymentStatusName(t)(detail?.paymentStatus)} -
    • -
  • - {t('additionalService.ars.orderStatus')} - {getArsOrderStatusName(t)(detail?.orderStatus)} -
    • -
  • - {t('additionalService.ars.orderDateTime')} - { - detail?.paymentDate ? moment(detail.paymentDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : '-' - } -
    • -
  • - {t('additionalService.ars.productName')} - {detail?.goodsName} -
    • -
  • - {t('additionalService.ars.orderNumber')} - {detail?.tid} -
    • -
  • - {t('additionalService.ars.buyer')} - {detail?.buyerName} -
    • -
  • - {t('additionalService.ars.phoneNumber')} - {detail?.maskPhoneNumber} -
    • -
  • - {t('additionalService.ars.email')} - {detail?.email} -
    • -
  • - {t('additionalService.ars.sendVerificationCode')} - {detail?.smsVerificationCode} -
    • -
-
- {detail?.arsPaymentMethod === ArsPaymentMethod.SMS && ( -
- -
- )} -
- - - - ) - -} \ No newline at end of file + return ( + <> + +
+
+
{t('additionalService.ars.detailTitle')}
+
+ +
+
+
+
+ + {t('home.money', { value: new Intl.NumberFormat('en-US').format(Number(detail?.amount) || 0) })} + +
+
{detail?.corpName}
+
{getDate(detail?.paymentDate)}
+
+
+
+
{t('additionalService.ars.transactionInfo')}
+
    +
  • + {t('transaction.fields.mid')} + {detail?.mid} +
    • +
  • + {t('additionalService.ars.paymentMethod')} + {detail?.arsPaymentMethod} +
    • +
  • + {t('additionalService.ars.paymentStatus')} + {getArsPaymentStatusName(t)(detail?.paymentStatus)} +
    • +
  • + {t('additionalService.ars.orderStatus')} + {getArsOrderStatusName(t)(detail?.orderStatus)} +
    • +
  • + {t('additionalService.ars.orderDateTime')} + { + detail?.paymentDate ? moment(detail.paymentDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : '-' + } +
    • +
  • + {t('additionalService.ars.productName')} + {detail?.goodsName} +
    • +
  • + {t('additionalService.ars.orderNumber')} + {detail?.tid} +
    • +
  • + {t('additionalService.ars.buyer')} + {detail?.buyerName} +
    • +
  • + {t('additionalService.ars.phoneNumber')} + {detail?.maskPhoneNumber} +
    • +
  • + {t('additionalService.ars.email')} + {detail?.email} +
    • +
  • + {t('additionalService.ars.sendVerificationCode')} + {detail?.smsVerificationCode} +
    • +
+
+ { detail?.arsPaymentMethod === ArsPaymentMethod.SMS && ( +
+ +
+ )} +
+ + + + ); +}; \ No newline at end of file diff --git a/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx b/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx index 50420ba..e0caa6c 100644 --- a/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx +++ b/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx @@ -14,6 +14,7 @@ import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface FundAccountResultDetailProps { detailOn: boolean; @@ -46,7 +47,7 @@ export const FundAccountResultDetail = ({ setDetail(rs); }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -67,7 +68,7 @@ export const FundAccountResultDetail = ({ console.log('Receipt Download Status:', rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/fund-account/detail/transfer-detail.tsx b/src/entities/additional-service/ui/fund-account/detail/transfer-detail.tsx index e7b2dda..65a86d4 100644 --- a/src/entities/additional-service/ui/fund-account/detail/transfer-detail.tsx +++ b/src/entities/additional-service/ui/fund-account/detail/transfer-detail.tsx @@ -45,7 +45,7 @@ export const FundAccountTransferDetail = ({ setDetail(rs); }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } });; diff --git a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx index 97ae82c..c645115 100644 --- a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx @@ -21,6 +21,7 @@ import { useTranslation } from 'react-i18next'; import { FundAccountResultDetail } from './detail/result-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const FundAccountResultListWrap = () => { const { navigate } = useNavigate(); @@ -128,7 +129,7 @@ export const FundAccountResultListWrap = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -149,7 +150,7 @@ export const FundAccountResultListWrap = () => { setTotalFailAmount(rs.totalFailAmount); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -176,7 +177,7 @@ export const FundAccountResultListWrap = () => { console.log('Excel Download Status:', rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx index 139822c..8c58106 100644 --- a/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx @@ -30,6 +30,7 @@ import { useTranslation } from 'react-i18next'; import { FundAccountTransferDetail } from './detail/transfer-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const FundAccountTransferListWrap = () => { const { navigate } = useNavigate(); @@ -126,7 +127,7 @@ export const FundAccountTransferListWrap = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -160,7 +161,7 @@ export const FundAccountTransferListWrap = () => { console.log('Excel Download Status:', rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -176,7 +177,7 @@ export const FundAccountTransferListWrap = () => { setBalance(rs.balance); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx b/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx index 19e9eb6..1c41f6c 100644 --- a/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx +++ b/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx @@ -70,7 +70,7 @@ export const LinkPaymentHistoryDetail = ({ setDetailExposure(rs.detailExposure ?? false) }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/link-payment/detail/link-payment-wait-detail.tsx b/src/entities/additional-service/ui/link-payment/detail/link-payment-wait-detail.tsx index 9aa292d..587397e 100644 --- a/src/entities/additional-service/ui/link-payment/detail/link-payment-wait-detail.tsx +++ b/src/entities/additional-service/ui/link-payment/detail/link-payment-wait-detail.tsx @@ -45,7 +45,7 @@ export const LinkPaymentWaitDetail = ({ setPaymentInfo(rs.paymentInfo) }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx b/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx index 9feea32..4682b87 100644 --- a/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx +++ b/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx @@ -19,6 +19,7 @@ import { useTranslation } from 'react-i18next'; import { LinkPaymentHistoryDetail } from './detail/link-payment-history-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; const getPaymentResultBtnGroup = (t: any) => [ { name: t('additionalService.linkPayment.all'), value: LinkPaymentPaymentStatus.ALL }, @@ -137,7 +138,7 @@ export const LinkPaymentHistoryWrap = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -168,7 +169,7 @@ export const LinkPaymentHistoryWrap = () => { console.log('Excel Download Status: ' + rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx index cef38a8..f9426eb 100644 --- a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx +++ b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx @@ -20,6 +20,7 @@ import { useTranslation } from 'react-i18next'; import { LinkPaymentWaitDetail } from './detail/link-payment-wait-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const LinkPaymentWaitSendWrap = () => { @@ -148,7 +149,7 @@ export const LinkPaymentWaitSendWrap = () => { console.log('Excel Download Status: ' + rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/additional-service/ui/payout/detail/payout-detail.tsx b/src/entities/additional-service/ui/payout/detail/payout-detail.tsx index 0893949..6e462b0 100644 --- a/src/entities/additional-service/ui/payout/detail/payout-detail.tsx +++ b/src/entities/additional-service/ui/payout/detail/payout-detail.tsx @@ -11,206 +11,200 @@ import { DownloadTypeBottomSheet } from '@/entities/common/ui/download-type-bott import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; - +import { snackBar } from '@/shared/lib'; export interface PayoutDetailProps { - detailOn: boolean; - setDetailOn: (detailOn: boolean) => void; - mid: string; - tid: string; + detailOn: boolean; + setDetailOn: (detailOn: boolean) => void; + mid: string; + tid: string; }; export const PayoutDetail = ({ - detailOn, - setDetailOn, - mid, - tid + detailOn, + setDetailOn, + mid, + tid }: PayoutDetailProps) => { - const { t } = useTranslation(); + const { t } = useTranslation(); - const [detail, setDetail] = useState(); - const [downloadTypeBottomSheetOn, setDownloadTypeBottomSheetOn] = useState(false); - const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); + const [detail, setDetail] = useState(); + const [downloadTypeBottomSheetOn, setDownloadTypeBottomSheetOn] = useState(false); + const [emailBottomSheetOn, setEmailBottomSheetOn] = useState(false); - const { mutateAsync: extensionPayoutDetail } = useExtensionPayoutDetailMutation(); - const { mutateAsync: extensionPayoutDetailDownloadCertification } = useExtensionPayoutDetailDownloadCertificateMutation(); + const { mutateAsync: extensionPayoutDetail } = useExtensionPayoutDetailMutation(); + const { mutateAsync: extensionPayoutDetailDownloadCertification } = useExtensionPayoutDetailDownloadCertificateMutation(); + const callDetail = () => { + let params: ExtensionPayoutDetailParams = { + tid: tid, + mid: mid, + }; + extensionPayoutDetail(params).then((rs: ExtensionPayoutDetailResponse) => { + setDetail(rs); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + snackBar(e.response?.data?.error?.message); + return; + } + }); + } - const callDetail = () => { - let params: ExtensionPayoutDetailParams = { - tid: tid, - mid: mid, - }; - extensionPayoutDetail(params).then((rs: ExtensionPayoutDetailResponse) => { - setDetail(rs); - }).catch((e: any) => { - if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); - return; - } - }); - } + const onClickToDownload = () => { + if(!checkGrant(53, 'D')){ + showAlert(t('common.nopermission')); + return; + } + setDownloadTypeBottomSheetOn(true); + }; - const onClickToDownload = () => { - if (!checkGrant(53, 'D')) { - showAlert(t('common.nopermission')); - return; - } - setDownloadTypeBottomSheetOn(true); - }; + const onSelectDownloadType = (type: 'IMAGE' | 'EMAIL') => { + if(type === 'IMAGE'){ + // Save image directly + const params: ExtensionPayoutDetailDownloadCertificateParams = { + mid: mid, + tid: tid, + requestType: 'IMAGE', + email: '' + }; + extensionPayoutDetailDownloadCertification(params).then((rs: ExtensionPayoutDetailDownloadCertificateResponse) => { + console.log('Certificate Download Status:', rs); + }).catch((error) => { + console.error('Certificate Download Failed:', error); + }); + } + else{ + // Open EmailBottomSheet for email option + setEmailBottomSheetOn(true); + } + }; - const onSelectDownloadType = (type: 'IMAGE' | 'EMAIL') => { - if (type === 'IMAGE') { - // Save image directly - const params: ExtensionPayoutDetailDownloadCertificateParams = { - mid: mid, - tid: tid, - requestType: 'IMAGE', - email: '' - }; - extensionPayoutDetailDownloadCertification(params) - .then((rs: ExtensionPayoutDetailDownloadCertificateResponse) => { - console.log('Certificate Download Status:', rs); - }) - .catch((error) => { - console.error('Certificate Download Failed:', error); - }); - } else { - // Open EmailBottomSheet for email option - setEmailBottomSheetOn(true); - } - }; + const onSendRequest = (selectedEmail?: string) => { + if(selectedEmail){ + const params: ExtensionPayoutDetailDownloadCertificateParams = { + mid: mid, + tid: tid, + requestType: 'EMAIL', + email: selectedEmail + }; + extensionPayoutDetailDownloadCertification(params).then((rs: ExtensionPayoutDetailDownloadCertificateResponse) => { + console.log('Certificate Download Status:', rs); + }).catch((error) => { + console.error('Certificate Download Failed:', error); + }); + } + setEmailBottomSheetOn(false); + }; - const onSendRequest = (selectedEmail?: string) => { - if (selectedEmail) { - const params: ExtensionPayoutDetailDownloadCertificateParams = { - mid: mid, - tid: tid, - requestType: 'EMAIL', - email: selectedEmail - }; - extensionPayoutDetailDownloadCertification(params) - .then((rs: ExtensionPayoutDetailDownloadCertificateResponse) => { - console.log('Certificate Download Status:', rs); - }) - .catch((error) => { - console.error('Certificate Download Failed:', error); - }); - } - setEmailBottomSheetOn(false); - }; + const onClickToClose = () => { + setDetailOn(false); + }; - const onClickToClose = () => { - setDetailOn(false); - }; + useEffect(() => { + if (!!mid && !!tid) { + callDetail(); + } + }, [mid, tid]); - - useEffect(() => { - if (!!mid && !!tid) { - callDetail(); - } - }, [mid, tid]); - - return ( - <> - -
-
-
{t('additionalService.payout.detailTitle')}
-
- -
-
-
-
- - {t('home.money', { value: new Intl.NumberFormat('en-US').format(detail?.disbursementAmount || 0) })} - -
-
{detail?.companyName}
-
{moment(detail?.settlementDate).format('YYYY.MM.DD')}
-
- -
-
-
-
-
{t('additionalService.payout.detailInfo')}
-
    -
  • - {t('additionalService.payout.disbursementStatus')} - {detail?.disbursementStatus} -
    • -
  • - {t('additionalService.payout.transactionType')} - {detail?.transTypeName} -
    • -
  • - {t('common.requestDate')} - {moment(detail?.requestDate).format('YYYY.MM.DD')} -
    • -
  • - {t('additionalService.payout.disbursementDateTime')} - {detail?.settlementDateTime ? moment(detail?.settlementDateTime, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : ""} -
    • -
  • - {t('additionalService.payout.businessNumber')} - {detail?.companyNo} -
    • -
  • - {t('additionalService.payout.accountHolder')} - {detail?.accountName} -
    • -
  • - {t('additionalService.payout.bank')} - {detail?.bankName} -
    • -
  • - {t('additionalService.payout.accountNumber')} - {detail?.accountNo} -
    • -
  • - {t('additionalService.payout.depositor')} - {detail?.depositName} -
    • -
  • - {t('additionalService.payout.failureReason')} - {detail?.failReason} -
    • -
-
-
- - - - - ) - -} \ No newline at end of file + return ( + <> + +
+
+
{t('additionalService.payout.detailTitle')}
+
+ +
+
+
+
+ + {t('home.money', { value: new Intl.NumberFormat('en-US').format(detail?.disbursementAmount || 0) })} + +
+
{detail?.companyName}
+
{moment(detail?.settlementDate).format('YYYY.MM.DD')}
+
+ +
+
+
+
+
{t('additionalService.payout.detailInfo')}
+
    +
  • + {t('additionalService.payout.disbursementStatus')} + {detail?.disbursementStatus} +
    • +
  • + {t('additionalService.payout.transactionType')} + {detail?.transTypeName} +
    • +
  • + {t('common.requestDate')} + {moment(detail?.requestDate).format('YYYY.MM.DD')} +
    • +
  • + {t('additionalService.payout.disbursementDateTime')} + {detail?.settlementDateTime ? moment(detail?.settlementDateTime, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : ""} +
    • +
  • + {t('additionalService.payout.businessNumber')} + {detail?.companyNo} +
    • +
  • + {t('additionalService.payout.accountHolder')} + {detail?.accountName} +
    • +
  • + {t('additionalService.payout.bank')} + {detail?.bankName} +
    • +
  • + {t('additionalService.payout.accountNumber')} + {detail?.accountNo} +
    • +
  • + {t('additionalService.payout.depositor')} + {detail?.depositName} +
    • +
  • + {t('additionalService.payout.failureReason')} + {detail?.failReason} +
    • +
+
+
+ + + + + ); +}; \ No newline at end of file diff --git a/src/entities/alarm/ui/alarm-item.tsx b/src/entities/alarm/ui/alarm-item.tsx index 7c9e30e..c5fa5b3 100644 --- a/src/entities/alarm/ui/alarm-item.tsx +++ b/src/entities/alarm/ui/alarm-item.tsx @@ -8,6 +8,7 @@ import { useStore } from '@/shared/model/store'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface AlarmItemProps { @@ -69,7 +70,7 @@ export const AlarmItem = ({ console.log(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }).finally(() => { diff --git a/src/entities/alarm/ui/alarm-list.tsx b/src/entities/alarm/ui/alarm-list.tsx index 65f4cb7..b49d33c 100644 --- a/src/entities/alarm/ui/alarm-list.tsx +++ b/src/entities/alarm/ui/alarm-list.tsx @@ -11,6 +11,7 @@ import { useStore } from '@/shared/model/store'; import { DefaultRequestPagination } from '@/entities/common/model/types'; import { AlarmRoutes } from './alarm-routes'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface AlarmListProps { appNotificationCategory: string; @@ -95,7 +96,7 @@ export const AlarmList = ({ } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/home/ui/day-status-box-container1.tsx b/src/entities/home/ui/day-status-box-container1.tsx index a84853a..29ebed8 100644 --- a/src/entities/home/ui/day-status-box-container1.tsx +++ b/src/entities/home/ui/day-status-box-container1.tsx @@ -14,6 +14,7 @@ import { useStore } from '@/shared/model/store'; import { useTranslation } from 'react-i18next'; import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; +import { snackBar } from '@/shared/lib'; export const BoxContainer1 = () => { const { navigate } = useNavigate(); @@ -57,7 +58,7 @@ export const BoxContainer1 = () => { setSettlement(rs.settlement); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/home/ui/day-status-box-container2.tsx b/src/entities/home/ui/day-status-box-container2.tsx index 4e32c0c..491c157 100644 --- a/src/entities/home/ui/day-status-box-container2.tsx +++ b/src/entities/home/ui/day-status-box-container2.tsx @@ -10,6 +10,7 @@ import { useStore } from '@/shared/model/store'; import { useTranslation } from 'react-i18next'; import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; +import { snackBar } from '@/shared/lib'; export const BoxContainer2 = () => { const { navigate } = useNavigate(); @@ -61,7 +62,7 @@ export const BoxContainer2 = () => { } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -81,7 +82,7 @@ export const BoxContainer2 = () => { setTopPaymentMethodInfo(rs.topPaymentMethodInfo); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/home/ui/home-banner-list.tsx b/src/entities/home/ui/home-banner-list.tsx index 3bf2964..bc3374d 100644 --- a/src/entities/home/ui/home-banner-list.tsx +++ b/src/entities/home/ui/home-banner-list.tsx @@ -12,6 +12,7 @@ import { HomeBannerListResponse } from '../model/types'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const HomeBannerList = () => { @@ -34,7 +35,7 @@ export const HomeBannerList = () => { } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }).finally(() => { diff --git a/src/entities/home/ui/home-notice-list.tsx b/src/entities/home/ui/home-notice-list.tsx index 41203cd..42cc85b 100644 --- a/src/entities/home/ui/home-notice-list.tsx +++ b/src/entities/home/ui/home-notice-list.tsx @@ -6,6 +6,7 @@ import { HomeNoticeItem } from './home-notice-item'; import { useTranslation } from 'react-i18next'; import { NoticeDetail } from '@/entities/support/ui/detail/notice-detail'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const HomeNoticeList = () => { const { t } = useTranslation(); @@ -54,7 +55,7 @@ export const HomeNoticeList = () => { setResultList(rs.content); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/merchant/ui/info-wrap.tsx b/src/entities/merchant/ui/info-wrap.tsx index 116d277..8c5d67e 100644 --- a/src/entities/merchant/ui/info-wrap.tsx +++ b/src/entities/merchant/ui/info-wrap.tsx @@ -11,6 +11,7 @@ import { } from '../model/types'; import { useStore } from '@/shared/model/store'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const InfoWrap = () => { const { t } = useTranslation(); @@ -35,7 +36,7 @@ export const InfoWrap = () => { setData(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/merchant/ui/registration-status-wrap.tsx b/src/entities/merchant/ui/registration-status-wrap.tsx index 3424fc7..fefa939 100644 --- a/src/entities/merchant/ui/registration-status-wrap.tsx +++ b/src/entities/merchant/ui/registration-status-wrap.tsx @@ -15,6 +15,7 @@ import { CardSection } from './section/card-section'; import { EscrowSection } from './section/escrow-section'; import { useStore } from '@/shared/model/store'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const RegistrationStatusWrap = () => { const { t } = useTranslation(); @@ -44,7 +45,7 @@ export const RegistrationStatusWrap = () => { setEscrow(rs.escrow); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/payment/ui/info-wrap.tsx b/src/entities/payment/ui/info-wrap.tsx index 3a51ffa..0e43e3c 100644 --- a/src/entities/payment/ui/info-wrap.tsx +++ b/src/entities/payment/ui/info-wrap.tsx @@ -34,6 +34,7 @@ import { usePaymentNonCardMutation } from '../api/use-payment-non-card-mutation' import { usePaymentInstallmentMutation } from '../api/use-payment-installment-mutation'; import { useStore } from '@/shared/model/store'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const InfoWrap = () => { const { t } = useTranslation(); @@ -158,7 +159,7 @@ export const InfoWrap = () => { setMoneyPointTabItems(rs.moneyPointTab.items); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -179,7 +180,7 @@ export const InfoWrap = () => { setFeeRate(rs.otherPaymentData.feeRate); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -195,7 +196,7 @@ export const InfoWrap = () => { setInstallmentData(rs.installmentData); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -220,7 +221,7 @@ export const InfoWrap = () => { } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/payment/ui/notification-data-wrap.tsx b/src/entities/payment/ui/notification-data-wrap.tsx index f02a7dc..e9a968c 100644 --- a/src/entities/payment/ui/notification-data-wrap.tsx +++ b/src/entities/payment/ui/notification-data-wrap.tsx @@ -5,6 +5,7 @@ import { usePaymentNotificationDataMutation } from '../api/use-payment-notificat import { useStore } from '@/shared/model/store'; import { NotifyRow } from './section/notify-row'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const NotificationDataWrap = () => { const { t } = useTranslation(); @@ -40,7 +41,7 @@ export const NotificationDataWrap = () => { setEscrowPayment(rs?.escrowPayment.detail); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/settlement/ui/calendar-wrap.tsx b/src/entities/settlement/ui/calendar-wrap.tsx index 3c041d5..eb568c3 100644 --- a/src/entities/settlement/ui/calendar-wrap.tsx +++ b/src/entities/settlement/ui/calendar-wrap.tsx @@ -14,6 +14,7 @@ import { } from '../model/types'; import { useStore } from '@/shared/model/store'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const CalendarWrap = () => { const { t, i18n } = useTranslation(); @@ -72,7 +73,7 @@ export const CalendarWrap = () => { } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }).finally(() => { diff --git a/src/entities/settlement/ui/detail/settlement-detail.tsx b/src/entities/settlement/ui/detail/settlement-detail.tsx index c344ef1..92d4bd7 100644 --- a/src/entities/settlement/ui/detail/settlement-detail.tsx +++ b/src/entities/settlement/ui/detail/settlement-detail.tsx @@ -74,7 +74,7 @@ export const SettlementDetail = ({ } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -94,7 +94,7 @@ export const SettlementDetail = ({ setMerchantName(rs.merchantName); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/settlement/ui/list-wrap.tsx b/src/entities/settlement/ui/list-wrap.tsx index 4bb12a3..0900cfb 100644 --- a/src/entities/settlement/ui/list-wrap.tsx +++ b/src/entities/settlement/ui/list-wrap.tsx @@ -38,6 +38,7 @@ import { useTranslation } from 'react-i18next'; import { SettlementDetail } from './detail/settlement-detail'; import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; +import { snackBar } from '@/shared/lib'; export interface ListWrapProps { startDateFromCalendar?: string; @@ -170,7 +171,7 @@ export const ListWrap = ({ ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -184,7 +185,7 @@ export const ListWrap = ({ setOffsetAmount(rs.offsetAmount || 0); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -243,7 +244,7 @@ export const ListWrap = ({ ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -258,7 +259,7 @@ export const ListWrap = ({ setPreSettlementCancelOffset(rs.preSettlementCancelOffset); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/support/ui/detail/notice-detail.tsx b/src/entities/support/ui/detail/notice-detail.tsx index e448dd6..0dbbc2b 100644 --- a/src/entities/support/ui/detail/notice-detail.tsx +++ b/src/entities/support/ui/detail/notice-detail.tsx @@ -8,6 +8,7 @@ import moment from 'moment'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface NoticeDetaillProps { detailOn: boolean; @@ -32,7 +33,7 @@ export const NoticeDetail = ({ setResult(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/support/ui/detail/qna-detail.tsx b/src/entities/support/ui/detail/qna-detail.tsx index 6667ca7..561c37a 100644 --- a/src/entities/support/ui/detail/qna-detail.tsx +++ b/src/entities/support/ui/detail/qna-detail.tsx @@ -7,6 +7,7 @@ import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@ import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { useQnaDetailMutation } from '../../api/use-qna-detail-mutation'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface qnaDetaillProps { detailOn: boolean; @@ -31,7 +32,7 @@ export const QnaDetail = ({ setResult(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/transaction/api/use-download-confirmation-mutation.ts b/src/entities/transaction/api/use-download-confirmation-mutation.ts deleted file mode 100644 index 88458dd..0000000 --- a/src/entities/transaction/api/use-download-confirmation-mutation.ts +++ /dev/null @@ -1,39 +0,0 @@ -import axios from 'axios'; -import { API_URL_TRANSACTION } from '@/shared/api/api-url-transaction'; -import { resultify } from '@/shared/lib/resultify'; -import { NiceAxiosError } from '@/shared/@types/error'; -import { - DownloadConfirmationParams, - DownloadConfirmationResponse -} from '../model/types'; -import { - useMutation, - UseMutationOptions -} from '@tanstack/react-query'; -import { getHeaderUserAgent } from '@/shared/constants/url'; - -export const downloadConfirmation = (params: DownloadConfirmationParams) => { - let headerOptions = { - menuId: 31, - apiType: 'DOWNLOAD' - }; - let options = { - headers: { - 'X-User-Agent': getHeaderUserAgent(headerOptions) - } - }; - return resultify( - axios.post(API_URL_TRANSACTION.transactionDownloadConfirmation(), params, options), - ); -}; - -export const useDownloadConfirmationMutation = (options?: UseMutationOptions) => { - const mutation = useMutation({ - ...options, - mutationFn: (params: DownloadConfirmationParams) => downloadConfirmation(params), - }); - - return { - ...mutation, - }; -}; diff --git a/src/entities/transaction/model/types.ts b/src/entities/transaction/model/types.ts index fd4bc6b..c8f979e 100644 --- a/src/entities/transaction/model/types.ts +++ b/src/entities/transaction/model/types.ts @@ -282,7 +282,7 @@ export interface CashReceiptSummaryResponse { totalCount: number; }; export interface CashReceiptReceiptDownloadParams { - approvalNumber: string; + tid: string; }; export interface CashReceiptReceiptDownloadResponse { issueInfo: IssueInfo; @@ -580,14 +580,6 @@ export interface InfoSectionProps extends DetailResponse { canDownloadReceipt?: boolean; } - -export interface DownloadConfirmationParams { - tid?: string; -}; -export interface DownloadConfirmationResponse { - -}; - export interface DownloadExcelParams { tid?: string }; diff --git a/src/entities/transaction/ui/detail/all-transaction-detail.tsx b/src/entities/transaction/ui/detail/all-transaction-detail.tsx index 287151f..7baf384 100644 --- a/src/entities/transaction/ui/detail/all-transaction-detail.tsx +++ b/src/entities/transaction/ui/detail/all-transaction-detail.tsx @@ -32,6 +32,7 @@ import { import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface AllTransactionDetailProps { detailOn: boolean; @@ -79,7 +80,7 @@ export const AllTransactionDetail = ({ setPartCancelInfo(rs.partCancelInfo); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/transaction/ui/detail/billing-detail.tsx b/src/entities/transaction/ui/detail/billing-detail.tsx index fcf93b5..8101bd7 100644 --- a/src/entities/transaction/ui/detail/billing-detail.tsx +++ b/src/entities/transaction/ui/detail/billing-detail.tsx @@ -14,6 +14,7 @@ import { NumericFormat } from 'react-number-format'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface BillingDetailProps { detailOn: boolean; @@ -45,7 +46,7 @@ export const BillingDetail = ({ }) }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/transaction/ui/detail/cash-receit-detail.tsx b/src/entities/transaction/ui/detail/cash-receit-detail.tsx index 59895cd..7eeed01 100644 --- a/src/entities/transaction/ui/detail/cash-receit-detail.tsx +++ b/src/entities/transaction/ui/detail/cash-receit-detail.tsx @@ -71,7 +71,7 @@ export const CashReceiptDetail = ({ }, 2000); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -94,7 +94,7 @@ export const CashReceiptDetail = ({ } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/transaction/ui/detail/escrow-detail.tsx b/src/entities/transaction/ui/detail/escrow-detail.tsx index af0fd98..b692b6f 100644 --- a/src/entities/transaction/ui/detail/escrow-detail.tsx +++ b/src/entities/transaction/ui/detail/escrow-detail.tsx @@ -29,6 +29,7 @@ import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@ import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface EscrowDetailProps { detailOn: boolean; @@ -87,7 +88,7 @@ export const EscrowDetail = ({ setOrderNumber(rs.importantInfo?.orderNumber); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -117,7 +118,7 @@ export const EscrowDetail = ({ console.log(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/entities/transaction/ui/section/amount-info-section.tsx b/src/entities/transaction/ui/section/amount-info-section.tsx index 75123e4..9b678f9 100644 --- a/src/entities/transaction/ui/section/amount-info-section.tsx +++ b/src/entities/transaction/ui/section/amount-info-section.tsx @@ -1,12 +1,12 @@ import moment from 'moment'; import { useTranslation } from 'react-i18next'; import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow'; -import { useDownloadConfirmationMutation } from '../../api/use-download-confirmation-mutation'; -import { InfoSectionKeys, InfoSectionProps, TransactionCategory } from '../../model/types'; +import { CashReceiptReceiptDownloadParams, CashReceiptReceiptDownloadResponse, InfoSectionKeys, InfoSectionProps, TransactionCategory } from '../../model/types'; import { SlideDown } from 'react-slidedown'; import 'react-slidedown/lib/slidedown.css'; import { showAlert } from '@/widgets/show-alert'; import { snackBar } from '@/shared/lib'; +import { useCashReceiptReceiptDownloadMutation } from '../../api/use-cash-receipt-receipt-download-mutation'; export const AmountInfoSection = ({ transactionCategory, @@ -18,7 +18,9 @@ export const AmountInfoSection = ({ canDownloadReceipt }: InfoSectionProps) => { const { t } = useTranslation(); - const { mutateAsync: downloadConfirmation } = useDownloadConfirmationMutation(); + + const { mutateAsync: cashReceiptReceiptDownload } = useCashReceiptReceiptDownloadMutation(); + let newAmountInfo: Record | undefined = amountInfo; const subItems: Record> = { mid: {name: t('transaction.fields.mid'), type: 'string'}, @@ -182,15 +184,17 @@ export const AmountInfoSection = ({ } }; - const onClickToDownloadConfirmation = () => { + const onClickToDownload = () => { if(!!tid){ - downloadConfirmation({ + let params: CashReceiptReceiptDownloadParams = { tid: tid - }).then((rs) => { + }; + cashReceiptReceiptDownload(params).then((rs: CashReceiptReceiptDownloadResponse) => { + console.log(rs); snackBar('거래확인서 다운 성공'); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -395,7 +399,7 @@ export const AmountInfoSection = ({ } diff --git a/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx b/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx index 747594c..550cc12 100644 --- a/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx +++ b/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx @@ -29,6 +29,7 @@ import { useVatReturnBreakdownMutation } from '@/entities/vat-return/api/use-vat import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export interface TaxInvoiceDetailProps { detailOn: boolean; @@ -72,7 +73,7 @@ export const TaxInvoiceDetail = ({ setDetail(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -87,7 +88,7 @@ export const TaxInvoiceDetail = ({ setBreakdown(rs.breakdown); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx b/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx index ad5ce43..8b7cd7e 100644 --- a/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx +++ b/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx @@ -28,6 +28,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { AccountHolderAuthDetail } from '@/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail'; import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; +import { snackBar } from '@/shared/lib'; export const AccountHolderAuthPage = () => { const { navigate } = useNavigate(); @@ -126,7 +127,7 @@ export const AccountHolderAuthPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -176,7 +177,7 @@ export const AccountHolderAuthPage = () => { console.log('Excel Download Status:', rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx index c8381d8..ce26d50 100644 --- a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx +++ b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx @@ -135,7 +135,7 @@ export const AccountHolderSearchPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/alimtalk/list-page.tsx b/src/pages/additional-service/alimtalk/list-page.tsx index f410077..b176e4e 100644 --- a/src/pages/additional-service/alimtalk/list-page.tsx +++ b/src/pages/additional-service/alimtalk/list-page.tsx @@ -142,7 +142,7 @@ export const AlimtalkListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -175,7 +175,7 @@ export const AlimtalkListPage = () => { console.log('Excel Download Status:', rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/alimtalk/setting-page.tsx b/src/pages/additional-service/alimtalk/setting-page.tsx index 79208e9..8ac4302 100644 --- a/src/pages/additional-service/alimtalk/setting-page.tsx +++ b/src/pages/additional-service/alimtalk/setting-page.tsx @@ -82,7 +82,7 @@ export const AlimtalkSettingPage = () => { } }).catch((e: any) => { if (e.response?.data.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return } }); diff --git a/src/pages/additional-service/ars/list-page.tsx b/src/pages/additional-service/ars/list-page.tsx index 3ebc312..be58780 100644 --- a/src/pages/additional-service/ars/list-page.tsx +++ b/src/pages/additional-service/ars/list-page.tsx @@ -28,6 +28,7 @@ import { ArsList } from '@/entities/additional-service/ui/ars/ars-list'; import { ArsDetail } from '@/entities/additional-service/ui/ars/detail/ars-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const ArsListPage = () => { const { navigate } = useNavigate(); @@ -136,7 +137,7 @@ export const ArsListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -167,7 +168,7 @@ export const ArsListPage = () => { console.log('Excel Download Status:', rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/face-auth/face-auth-page.tsx b/src/pages/additional-service/face-auth/face-auth-page.tsx index 1f10277..50e994a 100644 --- a/src/pages/additional-service/face-auth/face-auth-page.tsx +++ b/src/pages/additional-service/face-auth/face-auth-page.tsx @@ -27,6 +27,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { useTranslation } from 'react-i18next'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const FaceAuthPage = () => { const { navigate } = useNavigate(); @@ -126,7 +127,7 @@ export const FaceAuthPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -152,7 +153,7 @@ export const FaceAuthPage = () => { console.log('Excel Download Status:', rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx index 96f6f0f..9eae8d2 100644 --- a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx +++ b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx @@ -27,6 +27,7 @@ import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access import useIntersectionObserver from '@/widgets/intersection-observer'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const KeyInPaymentPage = () => { const { navigate } = useNavigate(); @@ -129,7 +130,7 @@ export const KeyInPaymentPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -162,7 +163,7 @@ export const KeyInPaymentPage = () => { console.log('Excel Download Status:', rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/list-page.tsx b/src/pages/additional-service/list-page.tsx index 1c7db2e..471932f 100644 --- a/src/pages/additional-service/list-page.tsx +++ b/src/pages/additional-service/list-page.tsx @@ -15,6 +15,7 @@ import { useStore } from '@/shared/model/store'; import { Dialog } from '@/shared/ui/dialogs/dialog'; import { FilterSelectMid } from '@/shared/ui/filter/select-mid'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const ListPage = () => { const { t } = useTranslation(); @@ -46,7 +47,7 @@ export const ListPage = () => { setAvailableServices(rs.availableExtensionList || []); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index 24c6c60..1018c1f 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -36,6 +36,7 @@ import { PayoutList } from '@/entities/additional-service/ui/payout/payout-list' import { PayoutDetail } from '@/entities/additional-service/ui/payout/detail/payout-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const PayoutListPage = () => { // Access check @@ -148,7 +149,7 @@ export const PayoutListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -174,7 +175,7 @@ export const PayoutListPage = () => { console.log('Excel Download Status:', rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/additional-service/sms-payment/sms-payment-page.tsx b/src/pages/additional-service/sms-payment/sms-payment-page.tsx index 53c06e6..5682b56 100644 --- a/src/pages/additional-service/sms-payment/sms-payment-page.tsx +++ b/src/pages/additional-service/sms-payment/sms-payment-page.tsx @@ -27,6 +27,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { set } from 'lodash-es'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const SmsPaymentPage = () => { const { t } = useTranslation(); @@ -127,7 +128,7 @@ export const SmsPaymentPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -140,7 +141,7 @@ export const SmsPaymentPage = () => { setSmsDetailData(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -168,7 +169,7 @@ export const SmsPaymentPage = () => { console.log('Excel Download Status:', rs.status); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/home/home-page.tsx b/src/pages/home/home-page.tsx index f4521be..12896db 100644 --- a/src/pages/home/home-page.tsx +++ b/src/pages/home/home-page.tsx @@ -25,6 +25,7 @@ import { HomeBannerListResponse } from '@/entities/home/model/types'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export let homeReloadKey = 1; export const setHomeReloadKey = () => { @@ -63,7 +64,7 @@ export const HomePage = () => { } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }).finally(() => { @@ -100,7 +101,7 @@ export const HomePage = () => { setAuthRegisterOn(true); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/setting/setting-page.tsx b/src/pages/setting/setting-page.tsx index a3f1ec3..871b4c4 100644 --- a/src/pages/setting/setting-page.tsx +++ b/src/pages/setting/setting-page.tsx @@ -17,6 +17,7 @@ import { useTranslation } from 'react-i18next'; import appBridge from '@/utils/appBridge'; import { Dialog } from '@/shared/ui/dialogs/dialog'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const SettingPage = () => { let userInfo = useStore.getState().UserStore.userInfo; @@ -74,7 +75,7 @@ export const SettingPage = () => { setPushNotificationEnabled(enabled); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -85,7 +86,7 @@ export const SettingPage = () => { setLoginType(type as LoginType); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -102,7 +103,7 @@ export const SettingPage = () => { } }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -205,7 +206,7 @@ export const SettingPage = () => { responseAlarmSetting(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -227,7 +228,7 @@ export const SettingPage = () => { }); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/support/faq/list-page.tsx b/src/pages/support/faq/list-page.tsx index b8037d4..7d0ccfd 100644 --- a/src/pages/support/faq/list-page.tsx +++ b/src/pages/support/faq/list-page.tsx @@ -17,6 +17,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { FaqDetail } from '@/entities/support/ui/detail/faq-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const FaqListPage = () => { const { navigate } = useNavigate(); @@ -99,7 +100,7 @@ export const FaqListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/support/notice/list-page.tsx b/src/pages/support/notice/list-page.tsx index 4de1e9a..c85d97e 100644 --- a/src/pages/support/notice/list-page.tsx +++ b/src/pages/support/notice/list-page.tsx @@ -17,6 +17,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { NoticeDetail } from '@/entities/support/ui/detail/notice-detail'; import { useParams } from 'react-router'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; export const NoticeListPage = () => { const { navigate } = useNavigate(); @@ -100,7 +101,7 @@ export const NoticeListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/support/qna/list-page.tsx b/src/pages/support/qna/list-page.tsx index bc15d38..46d7ab2 100644 --- a/src/pages/support/qna/list-page.tsx +++ b/src/pages/support/qna/list-page.tsx @@ -19,6 +19,7 @@ import { QnaDetail } from '@/entities/support/ui/detail/qna-detail'; import { useParams } from 'react-router'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; /* 1:1 문의 */ const menuId = 64; @@ -111,7 +112,7 @@ export const QnaListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/support/qna/register-page.tsx b/src/pages/support/qna/register-page.tsx index 378fc4f..a8b37fe 100644 --- a/src/pages/support/qna/register-page.tsx +++ b/src/pages/support/qna/register-page.tsx @@ -17,6 +17,7 @@ import { Dialog } from '@/shared/ui/dialogs/dialog'; import { QnaSaveParams, QnaSaveResponse } from '@/entities/support/model/types'; import { checkGrant } from '@/shared/lib/check-grant'; import { useKeyboardAware } from '@/shared/lib/hooks/use-keyboard-aware'; +import { snackBar } from '@/shared/lib'; export enum QnaRegisterPropsName { Mid = 'Mid', @@ -143,7 +144,7 @@ export const QnaRegisterPage = () => { navigate(PATHS.support.qna.list); }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/all-transaction/cancel-page.tsx b/src/pages/transaction/all-transaction/cancel-page.tsx index ad18c07..3b5c0ef 100644 --- a/src/pages/transaction/all-transaction/cancel-page.tsx +++ b/src/pages/transaction/all-transaction/cancel-page.tsx @@ -114,7 +114,7 @@ export const AllTransactionCancelPage = () => { }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -147,7 +147,7 @@ export const AllTransactionCancelPage = () => { }).catch((e: any) => { setRequestSuccess(false); if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index 8e6dd50..a92ffa4 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -169,7 +169,7 @@ export const AllTransactionListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -179,7 +179,7 @@ export const AllTransactionListPage = () => { setTotalCount(rs.totalCount); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -221,7 +221,7 @@ export const AllTransactionListPage = () => { console.log(rs); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/billing/charge-page.tsx b/src/pages/transaction/billing/charge-page.tsx index 82dfe60..17fa59a 100644 --- a/src/pages/transaction/billing/charge-page.tsx +++ b/src/pages/transaction/billing/charge-page.tsx @@ -88,7 +88,7 @@ export const BillingChargePage = () => { }).catch((e: any) => { if (e.response?.data?.error?.message) { - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/billing/list-page.tsx b/src/pages/transaction/billing/list-page.tsx index 4f184f1..04d39dd 100644 --- a/src/pages/transaction/billing/list-page.tsx +++ b/src/pages/transaction/billing/list-page.tsx @@ -34,6 +34,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { BillingDetail } from '@/entities/transaction/ui/detail/billing-detail'; import { showAlert } from '@/widgets/show-alert'; import { checkGrant } from '@/shared/lib/check-grant'; +import { snackBar } from '@/shared/lib'; /* 빌링 34 */ const menuId = 34; @@ -140,7 +141,7 @@ export const BillingListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx b/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx index 2133663..237e715 100644 --- a/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx +++ b/src/pages/transaction/cash-receipt/hand-written-issuance-page.tsx @@ -69,7 +69,7 @@ export const CashReceitHandWrittenIssuancePage = () => { }, 3000); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/cash-receipt/list-page.tsx b/src/pages/transaction/cash-receipt/list-page.tsx index 706bfc5..5cc5769 100644 --- a/src/pages/transaction/cash-receipt/list-page.tsx +++ b/src/pages/transaction/cash-receipt/list-page.tsx @@ -37,6 +37,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { CashReceiptDetail } from '@/entities/transaction/ui/detail/cash-receit-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; /* 현금영수증 32 */ const menuId = 32; @@ -151,7 +152,7 @@ export const CashReceiptListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); @@ -164,7 +165,7 @@ export const CashReceiptListPage = () => { setTotalCount(rs.totalCount); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/pages/transaction/escrow/list-page.tsx b/src/pages/transaction/escrow/list-page.tsx index 6823582..f893b63 100644 --- a/src/pages/transaction/escrow/list-page.tsx +++ b/src/pages/transaction/escrow/list-page.tsx @@ -33,6 +33,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { EscrowDetail } from '@/entities/transaction/ui/detail/escrow-detail'; import { checkGrant } from '@/shared/lib/check-grant'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; /* 에스크로 33 */ const menuId = 33; @@ -140,7 +141,7 @@ export const EscrowListPage = () => { ); }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } }); diff --git a/src/shared/api/api-url-transaction.ts b/src/shared/api/api-url-transaction.ts index cabdbf9..1465562 100644 --- a/src/shared/api/api-url-transaction.ts +++ b/src/shared/api/api-url-transaction.ts @@ -19,10 +19,6 @@ export const API_URL_TRANSACTION = { // POST: 거래 엑셀 다운로드 return `${API_BASE_URL}/api/v1/${API_URL_KEY}/transaction/download/excel`; }, - transactionDownloadConfirmation: () => { - // POST: 거래 확인서 다운로드 - return `${API_BASE_URL}/api/v1/${API_URL_KEY}/transaction/download/confirmation`; - }, transactionDetail: () => { // POST: 거래내역 상세 return `${API_BASE_URL}/api/v1/${API_URL_KEY}/transaction/detail`; diff --git a/src/shared/ui/menu/index.tsx b/src/shared/ui/menu/index.tsx index 89a9b30..f65f826 100644 --- a/src/shared/ui/menu/index.tsx +++ b/src/shared/ui/menu/index.tsx @@ -14,6 +14,7 @@ import { ShortcutSaveParams, ShortcutSaveResponse } from '@/entities/user/model/ import { useTranslation } from 'react-i18next'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { showAlert } from '@/widgets/show-alert'; +import { snackBar } from '@/shared/lib'; // 상수 정의 const SCROLL_ANIMATION_DURATION = 800; @@ -76,7 +77,7 @@ export const Menu = ({ }).catch((e: any) => { if(e.response?.data?.error?.message){ - showAlert(e.response?.data?.error?.message); + snackBar(e.response?.data?.error?.message); return; } });