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

src/entities/additional-service/model/alimtalk/types.ts

@@ -113,6 +113,7 @@ export interface ExtensionAlimtalkDownloadExcelParams {
   toDate?: string;
   sendType?: AlimtalkSendType;
   sendCl?: AlimTalkSendCl;
+  email?: string;
 };
 
 export interface ExtensionAlimtalkDownloadExcelResponse {

src/entities/additional-service/model/ars/types.ts

@@ -1,4 +1,4 @@
-import { 
+import {
   DefaulResponsePagination,
   DefaultRequestPagination
 } from '@/entities/common/model/types';
@@ -25,6 +25,16 @@ export interface ExtensionArsResendParams {
 };
 export interface ExtensionArsResendResponse {
   status: boolean;
+  error?: {
+    root?: string;
+    errKey?: string;
+    code?: string;
+    message?: string;
+    timestamp?: string;
+    details?: {
+      path?: string;
+    };
+  };
 };
 export interface ExtensionArsListParams {
   mid?: string;
@@ -54,6 +64,7 @@ export interface ExtensionArsListResponse extends DefaulResponsePagination {
 export interface ExtensionArsDownloadExcelParams {
   mid?: string;
   moid?: string;
+  email?: string;
   fromDate?: string;
   toDate?: string;
   paymentStatus?: PaymentStatus;
@@ -61,7 +72,7 @@ export interface ExtensionArsDownloadExcelParams {
   minAmount?: number;
   maxAmount?: number;
 };
-export interface ExtensionArsDownloadExcelResponse {};
+export interface ExtensionArsDownloadExcelResponse { };
 export interface ExtensionArsDetailParams {
   mid: string;
   tid: string;

src/entities/additional-service/model/key-in/types.ts

@@ -83,6 +83,7 @@ export interface ExtensionKeyinDownloadExcelParams extends ExtensionRequestParam
   fromDate?: string;
   toDate?: string;
   paymentStatus?: string;
+  email?: string
   minAmount?: number;
   maxAmount?: number;
 }

src/entities/additional-service/model/sms-payment/types.ts

@@ -132,7 +132,7 @@ export interface ExtensionSmsDownloadExcelParams extends ExtensionRequestParams
   fromDate: string;
   toDate: string;
   smsCl: string;
-
+  email: string;
 }
 
 export interface ExtensionSmsDownloadExcelResponse {

src/entities/settlement/ui/list-item.tsx

@@ -37,6 +37,18 @@ export const ListItem = ({
       }
     });
   };
+
+  const getDotClass = () => {
+    let rs = 'gray';
+    if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementAmount){
+      if(settlementAmount > 0) rs = 'blue';
+    }
+    else if(periodType === SettlementPeriodType.TRANSACTION_DATE && transactionAmount){
+      if(transactionAmount > 0) rs = 'blue';
+    }
+    
+    return rs;
+  };
   
   return (
     <>
@@ -45,7 +57,7 @@ export const ListItem = ({
         onClick={ () => onClickToNavigate() }
       >
         <div className="transaction-status">
-          <div className={ `status-dot blue`}></div>
+          <div className={ `status-dot ${getDotClass()}`}></div>
         </div>
         <div className="transaction-content">
           { (periodType === SettlementPeriodType.SETTLEMENT_DATE) &&

src/entities/transaction/ui/list-item.tsx

@@ -1,7 +1,7 @@
 import { NumericFormat } from 'react-number-format';
 import { PATHS } from '@/shared/constants/paths';
 import { useNavigate } from '@/shared/lib/hooks/use-navigate';
-import { ListItemProps, TransactionCategory } from '../model/types';
+import { BillingRequestStatus, CashReceiptTransactionType, EscrowDeliveryStatus, ListItemProps, TransactionCategory } from '../model/types';
 import moment from 'moment';
 import { useStore } from '@/shared/model/store';
 import { getAllTransactionStatusCode, getPaymentMethodName } from '../model/contant';
@@ -16,7 +16,7 @@ export const ListItem = ({
   paymentMethod, processResult, transactionType,
   transactionDateTime, transactionAmount,
   deliveryStatus, settlementStatus,
-  cancelStatus, billKey, orderNumber
+  cancelStatus, billKey, orderNumber, requestStatus
 }: ListItemProps) => {
   const { navigate } = useNavigate();
   const { t } = useTranslation();
@@ -34,17 +34,55 @@ export const ListItem = ({
     return rs;
   };
 
-  const getDotClass = (str?: string) => {
+  const getDotClass = () => {
     let rs = '';
-    if(statusCode === '0'){
-      rs = '';
+    if(transactionCategory === TransactionCategory.AllTransaction){
+      if(statusCode === '0'
+        || statusCode === '4'
+      ){
+        rs = 'blue';
+      }
+      else if(statusCode === '1'
+        || statusCode === '2'
+        || statusCode === '3'
+      ){
+        rs = 'gray';
+      }
     }
-    else if(statusCode === '1'){
-      rs = 'blue';
+    else if(transactionCategory === TransactionCategory.CashReceipt){
+      if(transactionType === CashReceiptTransactionType.APPROVAL){
+        rs = 'blue';
+      }
+      else if(transactionType === CashReceiptTransactionType.CANCEL){
+        rs = 'gray';
+      }
     }
-    else if(statusCode === '2'){
-      rs = 'gray';
+    else if(transactionCategory === TransactionCategory.Escrow){
+      if(deliveryStatus === EscrowDeliveryStatus.DELIVERY_INSERT
+        || deliveryStatus === EscrowDeliveryStatus.DELIVERY_COMPLETE
+        || deliveryStatus === EscrowDeliveryStatus.PURCHASE_CONFIRM
+      ){
+        rs = 'blue';
+      }
+      else if(deliveryStatus === EscrowDeliveryStatus.PAY_COMPLETE
+        || deliveryStatus === EscrowDeliveryStatus.PURCHASE_REJECT
+        || deliveryStatus === EscrowDeliveryStatus.RETURN_PROCESSING
+        || EscrowDeliveryStatus.DEPOSIT_COMPLETE
+      ){
+        rs = 'gray';  
+      }
     }
+    else if(transactionCategory === TransactionCategory.Billing){
+      if(requestStatus === BillingRequestStatus.SUCCESS){
+        rs = 'blue';
+      }
+      else if(requestStatus === BillingRequestStatus.IN_PROGRESS
+        || requestStatus === BillingRequestStatus.REQUEST_CANCEL
+      ){
+        rs = 'gray';
+      }
+    }
+    
     return rs;
   };