From a684f4cb6fe6acb7c80cad1eac7aca39e68052d8 Mon Sep 17 00:00:00 2001
From: Jason Chuang <jchuang@2fi-solutions.com.hk>
Date: Sat, 27 Jun 2026 12:41:16 +0800
Subject: [PATCH] payment description in receipt

---
 src/index.js                                    |  5 ++++-
 src/pages/Payment/Details_GLD/PaymentDetails.js |  2 +-
 src/pages/Payment/Details_Public/index.js       |  5 ++---
 src/pages/Payment/FPS/AckPage.js                |  5 ++---
 src/pages/Payment/FPS/fpscallback.js            |  4 ++--
 src/pages/Payment/PaymentCallback.js            |  6 ++----
 src/utils/Utils.js                              | 10 ++++++++++
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/index.js b/src/index.js
index 44843b0..67e5d9f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -58,7 +58,10 @@ root.render(
     <ReduxProvider store={store}>
       <SysSettingProvider>
         <I18nProvider>
-          <BrowserRouter basename="/">
+          <BrowserRouter
+            basename="/"
+            future={{ v7_startTransition: true, v7_relativeSplatPath: true }}
+          >
             <RefreshTokenProvider>
               <AutoLogoutProvider>
                 <GreyWrapper>
diff --git a/src/pages/Payment/Details_GLD/PaymentDetails.js b/src/pages/Payment/Details_GLD/PaymentDetails.js
index 0e9f69e..2c7cd0e 100644
--- a/src/pages/Payment/Details_GLD/PaymentDetails.js
+++ b/src/pages/Payment/Details_GLD/PaymentDetails.js
@@ -164,7 +164,7 @@ const PaymentDetails = ({ formData,doPrint,onDownload }) => {
                                                 Payment Receipt:
                                             </FormLabel>
                                         </Grid>
-                                        <Grid xs={6} md={5} sx={{ml:5,textAlign: "left" }}>
+                                        <Grid item xs={6} md={5} sx={{ml:5,textAlign: "left" }}>
                                             <Button className="printHidden" variant="contained" disabled={onDownload} sx={{ mt:2 }} onClick={doPrint}>
                                                 <DownloadIcon/>
                                                 <Typography sx={{fontSize: "16px"}}>Download</Typography>
diff --git a/src/pages/Payment/Details_Public/index.js b/src/pages/Payment/Details_Public/index.js
index 3a1dc70..991208a 100644
--- a/src/pages/Payment/Details_Public/index.js
+++ b/src/pages/Payment/Details_Public/index.js
@@ -21,6 +21,7 @@ import ForwardIcon from '@mui/icons-material/Forward';
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 import {FormattedMessage,useIntl} from "react-intl";
 import usePageTitle from "components/usePageTitle";
+import { toReceiptLanguage } from "utils/Utils";
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
@@ -76,10 +77,8 @@ const Index = () => {
     const doPrint = () => {
         // window.print();
         setOnDownload(true)
-        const local = locale
-        // console.log(local)
         HttpUtils.fileDownload({
-            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+params.id+"/"+local,
+            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+params.id+"/"+toReceiptLanguage(locale),
             onResponse:()=>{
                 setOnDownload(false)
             },
diff --git a/src/pages/Payment/FPS/AckPage.js b/src/pages/Payment/FPS/AckPage.js
index 6ae91ba..8086dcb 100644
--- a/src/pages/Payment/FPS/AckPage.js
+++ b/src/pages/Payment/FPS/AckPage.js
@@ -24,6 +24,7 @@ const DataGrid = Loadable(React.lazy(() => import('../Details_Public/DataGrid'))
 
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 import {FormattedMessage,useIntl} from "react-intl";
+import { toReceiptLanguage } from "utils/Utils";
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
@@ -162,10 +163,8 @@ const AckPage = () => {
     const doPrint = () => {
         // window.print();
         setOnDownload(true)
-        const local = locale
         HttpUtils.fileDownload({
-            // url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+localStorage.getItem("paymentId")+"/"+local,
-            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+paymentData.id+"/"+local,
+            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+paymentData.id+"/"+toReceiptLanguage(locale),
             onResponse:()=>{
                 setOnDownload(false)
             },
diff --git a/src/pages/Payment/FPS/fpscallback.js b/src/pages/Payment/FPS/fpscallback.js
index 1cd98b3..09b686a 100644
--- a/src/pages/Payment/FPS/fpscallback.js
+++ b/src/pages/Payment/FPS/fpscallback.js
@@ -24,6 +24,7 @@ const DataGrid = Loadable(React.lazy(() => import('../Details_Public/DataGrid'))
 
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 import {FormattedMessage,useIntl} from "react-intl";
+import { toReceiptLanguage } from "utils/Utils";
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
@@ -152,9 +153,8 @@ const Fpscallback = () => {
         const params = new URLSearchParams(window.location.search);
         // window.print();
         setOnDownload(true)
-        const local = locale
         HttpUtils.fileDownload({
-            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+params.get("PAYMENT_ID")+"/"+local,
+            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+params.get("PAYMENT_ID")+"/"+toReceiptLanguage(locale),
             onResponse:()=>{
                 setOnDownload(false)
             },
diff --git a/src/pages/Payment/PaymentCallback.js b/src/pages/Payment/PaymentCallback.js
index 87cef2b..fa45d8c 100644
--- a/src/pages/Payment/PaymentCallback.js
+++ b/src/pages/Payment/PaymentCallback.js
@@ -21,6 +21,7 @@ const DataGrid = Loadable(React.lazy(() => import('./Details_Public/DataGrid')))
 
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
 import {FormattedMessage,useIntl} from "react-intl";
+import { toReceiptLanguage } from "utils/Utils";
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
@@ -159,11 +160,8 @@ const Index = () => {
     const doPrint = () => {
         // window.print();
         setOnDownload(true)
-        const local = locale
-        console.log(local)
         HttpUtils.fileDownload({
-            // url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+localStorage.getItem("paymentId")+"/"+local,
-            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+paymentData.id+"/"+local,
+            url: UrlUtils.GEN_PAYMENT_RECEIPT+"/"+paymentData.id+"/"+toReceiptLanguage(locale),
             onResponse:()=>{
                 setOnDownload(false)
             },
diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index 467c148..1553cdd 100644
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -165,6 +165,16 @@ export const gazetteLength = (length,noOfPages) => {
     return countLength+" cm"
 }
 
+export const toReceiptLanguage = (locale) => {
+    if (locale === 'zh-CN' || locale === 'zh_CN') {
+        return 'zh_CN';
+    }
+    if (locale === 'zh-HK' || locale === 'zh_HK') {
+        return 'zh_HK';
+    }
+    return 'en';
+}
+
 export const formatPaymentParticularsLength = (row, intl) => {
     if (row.groupTitle === 'Private Bill') {
         const pages = row.noOfPages ?? 1;