From 94d0412e21ce10d914abe6e54f649091e1185b0f Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 27 Mar 2024 12:11:09 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=80=E0=B8=8B=E0=B8=A3=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=87=E0=B8=99=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8=E0=B8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts           |  4 +--
 .../SalaryPeriodEmployeeController.ts         | 36 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 37baaa9..6954e00 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -3005,11 +3005,11 @@ export class ReportController extends Controller {
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
           : null,
         precentTwo:
-          profile.positionSalaryAmountPer == 0.2
+          profile.positionSalaryAmountPer == 0.02
             ? profile.positionSalaryAmount * profile.positionSalaryAmountPer
             : null, //ร้อยละ 2
         precentFour:
-          profile.positionSalaryAmountPer == 0.4
+          profile.positionSalaryAmountPer == 0.04
             ? profile.positionSalaryAmount * profile.positionSalaryAmountPer
             : null, //ร้อยละ 4
         reason: null, // หมายเหตุ
diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts
index 28fbd4c..933651f 100644
--- a/src/controllers/SalaryPeriodEmployeeController.ts
+++ b/src/controllers/SalaryPeriodEmployeeController.ts
@@ -349,23 +349,23 @@ export class SalaryPeriodEmployeeController extends Controller {
           salaryRankAmountMax == null ? 0 : salaryRankAmountMax.step;
           if (salaryRankAmountMax != null) {
             if (step - salaryRankAmountMax.step <= 0.5) {
-              salaryProfile.positionSalaryAmountPer = 0.2;
+              salaryProfile.positionSalaryAmountPer = 0.02;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.2;
+                  : salaryRankAmountMax.salaryMonth * 0.02;
             } else if (step - salaryRankAmountMax.step <= 1) {
-              salaryProfile.positionSalaryAmountPer = 0.4;
+              salaryProfile.positionSalaryAmountPer = 0.04;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.4;
+                  : salaryRankAmountMax.salaryMonth * 0.04;
             } else {
-              salaryProfile.positionSalaryAmountPer = 0.6;
+              salaryProfile.positionSalaryAmountPer = 0.06;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.6;
+                  : salaryRankAmountMax.salaryMonth * 0.06;
             }
           } else {
             salaryProfile.positionSalaryAmountPer = 0;
@@ -678,23 +678,23 @@ export class SalaryPeriodEmployeeController extends Controller {
           salaryProfile.salaryLevelNew = salaryRankAmountMax == null ? 0 : salaryRankAmountMax.step;
           if (salaryRankAmountMax != null) {
             if (step - salaryRankAmountMax.step <= 0.5) {
-              salaryProfile.positionSalaryAmountPer = 0.2;
+              salaryProfile.positionSalaryAmountPer = 0.02;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.2;
+                  : salaryRankAmountMax.salaryMonth * 0.02;
             } else if (step - salaryRankAmountMax.step <= 1) {
-              salaryProfile.positionSalaryAmountPer = 0.4;
+              salaryProfile.positionSalaryAmountPer = 0.04;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.4;
+                  : salaryRankAmountMax.salaryMonth * 0.04;
             } else {
-              salaryProfile.positionSalaryAmountPer = 0.6;
+              salaryProfile.positionSalaryAmountPer = 0.06;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.6;
+                  : salaryRankAmountMax.salaryMonth * 0.06;
             }
           } else {
             salaryProfile.positionSalaryAmountPer = 0;
@@ -1065,23 +1065,23 @@ export class SalaryPeriodEmployeeController extends Controller {
           salaryProfile.salaryLevelNew = salaryRankAmountMax == null ? 0 : salaryRankAmountMax.step;
           if (salaryRankAmountMax != null) {
             if (step - salaryRankAmountMax.step <= 0.5) {
-              salaryProfile.positionSalaryAmountPer = 0.2;
+              salaryProfile.positionSalaryAmountPer = 0.02;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.2;
+                  : salaryRankAmountMax.salaryMonth * 0.02;
             } else if (step - salaryRankAmountMax.step <= 1) {
-              salaryProfile.positionSalaryAmountPer = 0.4;
+              salaryProfile.positionSalaryAmountPer = 0.04;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.4;
+                  : salaryRankAmountMax.salaryMonth * 0.04;
             } else {
-              salaryProfile.positionSalaryAmountPer = 0.6;
+              salaryProfile.positionSalaryAmountPer = 0.06;
               salaryProfile.amountSpecial =
                 salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null
                   ? 0
-                  : salaryRankAmountMax.salaryMonth * 0.6;
+                  : salaryRankAmountMax.salaryMonth * 0.06;
             }
           } else {
             salaryProfile.positionSalaryAmountPer = 0;