From f547ec2c39259b891c5fc51f8a01973b4d2c29a2 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Mon, 10 Nov 2025 17:17:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ui/cash-receipt-sample.tsx | 26 ++++++++++++------- src/entities/common/ui/tax-invoice-sample.tsx | 19 +++++++++----- .../ui/section/amount-info-section.tsx | 5 ++++ .../ui/assets/css/style-tax-invoice.css | 5 ++-- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/entities/common/ui/cash-receipt-sample.tsx b/src/entities/common/ui/cash-receipt-sample.tsx index 98abf68..74280b7 100644 --- a/src/entities/common/ui/cash-receipt-sample.tsx +++ b/src/entities/common/ui/cash-receipt-sample.tsx @@ -58,12 +58,19 @@ export const CashReceiptSample = ({ if(!!issueInfo?.issueDate && !!issueInfo?.issueTime){ time = moment(issueInfo?.issueDate+' '+issueInfo?.issueTime).format('HH:mm:ss'); } - return date + ' | ' + time; + if(!!date && !!time){ + return date + ' | ' + time; + } + else{ + return ''; + } }; useEffect(() => { if(!!cashReceiptSampleOn){ - downloadImage(); + setTimeout(() => { + downloadImage(); + }, 500); } }, [cashReceiptSampleOn]); @@ -77,8 +84,8 @@ export const CashReceiptSample = ({ variants={ FilterMotionVariants } transition={ FilterMotionDuration } > -
-
+
+
@@ -140,7 +147,6 @@ export const CashReceiptSample = ({
결제정보
-
총 결제금액
@@ -222,11 +228,11 @@ export const CashReceiptSample = ({
{ issueInfo?.purpose }
-
-
- * 본 영수증은 조세특례제한법 제 126조의 3및 동법 시행령 제 121조의 3규정에 의거, 연말정산시 소득공제 혜택 부여의 목적으로 발행됩니다.
- * 현금 거래 완료 건에 대한 국세청의 검증 소요기간은 2일이며 결제하신 다음날 검증이 완료된 현금영수증을 발급받을 수 있습니다.
- * 현금영수증 문의 126-1-1 +
+ * 본 영수증은 조세특례제한법 제 126조의 3및 동법 시행령 제 121조의 3규정에 의거, 연말정산시 소득공제 혜택 부여의 목적으로 발행됩니다.
+ * 현금 거래 완료 건에 대한 국세청의 검증 소요기간은 2일이며 결제하신 다음날 검증이 완료된 현금영수증을 발급받을 수 있습니다.
+ * 현금영수증 문의 126-1-1 +
diff --git a/src/entities/common/ui/tax-invoice-sample.tsx b/src/entities/common/ui/tax-invoice-sample.tsx index 98284e6..5284753 100644 --- a/src/entities/common/ui/tax-invoice-sample.tsx +++ b/src/entities/common/ui/tax-invoice-sample.tsx @@ -58,11 +58,18 @@ export const TaxInvoiceSample = ({ if(!!issueInfo?.issueDate && !!issueInfo?.issueTime){ time = moment(issueInfo?.issueDate+' '+issueInfo?.issueTime).format('HH:mm:ss'); } - return date + ' | ' + time; + + if(!!date && !!time){ + return date + ' | ' + time; + } + else{ + return ''; + } }; useEffect(() => { if(!!taxInvoiceSampleOn){ + setTimeout downloadImage(); } }, [taxInvoiceSampleOn]); @@ -73,12 +80,12 @@ export const TaxInvoiceSample = ({ -
-
+
+
@@ -222,11 +229,11 @@ export const TaxInvoiceSample = ({
{ issueInfo?.purpose }
-
-
+
* 본 영수증은 조세특례제한법 제 126조의 3및 동법 시행령 제 121조의 3규정에 의거, 연말정산시 소득공제 혜택 부여의 목적으로 발행됩니다.
* 현금 거래 완료 건에 대한 국세청의 검증 소요기간은 2일이며 결제하신 다음날 검증이 완료된 현금영수증을 발급받을 수 있습니다.
* 현금영수증 문의 126-1-1 +
diff --git a/src/entities/transaction/ui/section/amount-info-section.tsx b/src/entities/transaction/ui/section/amount-info-section.tsx index 536056f..2574342 100644 --- a/src/entities/transaction/ui/section/amount-info-section.tsx +++ b/src/entities/transaction/ui/section/amount-info-section.tsx @@ -208,6 +208,11 @@ export const AmountInfoSection = ({ tid: tid }; cashReceiptReceiptDownload(params).then((rs: CashReceiptReceiptDownloadResponse) => { + /* + if(rs?.merchantInfo){ + rs.merchantInfo.merchantName = '나이스페이먼츠'; + } + */ setReceiptIssueInfo(rs?.issueInfo); setReceiptMerchantInfo(rs?.merchantInfo); setReceiptTransactionInfo(rs?.transactionInfo); diff --git a/src/shared/ui/assets/css/style-tax-invoice.css b/src/shared/ui/assets/css/style-tax-invoice.css index 8932f34..cd03241 100644 --- a/src/shared/ui/assets/css/style-tax-invoice.css +++ b/src/shared/ui/assets/css/style-tax-invoice.css @@ -1,4 +1,4 @@ -body { margin: 0; padding: 0; background: #FAFAFA; } +/* body { margin: 0; padding: 0; background: #FAFAFA; }*/ .mail-page { min-height: 100vh; display: flex; align-items: flex-start; justify-content: center; padding: 0 0 30px 0; } .mail-page .wrap { width: 100%; min-width: 320px; background: #FFFFFF; padding: 0 20px; box-sizing: border-box; } /* header */ @@ -39,9 +39,10 @@ body { margin: 0; padding: 0; background: #FAFAFA; } .mail-page .notice { padding: 16px; background: #F3F3F3; border-radius: 6px; margin: 30px 0 0 0; font-family: Pretendard, Arial, Helvetica, sans-serif; font-size: 14px; line-height: 1.5; color: #2D3436; } .mail-page #image-section{ - padding: 0 20px 20px 20px; + padding: 0 0 20px 0; background-color: #ffffff; } .mail-page #image-section .section{ background-color: #ffffff; } +