From 621bbdb967f5f448726a8b76c807397292f3c5e6 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 29 Mar 2024 12:00:41 +0700
Subject: [PATCH] =?UTF-8?q?15=20per=20=E0=B8=A3=E0=B8=A7=E0=B8=A1=20point?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/SalaryPeriodController.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 036e165..ed6a622 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -158,7 +158,11 @@ export class SalaryPeriodController extends Controller {
           org: item.root,
           total: item.total + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.total),
           fifteenPercent:
-            item.fifteenPercent + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.fifteenPercent),
+            item.fifteenPercent +
+            item.fifteenPoint +
+            (_salaryOrgGROUP2 == null
+              ? 0
+              : _salaryOrgGROUP2.fifteenPercent + _salaryOrgGROUP2.fifteenPoint),
           chosen:
             item.quantityUsed + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.quantityUsed),
           remaining:
@@ -1713,7 +1717,6 @@ export class SalaryPeriodController extends Controller {
     });
     await this.salaryProfileEmployeeRepository.remove(salaryProfileEmployee);
     await this.salaryOrgEmployeeRepository.remove(salaryOrgEmployee);
-
     let orgs = await new CallAPI().GetData(request, "org/unauthorize/active/root/id");
     let total = 1000;
     let _orgProfiles = await new CallAPI().PostData(request, "org/unauthorize/salary/gen", {