diff --git a/src/pages/DemandNote/Details/DnDetailCard.js b/src/pages/DemandNote/Details/DnDetailCard.js
index ea4629d..d430eb0 100644
--- a/src/pages/DemandNote/Details/DnDetailCard.js
+++ b/src/pages/DemandNote/Details/DnDetailCard.js
@@ -148,8 +148,6 @@ const DnDetailCard = ({ data }) => {
{getDisplayField("Reminder Final", dnData?.reminderFinal ? DateUtils.datetimeStr(dnData.reminderFinal) : "--")}
-
-
diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js
index 241bb76..0691106 100644
--- a/src/pages/Organization/DetailPage/OrganizationCard.js
+++ b/src/pages/Organization/DetailPage/OrganizationCard.js
@@ -112,7 +112,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
},
addressTemp: {
country: values.country.id,
- district: values.district?.id,
+ district: values.district?.type,
addressLine1: values.addressLine1,
addressLine2: values.addressLine2,
addressLine3: values.addressLine3,
diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js
index 231c082..fda1f00 100644
--- a/src/pages/Organization/DetailPage/index.js
+++ b/src/pages/Organization/DetailPage/index.js
@@ -14,7 +14,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
import ForwardIcon from '@mui/icons-material/Forward';
import { useNavigate, useParams } from 'react-router-dom';
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
-import {getObjectByValue} from "utils/CommonFunction";
+import {getObjectByType, getObjectByValue} from "utils/CommonFunction";
import * as ComboData from "utils/ComboData";
import {
isGLDLoggedIn,
@@ -73,7 +73,7 @@ const OrganizationDetailPage = () => {
onSuccess: function (response) {
// console.log(response)
response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.addressTemp?.country);
- response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.addressTemp?.district);
+ response.data["district"] = getObjectByType(ComboData.district, "type", response.data.addressTemp?.district);
response.data["addressLine1"] = response.data.addressTemp?.addressLine1;
response.data["addressLine2"] = response.data.addressTemp?.addressLine2;
response.data["addressLine3"] = response.data.addressTemp?.addressLine3;
@@ -98,7 +98,7 @@ const OrganizationDetailPage = () => {
// console.log(response)
response.data["creditor"] = response.data.creditor!=null?response.data.creditor?isCreditor:notCreditor:notCreditor;
response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.addressTemp?.country);
- response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.addressTemp?.district);
+ response.data["district"] = getObjectByType(ComboData.district, "type", response.data.addressTemp?.district);
response.data["addressLine1"] = response.data.addressTemp?.addressLine1;
response.data["addressLine2"] = response.data.addressTemp?.addressLine2;
response.data["addressLine3"] = response.data.addressTemp?.addressLine3;
diff --git a/src/pages/Recon/index.js b/src/pages/Recon/index.js
index 76ba00d..fcf0fc6 100644
--- a/src/pages/Recon/index.js
+++ b/src/pages/Recon/index.js
@@ -69,6 +69,7 @@ const Index = () => {
},
onError:()=>{
setOnView(false)
+
}
});
}
diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
index 08a719c..8e7acf3 100644
--- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
+++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual.js
@@ -90,7 +90,7 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => {
emailAddress: values.emailAddress,
address: {
country: values.country.key,
- district: values.district?.key,
+ district: values.district?.type,
addressLine1: values.addressLine1,
addressLine2: values.addressLine2,
addressLine3: values.addressLine3,
diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
index 825a87f..5b1d456 100644
--- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
+++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
@@ -88,7 +88,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
},
address: {
country: values.country.key,
- district: values.district?.key,
+ district: values.district?.type,
addressLine1: values.addressLine1,
addressLine2: values.addressLine2,
addressLine3: values.addressLine3,
diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js
index f7cdb6c..81c9f0e 100644
--- a/src/pages/User/DetailsPage_Individual/index.js
+++ b/src/pages/User/DetailsPage_Individual/index.js
@@ -76,7 +76,7 @@ const UserMaintainPage_Individual = () => {
response.data["verifiedStatus"] = response.data.verifiedBy ? DateUtils.datetimeStr(response.data.verifiedDate) + ", " + response.data.verifiedByName : "Not Verified";
response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.address?.country);
- response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.address?.district);
+ response.data["district"] = getObjectByType(ComboData.district, "type", response.data.address?.district);
response.data["addressLine1"] = response.data.address?.addressLine1;
response.data["addressLine2"] = response.data.address?.addressLine2;
response.data["addressLine3"] = response.data.address?.addressLine3;
@@ -104,7 +104,7 @@ const UserMaintainPage_Individual = () => {
response.data["faxNo"] = JSON.parse(response.data["faxNo"]);
response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.address?.country);
- response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.address?.district);
+ response.data["district"] = getObjectByType(ComboData.district, "type", response.data.address?.district);
response.data["addressLine1"] = response.data.address?.addressLine1;
response.data["addressLine2"] = response.data.address?.addressLine2;
response.data["addressLine3"] = response.data.address?.addressLine3;
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index 59b5759..b2876d2 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -138,7 +138,7 @@ const UserMaintainPage_Organization = () => {
// console.log(getObjectByValue(ComboData.country, "key", response.data.addressBus?.country))
// console.log(getObjectByValue(ComboData.country, "key", response.data.addressBus?.district))
response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.addressBus?.country);
- response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.addressBus?.district);
+ response.data["district"] = getObjectByType(ComboData.district, "type", response.data.addressBus?.district);
response.data["addressLine1"] = response.data.addressBus?.addressLine1;
response.data["addressLine2"] = response.data.addressBus?.addressLine2;
response.data["addressLine3"] = response.data.addressBus?.addressLine3;
diff --git a/src/pages/authentication/auth-forms/BusCustomFormWizard.js b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
index 2147061..7159d3c 100644
--- a/src/pages/authentication/auth-forms/BusCustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/BusCustomFormWizard.js
@@ -104,14 +104,6 @@ const BusCustomFormWizard = (props) => {
const address4ComboList = ComboData.district;
const address5ComboList = ComboData.country;
- // const termsAndCon = "此網址由香港特別行政區政府物流服務署製作及管理。本署會盡力確保網址上的資料無誤，\n"
- // + "但有絕對酌情權隨時刪除、暫停登載或編輯各項資料而無須給予任何理由。\n由於任何與網址"
- // + "內資料有關的理由或原因，而導致出現申索、損失或損害，本署概不負責。\n使用者須自行評"
- // + "估本網址所載或與本網址有關連的各項資料，並應在根據該等資料行事前，參照印行的香港"
- // + "特別行政區憲報以核實該等資料，以及徵詢獨立意見。\n版權公告本網頁的內容，包括但不限"
- // + "於所有文本、平面圖像、圖畫、圖片、照片以及數據或其他資料的匯編，均受版權保障。\n香"
- // + "港特別行政區政府是本網頁內所有版權作品的擁有人，除非預先得到政府物流服務署的書面"
- // + "授權，否則嚴禁複製、改編、分發、發布或向公眾提供該等版權作品。"
const refType = "identification";
useEffect(() => {
@@ -340,8 +332,8 @@ const BusCustomFormWizard = (props) => {
const { handleSubmit } = useForm({})
const _onSubmit = () => {
setLoding(true);
- values.address4 = selectedAddress4==null?"":selectedAddress4.key
- values.address5 = selectedAddress5.key
+ values.address4 = selectedAddress4==null?"":selectedAddress4.type
+ values.address5 = selectedAddress5.type
// console.log(values)
const busUserAddress = {
"addressLine1": "",
@@ -1579,7 +1571,7 @@ const BusCustomFormWizard = (props) => {
:
- {intl.formatMessage({id: selectedAddress5.label})}
+ {intl.formatMessage({id: selectedAddress5.type})}
diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js
index d1b8e66..9827325 100644
--- a/src/pages/authentication/auth-forms/CustomFormWizard.js
+++ b/src/pages/authentication/auth-forms/CustomFormWizard.js
@@ -85,9 +85,7 @@ const CustomFormWizard = (props) => {
const [selectedIdDocType, setSelectedIdDocType] = useState({});
const [selectedIdDocInputType, setSelectedIdDocInputType] = useState("");
- // const [selectedIdDocLabel, setSelectedIdDocLabel] = useState(null);
const [selectedAddress4, setSelectedAddress4] = useState(null);
- // console.log(ComboData.country[0]);
const [selectedAddress5, setSelectedAddress5] = useState(ComboData.country[0]);
const [termsAndConAccept, setTermsAndConAccept] = useState(false);
const [termsAndConNotAccept, setTermsAndConNotAccept] = useState(false);
@@ -102,14 +100,6 @@ const CustomFormWizard = (props) => {
const [districtErrStr, setDistrictErrStr] = useState("")
const idDocTypeComboList = ComboData.idDocType;
- // const termsAndCon = "此網址由香港特別行政區政府物流服務署製作及管理。本署會盡力確保網址上的資料無誤，\n"
- // + "但有絕對酌情權隨時刪除、暫停登載或編輯各項資料而無須給予任何理由。\n由於任何與網址"
- // + "內資料有關的理由或原因，而導致出現申索、損失或損害，本署概不負責。\n使用者須自行評"
- // + "估本網址所載或與本網址有關連的各項資料，並應在根據該等資料行事前，參照印行的香港"
- // + "特別行政區憲報以核實該等資料，以及徵詢獨立意見。\n版權公告本網頁的內容，包括但不限"
- // + "於所有文本、平面圖像、圖畫、圖片、照片以及數據或其他資料的匯編，均受版權保障。\n香"
- // + "港特別行政區政府是本網頁內所有版權作品的擁有人，除非預先得到政府物流服務署的書面"
- // + "授權，否則嚴禁複製、改編、分發、發布或向公眾提供該等版權作品。"
const refType = "identification";
useEffect(() => {
@@ -326,8 +316,8 @@ const CustomFormWizard = (props) => {
const _onSubmit = () => {
setLoding(true);
values.idDocType = selectedIdDocType.type
- values.address4 = selectedAddress4 == null ? "" : selectedAddress4.key
- values.address5 = selectedAddress5.key
+ values.address4 = selectedAddress4 == null ? "" : selectedAddress4.type
+ values.address5 = selectedAddress5.type
// console.log(values)
const userAddress = {
"addressLine1": "",
@@ -1697,7 +1687,7 @@ const CustomFormWizard = (props) => {
:
- {intl.formatMessage({ id: selectedIdDocType?.label ?? " " })}
+ {selectedIdDocType?.label? intl.formatMessage({ id: selectedIdDocType.label}): " "}
diff --git a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js
index ff09d5d..e9234b6 100644
--- a/src/pages/authentication/auth-forms/IAmSmartFormWizard.js
+++ b/src/pages/authentication/auth-forms/IAmSmartFormWizard.js
@@ -67,14 +67,6 @@ const CustomFormWizard = (props) => {
const address4ComboList = ComboData.district;
const address5ComboList = ComboData.country;
- // const termsAndCon = "此網址由香港特別行政區政府物流服務署製作及管理。本署會盡力確保網址上的資料無誤，\n"
- // + "但有絕對酌情權隨時刪除、暫停登載或編輯各項資料而無須給予任何理由。\n由於任何與網址"
- // + "內資料有關的理由或原因，而導致出現申索、損失或損害，本署概不負責。\n使用者須自行評"
- // + "估本網址所載或與本網址有關連的各項資料，並應在根據該等資料行事前，參照印行的香港"
- // + "特別行政區憲報以核實該等資料，以及徵詢獨立意見。\n版權公告本網頁的內容，包括但不限"
- // + "於所有文本、平面圖像、圖畫、圖片、照片以及數據或其他資料的匯編，均受版權保障。\n香"
- // + "港特別行政區政府是本網頁內所有版權作品的擁有人，除非預先得到政府物流服務署的書面"
- // + "授權，否則嚴禁複製、改編、分發、發布或向公眾提供該等版權作品。"
useEffect(() => {
@@ -287,8 +279,8 @@ const CustomFormWizard = (props) => {
userAddress.addressLine1 = values.address1
userAddress.addressLine2 = values.address2
userAddress.addressLine3 = values.address3
- values.address4 = selectedAddress4 == null ? "" : selectedAddress4.key
- values.address5 = selectedAddress5.key
+ values.address4 = selectedAddress4 == null ? "" : selectedAddress4.type
+ values.address5 = selectedAddress5.type
const userFaxNo = {
"countryCode": values.faxCountryCode,
diff --git a/src/translations/en.json b/src/translations/en.json
index e375196..2035c08 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -256,9 +256,6 @@
"regionOrCountry": "Country/Region",
"pleaseFillInCountry": "Please enter the Country/Region",
"pleaseFillInDistrict": "Please enter the District",
- "hongKong": "Hong Kong",
- "mainland": "Mainland China",
- "macau": "Macau",
"yourContact": "Your Contact Information",
"passport": "Passport",
"HKIDcard": "Hong Kong ID Card",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 2cc6206..5c4cb30 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -250,9 +250,6 @@
"regionOrCountry": "国家/地区",
"pleaseFillInCountry": "请输入国家/地区",
"pleaseFillInDistrict": "请输入地区",
- "hongKong": "香港",
- "mainland": "内地",
- "macau": "澳门",
"yourContact": "你的联络资料",
"passport": "护照",
"HKIDcard": "香港身份证",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index be4aa26..b5b1661 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -253,9 +253,6 @@
"regionOrCountry": "國家/地區",
"pleaseFillInCountry": "請輸入國家/地區",
"pleaseFillInDistrict": "請輸入地區",
- "hongKong": "香港",
- "mainland": "內地",
- "macau": "澳門",
"yourContact": "你的聯絡資料",
"passport": "護照",
"HKIDcard": "香港身份證",
diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js
index c96efe3..c46214d 100644
--- a/src/utils/ComboData.js
+++ b/src/utils/ComboData.js
@@ -6,33 +6,33 @@ export const idDocType = [
];
export const district = [
- { id: 1, key: 1, label: '離島區', type: 'islandCombo' },
- { id: 2, key: 2, label: '葵青區', type: 'kwaiTsingCombo' },
- { id: 3, key: 3, label: '北區', type: 'northCombo' },
- { id: 4, key: 4, label: '西貢區', type: 'saiKungCombo' },
- { id: 5, key: 5, label: '沙田區', type: 'shaTinCombo' },
- { id: 6, key: 6, label: '大埔區', type: 'taiPoCombo' },
- { id: 7, key: 7, label: '荃灣區', type: 'tsuenWanCombo' },
- { id: 8, key: 8, label: '屯門區', type: 'tuenMunCombo' },
- { id: 9, key: 9, label: '元朗區', type: 'yuenLongCombo' },
- { id: 10, key: 10, label: '九龍城區', type: 'kowloonCityCombo' },
- { id: 11, key: 11, label: '觀塘區', type: 'kwunTongCombo' },
- { id: 12, key: 12, label: '深水埗區', type: 'shamShuiPoCombo' },
- { id: 13, key: 13, label: '黃大仙區', type: 'wongTaiSinCombo' },
- { id: 14, key: 14, label: '油尖旺區', type: 'yauTsimMongCombo' },
- { id: 15, key: 15, label: '中西區', type: 'centralAndWesternCombo' },
- { id: 16, key: 16, label: '東區', type: 'easternCombo' },
- { id: 17, key: 17, label: '南區', type: 'southernCombo' },
- { id: 18, key: 18, label: '灣仔區', type: 'wanChaiCombo' },
- { id: 19, key: 19, label: '大嶼山區', type: 'lantauIslandCombo' },
- { id: 20, key: 20, label: '南丫島區', type: 'lammaIslandCombo' },
- { id: 21, key: 21, label: '坪洲區', type: 'pengChauCombo' }
+ { key: 1, type: 'islandCombo' },
+ { key: 2, type: 'kwaiTsingCombo' },
+ { key: 3, type: 'northCombo' },
+ { key: 4, type: 'saiKungCombo' },
+ { key: 5, type: 'shaTinCombo' },
+ { key: 6, type: 'taiPoCombo' },
+ { key: 7, type: 'tsuenWanCombo' },
+ { key: 8, type: 'tuenMunCombo' },
+ { key: 9, type: 'yuenLongCombo' },
+ { key: 10, type: 'kowloonCityCombo' },
+ { key: 11, type: 'kwunTongCombo' },
+ { key: 12, type: 'shamShuiPoCombo' },
+ { key: 13, type: 'wongTaiSinCombo' },
+ { key: 14, type: 'yauTsimMongCombo' },
+ { key: 15, type: 'centralAndWesternCombo' },
+ { key: 16, type: 'easternCombo' },
+ { key: 17, type: 'southernCombo' },
+ { key: 18, type: 'wanChaiCombo' },
+ { key: 19, type: 'lantauIslandCombo' },
+ { key: 20, type: 'lammaIslandCombo' },
+ { key: 21, type: 'pengChauCombo' }
];
export const country = [
- { id:1, key: 1, label: '香港', type: 'hongKong' },
- { id:2, key: 2, label: '內地', type: 'mainland' },
- { id:3, key: 3, label: '澳門', type: 'macau' }
+ { id:1, key: 1, type: 'hongKong' },
+ { id:2, key: 2, type: 'mainland' },
+ { id:3, key: 3, type: 'macau' }
];
export const accountFilter = [{ id: 1, key: 1, label: 'Active', type: 'active' }, { id: 2, key: 2, label: 'Locked', type: 'locked' }, { id: 3, key: 3, label: 'Not Verified', type: 'notVerified' }];