alex
/
PNSPS-frontend-MaterialUI
1
0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

update

CR013B2
Jason Chuang 1 月之前
父節點
e208f02e78
當前提交
02374dc8f5
共有 9 個檔案被更改，包括 27 行新增 和 22 行删除
分割檢視
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/auth/utils.js
  2. +8
    -3
      src/layout/MainLayout/Header/index.js
  3. +2
    -2
      src/pages/Proof/Reply_Public/ProofForm.js
  4. +1
    -1
      src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
  5. +2
    -2
      src/pages/extra-pages/AboutUs/AboutUs_cn.js
  6. +2
    -2
      src/pages/extra-pages/AboutUs/AboutUs_en.js
  7. +2
    -2
      src/pages/extra-pages/AboutUs/AboutUs_zh.js
  8. +3
    -3
      src/translations/en.json
  9. +6
    -6
      src/utils/statusUtils/PublicNoteStatusUtils.js

+ 1
- 1
src/auth/utils.js 查看文件

@@ -166,7 +166,7 @@ export const checkSearchCriteriaPath = (path) =>{

export const getPaymentMethodByCode = (code) => {
if (code === "01,PPSB,PPS") return "PPS";
if (code === "02,BCMP,CreditCard" || code === "03,BCMP,CreditCard") return "CreditCard";
if (code === "02,BCMP,CreditCard" || code === "03,BCMP,CreditCard") return "Credit Card";
if (code === "04,BCFP,FPS") return "FPS";
return "other";
};


+ 8
- 3
src/layout/MainLayout/Header/index.js 查看文件

@@ -264,6 +264,14 @@ function Header(props) {
:
<></>
}
<li>
<Link className="report" to='/setting/report'>
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }} >
Report
</Typography>
</Link>
</li>

<li>
<Link className="setting" ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>Settings</Typography><KeyboardArrowDownIcon sx={{ fontSize: '1vw' }} /></Link>
<ul className='dropdown'>
@@ -333,9 +341,6 @@ function Header(props) {
:
<></>
}
<li>
<Link className="report" to='/setting/report'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1}}>Report</Typography></Link>
</li>
</ul>
</li>
<Box sx={{ display: { xs: 'none', sm: 'none', md: 'block' } }}>


+ 2
- 2
src/pages/Proof/Reply_Public/ProofForm.js 查看文件

@@ -462,9 +462,9 @@ const FormPanel = ({ formData }) => {
}</td>
<td style={tabelStyle}>{
locale === 'en' ?
`${DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "datetimeFormate" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
`${DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "datetimeFormate" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")}`
:
`${DateUtils.dateFormat(formData.expiryDate, intl.formatMessage({ id: "datetimeFormate" }))?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}`
`${DateUtils.dateFormat(formData.proofPaymentDeadline, intl.formatMessage({ id: "datetimeFormate" }))?.replace("am", "上午")?.replace("pm", "下午").replace("00分", "")}`
}</td>
<td style={tabelStyle}>
<FormattedMessage id="payOnlineRemarkProof" values={{


+ 1
- 1
src/pages/PublicNotice/ListPanel/PendingPaymentTab.js 查看文件

@@ -238,7 +238,7 @@ export default function SubmittedTab({ setCount, url }) {
<div>
{/* {dateStr(params.row.closingDate)} */}
{
is18_00(params.row.expiryDate) ?
DateUtils.is18_00(params.row.expiryDate) ?
DateUtils.formatDateForLocale(params.row.expiryDate, intl, locale):
params.row.paymentMethod=="online"?
locale === 'en' ?


+ 2
- 2
src/pages/extra-pages/AboutUs/AboutUs_cn.js 查看文件

@@ -4,7 +4,7 @@ const AboutUs = () => {
const content =`
<div style="text-align: justify; text-justify: inter-word; font-style: normal;">
<h1 style="color:#0000AA;">宪报公共启事提交及缴费系统(系统)</h1>
<p>「<a target="_brank" href="https://pnsps.gld.gov.hk/">宪报公共启事提交及缴费系统</a>」已于2024年8月顺利启用，并将于2026年1月28日全面推行。由<b>2026年1月28日</b>开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用，申请人可以选择转数快（FPS）、 缴费灵（PPS）和信用卡缴交费用。现诚邀所有刊登宪报公共启事申请人及早为新安排做好准备，立即<a target="_brank" href="https://pnsps.gld.gov.hk/register">登记成为系统用户</a>，使用系统提交申请，以体验新平台的便捷。 </p>
<p>「<a target="_brank" href="https://pnsps.gld.gov.hk/">宪报公共启事提交及缴费系统</a>」已于2024年8月启用，并于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用，申请人可以选择转数快（FPS）、缴费灵（PPS）和信用卡缴交费用。现诚邀所有刊登宪报公共启事申请人及早<a target="_brank" href="https://pnsps.gld.gov.hk/register">登记成为系统用户</a>。 </p>
<p>如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。</p>
<h2 style="color:#00A650;">透过系统于宪报刊登公共启事须知</h2>

@@ -12,7 +12,7 @@ const AboutUs = () => {

<p>印务科会依照宪报的印刷格式排版，并会于系统把印刷稿传递予申请人校对，以及会以电邮通知申请人登入系统检视校对稿。如申请人在预计刊登公共启事日期前四天的中午仍未收到通知，申请人可致电 2564 9570 查询。 </p>

<p>稿件一般只供校对一次。申请人应仔细校对印刷稿，然后透过系统确定校对稿可以付印及签署作实，并在指定限期前透过所选择的付款方式（(1) 透过系统以缴费灵、转数快或信用卡网上付款；(2) 就收到的一般缴费单，以自动柜员机、转数快及网上银行等方法付款；或(3) 到北角政府合署收款处付款）向政府物流服务署缴付所需费用。 </p>
<p>稿件一般只供校对一次。申请人应仔细校对印刷稿，然后透过系统确定校对稿可以付印及签署作实，并在指定限期前透过系统以缴费灵、转数快或信用卡向政府物流服务署缴付所需费用。</p>

<p>如申请人未能在指定限期前透过系统确定校对稿可以付印，申请人将被视作已终止该申请，惟申请人仍可能须缴交全部有关费用。 </p>



+ 2
- 2
src/pages/extra-pages/AboutUs/AboutUs_en.js 查看文件

@@ -4,7 +4,7 @@ const AboutUs = () => {
const content = `
<div style="text-align: justify; text-justify: inter-word; font-style: normal;">
<h1 style="color:#0000AA;">Gazette Public Notice Submission and Payment System (PNSPS)</h1>
<p>The <a target="_brank" href="https://pnsps.gld.gov.hk/">Gazette Public Notice Submission and Payment System (PNSPS)</a> has been smoothly rolled out in August 2024 and will be fully implemented on 28 January 2026. Starting from 28 January 2026, applications for publication of public notice in the Government Gazette and payment of gazette fee must be made online via the PNSPS. FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee. We would like to invite all applicants for publishing public notices in the Gazette to get well prepared for the change early, <a target="_brank" href="https://pnsps.gld.gov.hk/register">register as PNSPS user</a> now and submit online applications to experience the benefits of the new online platform.</p>
<p>The <a target="_brank" href="https://pnsps.gld.gov.hk/">Gazette Public Notice Submission and Payment System (PNSPS)</a> has been rolled out in August 2024 and fully implemented on 28 January 2026. Starting from 28 January 2026, applications for publication of public notice in the Government Gazette and payment of gazette fee must be made online via the PNSPS. FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee. We would like to invite all applicants for publishing public notices in the Gazette to <a target="_brank" href="https://pnsps.gld.gov.hk/register">register as PNSPS user</a> early.</p>
<p>If you have any enquiries on the set-up of the above online payment methods, please contact your bank (for FPS and credit card) or the PPS (PPS hotline: 2311 9876).</p>
<h2 style="color:#00A650;">Notes on Publishing Public Notices in the Gazette through PNSPS</h2>

@@ -13,7 +13,7 @@ const AboutUs = () => {

<p>The Printing Division will typeset the public notice in accordance with the house style of the Gazette. It will send the proof to the PNSPS for the applicant’s checking and will notify the applicant by email to check the proof from PNSPS. If the applicant has not received any notification by noon four days before the expected publication date, the applicant is advised to contact the Printing Division at 2564 9570.</p>

<p>Only one proof will normally be provided for proofreading. Applicant should check the proof carefully and sign the proof for approval through PNSPS, and pay the necessary fee to the Government Logistics Department by the selected payment means ((1) pay online via PNSPS using PPS, FPS or credit card; (2) for General Demand Note received, pay using payment methods such as ATM, FPS and internet banking; or (3) pay at North Point Government Offices Collection Office) before the specified deadline.</p>
<p>Only one proof will normally be provided for proofreading. Applicant should check the proof carefully and sign the proof for approval through PNSPS, and pay the necessary fee to the Government Logistics Department via PNSPS using PPS, FPS or credit card before the specified deadline.</p>

<p>If the applicant has not confirmed the proof through PNSPS before the specified deadline, the applicant will be regarded to have discontinued the application. Under this circumstance, the applicant may still be required to pay the full fee. </p>



+ 2
- 2
src/pages/extra-pages/AboutUs/AboutUs_zh.js 查看文件

@@ -4,7 +4,7 @@ const AboutUs = () => {
const content =`
<div style="text-align: justify; text-justify: inter-word; font-style: normal;">
<h1 style="color:#0000AA;">憲報公共啟事提交及繳費系統(系統)</h1>
<p>「<a target="_brank" href="https://pnsps.gld.gov.hk/">憲報公共啟事提交及繳費系統</a>」已於2024年8月順利啟用，並將於2026年1月28日全面推行。由<b>2026年1月28日</b>開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用，申請人可以選擇轉數快（FPS）、 繳費靈（PPS）和信用卡繳交費用。現誠邀所有刊登憲報公共啟事申請人及早為新安排做好準備，立即<a target="_brank" href="https://pnsps.gld.gov.hk/register">登記成為系統用戶</a>，使用系統提交申請，以體驗新平台的便捷。</p>
<p>「<a target="_brank" href="https://pnsps.gld.gov.hk/">憲報公共啟事提交及繳費系統</a>」已於2024年8月啟用，並於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用，申請人可以選擇轉數快（FPS）、繳費靈（PPS）和信用卡繳交費用。現誠邀所有刊登憲報公共啟事申請人及早<a target="_brank" href="https://pnsps.gld.gov.hk/register">登記成為系統用戶</a>。</p>
<p>如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。</p>
<h2 style="color:#00A650;">透過系統於憲報刊登公共啟事須知</h2>

@@ -13,7 +13,7 @@ const AboutUs = () => {

<p>印務科會依照憲報的印刷格式排版，並會於系統把印刷稿傳遞予申請人校對，以及會以電郵通知申請人登入系統檢視校對稿。如申請人在預計刊登公共啟事日期前四天的中午仍未收到通知，申請人可致電 2564 9570 查詢。</p>

<p>稿件一般祇供校對一次。申請人應仔細校對印刷稿，然後透過系統確定校對稿可以付印及簽署作實，並在指定限期前透過所選擇的付款方式（(1) 透過系統以繳費靈、轉數快或信用卡網上付款；(2) 就收到的一般繳費單，以自動櫃員機、轉數快及網上銀行等方法付款；或(3) 到北角政府合署收款處付款）向政府物流服務署繳付所需費用。</p>
<p>稿件一般祇供校對一次。申請人應仔細校對印刷稿，然後透過系統確定校對稿可以付印及簽署作實，並在指定限期前透過系統以繳費靈、轉數快或信用卡向政府物流服務署繳付所需費用。</p>

<p>如申請人未能在指定限期前透過系統確定校對稿可以付印，申請人將被視作已終止該申請，惟申請人仍可能須繳交全部有關費用。</p>



+ 3
- 3
src/translations/en.json 查看文件

@@ -477,9 +477,9 @@
"drafts":"Drafts",
"cashierOrders":"Cashier’s orders",
"paymentMethodAndDeadLine":"Payment Methods / Deadline",
"payOnlineMethod":"Online Payment",
"payDnMethod":"General Demand Note Payment",
"payNPGOMethod":"Collection Office Payment",
"payOnlineMethod":"Online",
"payDnMethod":"Demand Note",
"payNPGOMethod":"NPGO Collection Office",
"payOnlineBtn":"Pay Online",
"fpsQrcodeTitle1":"Please scan the following QR code",
"fpsQrcodeTitle2":"QR code is valid for 3 minutes",


+ 6
- 6
src/utils/statusUtils/PublicNoteStatusUtils.js 查看文件

@@ -22,7 +22,7 @@ export function getStatusByText(status, creditor) {
case "paid":
return getStatusTag({ color: "#22a13f", text: "待發佈" })
case "completed":
return getStatusTag({ color: "#8a8784", text: "已完成" })
return getStatusTag({ color: "#4D4D4D", text: "已完成" })
case "notAccepted":
return getStatusTag({ color: "#d9372b", text: "不接受" })
case "resubmit":
@@ -30,7 +30,7 @@ export function getStatusByText(status, creditor) {
case "cancelled":
return getStatusTag({ color: "#909497", text: "已取消" })
case "withdrawn":
return getStatusTag({ color: "#09421aff", text: "已撤銷" })
return getStatusTag({ color: "#6E14CC", text: "已撤銷" })
default:
return getStatusTag({ text: status })
}
@@ -55,7 +55,7 @@ export function getStatusByTextEng(status, creditor) {
case "paid":
return getStatusTag({ color: "#3498DB", text: "Pending Publish" })
case "completed":
return getStatusTag({ color: "#8a8784", text: "Completed" })
return getStatusTag({ color: "#4D4D4D", text: "Completed" })
case "notAccepted":
return getStatusTag({ color: "#d9372b", text: "Not Accepted" })
case "resubmit":
@@ -63,7 +63,7 @@ export function getStatusByTextEng(status, creditor) {
case "cancelled":
return getStatusTag({ color: "#8a8784", text: "Cancelled" })
case "withdrawn":
return getStatusTag({ color: "#09421aff", text: "Withdrawn" })
return getStatusTag({ color: "#6E14CC", text: "Withdrawn" })
default:
return getStatusTag({ text: status })
}
@@ -89,7 +89,7 @@ export function getStatusByTextIntl(status, creditor, intl) {
case "paid":
return getStatusTag({ color: "#22a13f", text: intl.formatMessage({id: 'pendingPublish'}) })
case "completed":
return getStatusTag({ color: "#8a8784", text: intl.formatMessage({id: 'completed'}) })
return getStatusTag({ color: "#4D4D4D", text: intl.formatMessage({id: 'completed'}) })
case "notAccepted":
return getStatusTag({ color: "#d9372b", text: intl.formatMessage({id: 'notAccepted'}) })
case "resubmit":
@@ -97,7 +97,7 @@ export function getStatusByTextIntl(status, creditor, intl) {
case "cancelled":
return getStatusTag({ color: "#909497", text: intl.formatMessage({id: 'cancelled'}) })
case "withdrawn":
return getStatusTag({ color: "#09421aff", text: intl.formatMessage({id: 'withdrawn'}) })
return getStatusTag({ color: "#6E14CC", text: intl.formatMessage({id: 'withdrawn'}) })
default:
return getStatusTag({ text: status })
}


Write Preview
Loading…
取消
儲存