Merge branch 'develop' into devTee

# Conflicts:
#	src/api/13_salary/api.salary.ts

src/api/02_organizational/api.organization.ts

@@ -77,4 +77,9 @@ export default {
   orgPosMasterByIdEmp: (id: string) => `${orgEmployeePos}/master/${id}`,
   orgPosMasterListEmp: `${orgEmployeePos}/master/list`,
   orgPosMasterEmp: `${orgEmployeePos}/master`,
+  orgPosSortEmp: `${orgEmployeePos}/sort`,
+  orgPosPositionEmpById: (id: string) => `${orgEmployeePos}/position/${id}`,
+  orgPosMoveEmp: `${orgEmployeePos}/move`,
+  orgProfileEmp: `${orgEmployeePos}/profile`,
+  orgSearchProfileEmp: `${orgProfile}-employee/search`,
 };

src/api/13_salary/api.salary.ts

@@ -20,6 +20,7 @@ export default {
   salaryRateListByid: (id: string) => `${salaryRate}/${id}`,
   salaryReportByid: (id: string) => `${salary}/report/${id}`,
   salaryPeriod: () => `${salary}/period`,
+  salaryPeriodActive: () => `${salary}/period/active`,
 
   /** รายการเงินเดือน*/
   keycloakPositionByid: (id: string) =>

src/api/manage/api.insignia.ts

@@ -42,7 +42,7 @@ export default {
   insigniaOrg,
   insigniaTypeOrg,
   insigniaTypeNewOrg: `${insigniaOrg}`,
-  insigniaTypeNewIdOrg: (id: string) => `${insigniaOrg}${id}`,
+  insigniaTypeNewIdOrg: (id: string) => `${insigniaTypeOrg}${id}`,
   insigniaNewIdOrg: (id: string) => `${insigniaOrg}${id}`,
   insigniaSortOrg: (id: string) => `${insigniaOrg}sort/${id}`,
 };

src/api/registry/api.registry.ts

@@ -0,0 +1,14 @@
+import env from "../index";
+
+const registryNew = `${env.API_URI}/org/profile/`;
+
+export default {
+  registryNew,
+  profileNewInsign: `${registryNew}insignia`,
+  profileNewInsignByProfileId: (profileId: string) =>
+    `${registryNew}insignia/${profileId}`,
+  profileNewInsignByInsignId: (insignId: string) =>
+    `${registryNew}insignia/${insignId}`,
+  profileNewInsignHisByInsignId: (insignId: string) =>
+    `${registryNew}insignia/history/${insignId}`,
+};