Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

src/entities/additional-service/model/fund-account/types.ts

@@ -207,6 +207,7 @@ export interface ExtensionFundAccountResultDetailResponse {
   resultMessage: string;
   failReason: string;
   bankName: string;
+  depositRemark?: string;
 };
 export interface ExtensionFundAccountBalanceParams {
   mid: string;

src/entities/additional-service/ui/fund-account/detail/result-detail.tsx

@@ -16,6 +16,7 @@ import { FullMenuClose } from '@/entities/common/ui/full-menu-close';
 import { showAlert } from '@/widgets/show-alert';
 import { snackBar } from '@/shared/lib';
 import { DepositReceiptSample } from '@/entities/common/ui/deposit-receipt-sample';
+import { DepositInfo } from '@/entities/transaction/model/types';
 
 export interface FundAccountResultDetailProps {
   detailOn: boolean;
@@ -35,7 +36,6 @@ export const FundAccountResultDetail = ({
 
   const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState<boolean>(false);
   const [depositReceiptSampleOn, setDepositReceiptSampleOn] = useState<boolean>(false);
-
   const { mutateAsync: extensionFundAccountResultDetail } = useExtensionFundAccountResultDetailMutation();
   const { mutateAsync: extensionFundAccountDownlaodReceipt } = useExtensionFundAccountDownloadReceiptMutation();
 
@@ -70,7 +70,6 @@ export const FundAccountResultDetail = ({
       let params: ExtensionFundAccountDownloadReceiptParams = {
         mid: mid,
         tid: tid,
-        //requestType: selectedMode,
         email: userEmail
       };
       extensionFundAccountDownlaodReceipt(params).then((rs: ExtensionFundAccountDownloadReceiptResponse) => {
@@ -86,7 +85,6 @@ export const FundAccountResultDetail = ({
       const params: ExtensionFundAccountDownloadReceiptParams = {
         mid: mid,
         tid: tid,
-        //requestType: selectedMode,
         email: ''
       };
       extensionFundAccountDownlaodReceipt(params).then((rs: ExtensionFundAccountDownloadReceiptResponse) => {
@@ -216,6 +214,14 @@ export const FundAccountResultDetail = ({
         <DepositReceiptSample
           depositReceiptSampleOn={depositReceiptSampleOn}
           setDepositReceiptSampleOn={setDepositReceiptSampleOn}
+          depositInfo={{
+            depositDate: detail?.applicationDate ? moment(detail?.applicationDate, 'YYYYMMDDHHmmss').format('YYYY/MM/DD HH:mm:ss') : undefined,
+            depositBank: detail?.bankName,
+            depositAccount: detail?.accountNo,
+            amount: detail?.amount,
+            depositReason: detail?.depositRemark,
+            depositId: detail?.mid
+          }}
         ></DepositReceiptSample>
       }
     </>

src/entities/common/ui/deposit-receipt-sample.tsx

@@ -55,8 +55,9 @@ export const DepositReceiptSample = ({
                 transition={FilterMotionDuration}
             >
                 <div className="wrap">
-                    <div id="image-section">
+                    <div id="image-section" style={{ paddingLeft: '20px', paddingRight: '20px', backgroundColor: '#E4E4E4', paddingTop: '20px', paddingBottom: '20px' }}>
-                        <div className="section">
+                        <div style={{ fontSize: '20px', fontWeight: 'bold', marginBottom: '16px', color: '#2D3436' }}>입금확인증</div>
+                        <div className="section" style={{paddingLeft: '20px', paddingRight: '20px'}}>
                             <div className="head">
                                 <div className="icon">
                                     <svg
@@ -94,6 +95,7 @@ export const DepositReceiptSample = ({
                                         value={depositInfo?.amount}
                                         thousandSeparator
                                         displayType='text'
+                                        suffix='원'
                                     >
                                     </NumericFormat>
                                 </div>

src/entities/transaction/model/types.ts

@@ -604,7 +604,7 @@ export interface DepositInfo {
   depositDate?: string;
   depositBank?: string;
   depositAccount?: string;
-  amount?: number;
+  amount?: number | string;
   depositReason?: string;
   depositId?: string;
 }

src/pages/setting/setting-page.tsx

@@ -56,7 +56,7 @@ export const SettingPage = () => {
     '41': false,
     '61': false,
     '62': false,
-    '15': false
+    '13': false
   });
 
   const [dialogOpen, setDialogOpen] = useState<boolean>(false);
@@ -329,8 +329,8 @@ export const SettingPage = () => {
               <label className="settings-switch">
                 <input
                   type="checkbox"
-                  checked={ alarmSetting['15'] }
+                  checked={ alarmSetting['13'] }
-                  onChange={ (e: ChangeEvent<HTMLInputElement>) => callAppAlarmConsent(e.target.checked, '15') }
+                  onChange={ (e: ChangeEvent<HTMLInputElement>) => callAppAlarmConsent(e.target.checked, '13') }
                 />
                 <span className="slider"></span>
               </label>