Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web
This commit is contained in:
@@ -243,7 +243,7 @@ export const ArsRequestPage = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="billing-row">
|
<div className="billing-row" style={{ paddingBottom: '60px' }}>
|
||||||
<div className="billing-label">{t('additionalService.ars.paymentMethod')} <span>*</span></div>
|
<div className="billing-label">{t('additionalService.ars.paymentMethod')} <span>*</span></div>
|
||||||
<div className="billing-field">
|
<div className="billing-field">
|
||||||
{getArsPaymentMethodBtns()}
|
{getArsPaymentMethodBtns()}
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ export const FaceAuthPage = () => {
|
|||||||
const onSendRequest = (selectedEmail?: string) => {
|
const onSendRequest = (selectedEmail?: string) => {
|
||||||
if(selectedEmail){
|
if(selectedEmail){
|
||||||
const params: ExtensionFaceAuthExcelDownlaodPrams = {
|
const params: ExtensionFaceAuthExcelDownlaodPrams = {
|
||||||
mid: "faceauth0m",
|
mid: mid,
|
||||||
email: selectedEmail,
|
email: selectedEmail,
|
||||||
fromDate: fromDate,
|
fromDate: fromDate,
|
||||||
toDate: toDate
|
toDate: toDate
|
||||||
|
|||||||
@@ -280,11 +280,12 @@ export const AllTransactionListPage = () => {
|
|||||||
<div className="detail-item">
|
<div className="detail-item">
|
||||||
<span className="detail-label">{t('transaction.transactionCount')}</span>
|
<span className="detail-label">{t('transaction.transactionCount')}</span>
|
||||||
<span className="detail-value">
|
<span className="detail-value">
|
||||||
|
{ t('transaction.total') + ' '}
|
||||||
<NumericFormat
|
<NumericFormat
|
||||||
value={ totalCount }
|
value={ totalCount }
|
||||||
|
allowNegative={ true }
|
||||||
thousandSeparator
|
thousandSeparator
|
||||||
displayType="text"
|
displayType="text"
|
||||||
prefix={t('transaction.total') + ' '}
|
|
||||||
suffix={' ' + t('home.count')}
|
suffix={' ' + t('home.count')}
|
||||||
></NumericFormat>
|
></NumericFormat>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -221,11 +221,11 @@ export const CashReceiptListPage = () => {
|
|||||||
{t('home.money', { value: new Intl.NumberFormat('en-US').format(approvalAmount || 0) })}
|
{t('home.money', { value: new Intl.NumberFormat('en-US').format(approvalAmount || 0) })}
|
||||||
</strong>
|
</strong>
|
||||||
<span className="count">
|
<span className="count">
|
||||||
|
(
|
||||||
<NumericFormat
|
<NumericFormat
|
||||||
value={ approvalCount }
|
value={ approvalCount }
|
||||||
thousandSeparator
|
thousandSeparator
|
||||||
displayType="text"
|
displayType="text"
|
||||||
prefix='('
|
|
||||||
suffix='건)'
|
suffix='건)'
|
||||||
></NumericFormat>
|
></NumericFormat>
|
||||||
</span>
|
</span>
|
||||||
@@ -236,11 +236,12 @@ export const CashReceiptListPage = () => {
|
|||||||
{t('home.money', { value: new Intl.NumberFormat('en-US').format(cancelAmount || 0) })}
|
{t('home.money', { value: new Intl.NumberFormat('en-US').format(cancelAmount || 0) })}
|
||||||
</strong>
|
</strong>
|
||||||
<span className="count">
|
<span className="count">
|
||||||
|
(
|
||||||
<NumericFormat
|
<NumericFormat
|
||||||
value={ cancelCount }
|
value={ cancelCount }
|
||||||
|
allowNegative={ true }
|
||||||
thousandSeparator
|
thousandSeparator
|
||||||
displayType="text"
|
displayType="text"
|
||||||
prefix='('
|
|
||||||
suffix='건)'
|
suffix='건)'
|
||||||
></NumericFormat>
|
></NumericFormat>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import 'react-calendar/dist/Calendar.css';
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
import { CalendarType } from '@/entities/common/model/types';
|
import { CalendarType } from '@/entities/common/model/types';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { IMAGE_ROOT } from '@/shared/constants/common';
|
|
||||||
import { FullMenuClose } from '@/entities/common/ui/full-menu-close';
|
import { FullMenuClose } from '@/entities/common/ui/full-menu-close';
|
||||||
|
|
||||||
interface NiceCalendarProps {
|
interface NiceCalendarProps {
|
||||||
@@ -94,7 +93,7 @@ const NiceCalendar = ({
|
|||||||
// For Korean locale, return only the day number without '일'
|
// For Korean locale, return only the day number without '일'
|
||||||
|
|
||||||
return date.toLocaleString('en', {
|
return date.toLocaleString('en', {
|
||||||
day: '2-digit',
|
day: 'numeric',
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user