update careOf

src/pages/Payment/Details_GLD/DataGrid.js

@@ -45,7 +45,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 let appNo = params.row.appNo;
                 console.log(params.row)
                 return <div style={{ margin: 4, textAlign:"left"}}>Gazette Supplement No. 6 <br/>
-                    {isORGLoggedIn()?<>Care Of: {params.row.careOf}<br /></>:null}
+                    {isORGLoggedIn()&&params.row.careOf!=null&&params.row.careOf!=""?<>{params.row.careOf}<br /></>:null}
                     App No: {appNo}<br/>
                     Issue Date: {DateUtils.dateValue(params.row.issueDate)}<br/>
                     Length: {params.row.length+ " cm"}</div>

src/pages/Payment/Details_Public/DataGrid.js

@@ -72,7 +72,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 // console.log(params)
                 return <div style={{ margin: 4, textAlign:"left"}}>
                     <FormattedMessage id="gazetteSampleName"/><br/>
-                    {isORGLoggedIn()?<><FormattedMessage id="careOf"/>: {params.row.careOf}<br /></>:null}
+                    {isORGLoggedIn()&&params.row.careOf!=null&&params.row.careOf!=""?<>{params.row.careOf}<br /></>:null}
                     <FormattedMessage id="applicationId"/>: {appNo}<br/>
                     <FormattedMessage id="gazetteDate"/>: {locale === 'en' ? DateUtils.dateValue(params.row.issueDate) : DateUtils.dateStr_Cht(params.row.issueDate)}<br/>
                     <FormattedMessage id="gazetteLength"/>: {params.row.length+ " cm"}</div>

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -76,7 +76,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {
             phoneNumber: yup.string().min(8, intl.formatMessage({id: 'require8Number'})).required(intl.formatMessage({id: 'requireContactNumber'})),
             faxNumber: yup.string().min(8, intl.formatMessage({id: 'require8Number'})),
             remarks: yup.string().max(100,getMaxErrStr(100)).nullable(),
-            careOf: yup.string().max(30,getMaxErrStr(30)).nullable(),
+            careOf: yup.string().max(60,getMaxErrStr(60)).nullable(),
         }),
         onSubmit: values => {
             if (!values.issueId) {
@@ -314,14 +314,24 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {
                                         </Grid>
                                     </Grid>
                                     {isORGLoggedIn()?
-                                        <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
-                                            {FieldUtils.getTextField({
-                                                label: intl.formatMessage({id: 'careOf'}) + ":",
-                                                valueName: "careOf",
-                                                form: formik,
-                                                // disabled: true
-                                            })}
-                                        </Grid>:null
+                                        <>
+                                            <Grid item xs={12} md={12} lg={12}>
+                                                {FieldUtils.getCarOfField({
+                                                    label: intl.formatMessage({id: 'careOf'}) + ":",
+                                                    valueName: "careOf",
+                                                    form: formik,
+                                                    // disabled: true
+                                                })}
+                                            </Grid>
+                                            <Grid item xs={12} md={12} lg={12} sx={{ mb: 3 }}>
+                                                <Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}>
+                                                    <FormattedMessage id="careOfRemark" />
+                                                </Typography>
+                                            </Grid>
+                                        </>
+                                    :
+                                        null
+                                        
                                     }
                                     <Grid item xs={12} md={12} lg={12}>
                                         {FieldUtils.getTextArea({

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -396,11 +396,13 @@ export default function SubmittedTab({ rows }) {
                     }}
                 >
                     <DialogTitle></DialogTitle>
-                    <Typography variant="h2" style={{ padding: '16px' }}>Warning</Typography>
+                    <Typography variant="h2" style={{ padding: '16px' }}>                                
+                        <FormattedMessage id="warning" />
+                    </Typography>
                     <DialogContent style={{ display: 'flex', }}>
                         <Stack direction="column" justifyContent="space-between">
                             <Typography variant="h5" color="error">
-                                You have been selected different Care of applications. Are you want to pay?
+                                <FormattedMessage id="careOfWarning" />
                             </Typography>
                         </Stack>
                     </DialogContent>

src/translations/en.json

@@ -307,7 +307,8 @@
   "submitDate": "Submit Date",
   "submitDateFrom": "Submit Date (From)",
   "submitDateTo": "Submit Date (To)",
-  "myRemarks": "Remarks",
+  "myRemarks": "Other Remark",
+  "careOfRemark": "You can insert your client (e.g. individual or company name) here if you want to show your client's name on the payment receipt.",
   "status": "Status",
   "viewDetail": "View details",
   "price": "Amount ($)",
@@ -332,7 +333,7 @@
   "search": "Search",
   "searchForm": "Search Form",
   "cancel": "Cancel",
-  "extraMark": "Remarks",
+  "extraMark": "Other Remark",
   "totalAmount": "Total Amount",
   "close": "Close",
   "confirm": "Confirm",
@@ -351,9 +352,11 @@
   "applyStatus": "App. Status",
   "gazetteCount": "Gazette Issue No.",
   "gazetteCount2" :"Gazette Issue No./ Remarks",
-  "gazetteCount2_1" :"Care Of (c/o)/ Remarks",
-  "gazetteCount3" :"Gazette Issue No./ Care Of (c/o)/ Remarks",
-  "careOf":"Care Of (c/o)",
+  "gazetteCount2_1" :"Client Remark / Other Remark",
+  "gazetteCount3" :"Gazette Issue No./ Client Remark / Other Remark",
+  "careOf":"Client Remark",
+  "careOfWarning":"You have been selected different Client Remark applications. Are you want to pay?",
+  "warning":"Warning",
   "publishDate": "Publish Date",
   "draftFile": "Manuscript file",
   "download": "Download",

src/translations/zh-CN.json

@@ -300,7 +300,8 @@
   "submitDate": "提交日期",
   "submitDateFrom": "提交日期 (从)",
   "submitDateTo": "提交日期 (到)",
-  "myRemarks": "我的备注",
+  "myRemarks": "其他备注",
+  "careOfRemark": "如果您想在付款收据上显示客户的名称，您可以在此处输入（例如个人或公司名称）。",
   "status": "状态",
   "viewDetail": "查看详细",
   "price": "金额 ($)",
@@ -325,7 +326,7 @@
   "search": "搜寻",
   "searchForm": "搜寻表格",
   "cancel": "取消",
-  "extraMark": "备注",
+  "extraMark": "其他备注",
   "totalAmount": "总额",
   "close": "关闭",
   "confirm": "确认",
@@ -343,10 +344,12 @@
   "applyPerson": "申请人",
   "applyStatus": "申请状态",
   "gazetteCount": "宪报期数",
-  "gazetteCount2" :"宪报期数/ 我的备注",
-  "gazetteCount2_1" :"托管/ 我的备注",
-  "gazetteCount3" :"宪报期数/ 托管/ 我的备注",
-  "careOf":"托管",
+  "gazetteCount2" :"宪报期数/ 其他备注",
+  "gazetteCount2_1" :"客戶備註/ 其他备注",
+  "gazetteCount3" :"宪报期数/ 客戶備註/ 其他备注",
+  "careOf":"客戶備註",
+  "careOfWarning":"您已选择了不同的客户备注申请。您要付款吗？",
+  "warning":"警告",
   "publishDate": "发布日期",
   "draftFile": "稿件档案",
   "download": "下载",

src/translations/zh-HK.json

@@ -303,7 +303,8 @@
   "submitDate": "提交日期",
   "submitDateFrom": "提交日期 (從)",
   "submitDateTo": "提交日期 (到)",
-  "myRemarks": "我的備註",
+  "myRemarks": "其他備註",
+  "careOfRemark": "如果您想在付款收據上顯示客戶的名稱，您可以在此處輸入（例如個人或公司名稱）。",
   "status": "狀態",
   "viewDetail": "查看詳細",
   "price": "金額 ($)",
@@ -328,7 +329,7 @@
   "search": "搜尋",
   "searchForm": "搜尋表格",
   "cancel": "取消",
-  "extraMark": "備註",
+  "extraMark": "其他備註",
   "totalAmount": "總額",
   "close": "關閉",
   "confirm": "確認",
@@ -346,10 +347,12 @@
   "applyPerson": "申請人",
   "applyStatus": "申請狀態",
   "gazetteCount": "憲報期數",
-  "gazetteCount2" :"憲報期數/ 我的備註",
-  "gazetteCount2_1" :"托管/ 我的備註",
-  "gazetteCount3" :"憲報期數/ 托管/ 我的備註",
-  "careOf":"托管",
+  "gazetteCount2" :"憲報期數/ 其他備註",
+  "gazetteCount2_1" :"客戶備註/ 其他備註",
+  "gazetteCount3" :"憲報期數/ 客戶備註/ 其他備註",
+  "careOf":"客戶備註",
+  "careOfWarning":"您已選擇了不同的客戶備註申請。您要付款嗎？",
+  "warning":"警告",
   "publishDate": "發佈日期",
   "draftFile": "稿件檔案",
   "download": "下載",

src/utils/FieldUtils.js

@@ -47,6 +47,27 @@ export const getTextField = ({ label, valueName, form, disabled }) => {
     </Grid>;
 }
 
+export const getCarOfField = ({ label, valueName, form, disabled }) => {
+    return <Grid container alignItems={"center"} >
+        <Grid item xs={12} sm={12} md={12} lg={12}>
+            <Grid container spacing={1}>
+                <Grid item xs={12} sm={12} md={3} lg={3}
+                    sx={{ display: 'flex', alignItems: 'center' }} >
+                    <Typography variant="pnspsFormParagraphBold">{label}</Typography>
+                </Grid>
+                <Grid item xs={12} sm={12} md={6} lg={6}>
+                    {initField({
+                        type: "text",
+                        valueName: valueName,
+                        form: form,
+                        disabled: disabled
+                    })}
+                </Grid>
+            </Grid>
+        </Grid>
+    </Grid>;
+}
+
 export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...props }) => {
     return <Grid container spacing={1} alignItems={"center"}>
         <Grid item xs={12} md={3} lg={3}