From f1cf351ca4fd2bbfd13e8cca54a15bf55e7ee8b3 Mon Sep 17 00:00:00 2001 From: efrilm Date: Sat, 27 Sep 2025 18:36:47 +0700 Subject: [PATCH] Format Currency --- .../(private)/dashboards/overview/page.tsx | 11 ++++++++--- .../(private)/dashboards/profit-loss/page.tsx | 10 +++++----- src/views/dashboards/crm/DistributedBarChartOrder.tsx | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/app/[lang]/(dashboard)/(private)/dashboards/overview/page.tsx b/src/app/[lang]/(dashboard)/(private)/dashboards/overview/page.tsx index 65cd034..f7b71ce 100644 --- a/src/app/[lang]/(dashboard)/(private)/dashboards/overview/page.tsx +++ b/src/app/[lang]/(dashboard)/(private)/dashboards/overview/page.tsx @@ -4,7 +4,12 @@ import { TextField, Typography, useTheme } from '@mui/material' import { useState } from 'react' import Loading from '../../../../../../components/layout/shared/Loading' import { useDashboardAnalytics } from '../../../../../../services/queries/analytics' -import { formatDateDDMMYYYY, formatForInputDate, formatShortCurrency } from '../../../../../../utils/transform' +import { + formatCurrency, + formatDateDDMMYYYY, + formatForInputDate, + formatShortCurrency +} from '../../../../../../utils/transform' import OrdersReport from '../../../../../../views/dashboards/orders/OrdersReport' import PaymentMethodReport from '../../../../../../views/dashboards/payment-methods/PaymentMethodReport' import ProductSales from '../../../../../../views/dashboards/products/ProductSales' @@ -115,14 +120,14 @@ const DashboardOverview = () => { diff --git a/src/app/[lang]/(dashboard)/(private)/dashboards/profit-loss/page.tsx b/src/app/[lang]/(dashboard)/(private)/dashboards/profit-loss/page.tsx index b4b1ff4..8d336c9 100644 --- a/src/app/[lang]/(dashboard)/(private)/dashboards/profit-loss/page.tsx +++ b/src/app/[lang]/(dashboard)/(private)/dashboards/profit-loss/page.tsx @@ -162,21 +162,21 @@ const DashboardProfitloss = () => { { iconClass='tabler-percentage' title='Profitability Ratio' value={formatPercentage(profitData.summary.profitability_ratio)} - subtitle={`Avg Profit: ${formatShortCurrency(profitData.summary.average_profit)}`} + subtitle={`Avg Profit: ${formatCurrency(profitData.summary.average_profit)}`} bgColor='bg-purple-500' /> @@ -199,7 +199,7 @@ const DashboardProfitloss = () => {

Net Profit

- Rp {formatShortCurrency(profitData.summary.net_profit)} + {formatCurrency(profitData.summary.net_profit)}

Margin: {formatPercentage(profitData.summary.net_profit_margin)} diff --git a/src/views/dashboards/crm/DistributedBarChartOrder.tsx b/src/views/dashboards/crm/DistributedBarChartOrder.tsx index e432890..d3f7953 100644 --- a/src/views/dashboards/crm/DistributedBarChartOrder.tsx +++ b/src/views/dashboards/crm/DistributedBarChartOrder.tsx @@ -11,7 +11,7 @@ import classnames from 'classnames' import CustomAvatar, { CustomAvatarProps } from '../../../@core/components/mui/Avatar' import { ThemeColor } from '../../../@core/types' import { Skeleton, Typography } from '@mui/material' -import { formatShortCurrency } from '../../../utils/transform' +import { formatCurrency, formatShortCurrency } from '../../../utils/transform' type Props = { title: string @@ -46,7 +46,7 @@ const DistributedBarChartOrder = ({ {title} - {isCurrency ? 'Rp ' + formatShortCurrency(value) : formatShortCurrency(value)} + {isCurrency ? formatCurrency(value) : formatShortCurrency(value)}