From 772741ed01cafb3a6b09828f6709d155943580a3 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 1 Mar 2024 10:38:05 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81?= =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=87=E0=B9=80=E0=B8=95=E0=B8=B7=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B8=9B=E0=B8=B5=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=8B?= =?UTF-8?q?=E0=B9=89=E0=B8=B3=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20?= =?UTF-8?q?=E0=B8=9E=E0=B8=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/SalaryPeriodController.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index c749880..fc3e991 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -748,7 +748,7 @@ export class SalaryPeriodController extends Controller { if (chk_period) { throw new HttpError( HttpStatusCode.NOT_FOUND, - "ประเภทผังปี " + salaryPeriod.effectiveDate.getFullYear() + " ซ้ำ", + "ประเภทผังปี " + Extension.ToThaiYear(salaryPeriod.year) + " ซ้ำ", ); } @@ -796,7 +796,7 @@ export class SalaryPeriodController extends Controller { if (chk_period) { throw new HttpError( HttpStatusCode.NOT_FOUND, - "ประเภทผังปี " + (requestBody.effectiveDate.getFullYear() + 543) + " ซ้ำ", + "ประเภทผังปี " + Extension.ToThaiYear(requestBody.year) + " ซ้ำ", ); } From 328322211ce8e6968b24ca520272b9c37c0c76fe Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 1 Mar 2024 10:46:04 +0700 Subject: [PATCH 2/2] no message --- src/controllers/SalaryPeriodController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index fc3e991..5ad8ae3 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -590,7 +590,7 @@ export class SalaryPeriodController extends Controller { if (salaryProfileAll != null) { throw new HttpError( HttpStatusCode.INTERNAL_SERVER_ERROR, - "ไม่สามารถเพิ่มรายชื่อนี้ได้ เนื่องจากมีการยื่นของเลื่อนเงินเดือนแล้ว", + "ไม่สามารถเพิ่มรายชื่อนี้ได้ เนื่องจากมีการยื่นขอเลื่อนเงินเดือนแล้ว", ); }