Commit Graph

587 Commits

Author SHA1 Message Date
MahanCh
e9b115e962 Merge branch 'master' into MergeApiToMaster 2025-07-15 11:52:40 +03:30
MahanCh
143cc4943c add archivecode and set employer confirm list available 2025-07-15 11:47:16 +03:30
MahanCh
8f8a971a41 merge from CreateEmployeeBug 2025-07-15 11:08:40 +03:30
MahanCh
94058660b6 fix create employee bug 2025-07-15 11:07:37 +03:30
MahanCh
aab30b3a4b Fix FinancialStatement bug 2025-07-14 17:19:27 +03:30
MahanCh
d0e05df33a Add AppSetting Configuration 2025-07-13 16:07:55 +03:30
MahanCh
8eaa739e5e Api merged with master 2025-07-13 15:28:29 +03:30
MahanCh
358544e56c Merge branch 'master' into API 2025-07-13 14:58:30 +03:30
MahanCh
fb52e99c68 add financial statement controller 2025-07-13 14:17:52 +03:30
MahanCh
8eb74fea15 refactor: comment InsuranceConfirm Condtion in InsuranceList index.js 2025-07-13 10:24:52 +03:30
MahanCh
ba994a5802 feat: add wallet api for aqaye pardakht 2025-07-10 11:55:18 +03:30
MahanCh
f4ec4f43c6 add institution Contract Excel 2025-07-09 17:19:28 +03:30
MahanCh
030a622252 change payment transaction status 2025-07-09 13:39:42 +03:30
MahanCh
3099881416 Merge branch 'API' of https://github.com/syntax24/OriginalGozareshgir into API 2025-07-09 13:15:31 +03:30
MahanCh
6449776348 feat : add payment transaction controller 2025-07-09 13:15:05 +03:30
MahanCh
e8f7f6b778 fix : update data from edit employee in grouping in cws 2025-07-09 13:01:36 +03:30
MahanCh
513b093c66 set create payment transaction for sandbox creation 2025-07-09 12:45:09 +03:30
MahanCh
2e63c7b80a refactor: complete get payment transaction - add paymentCallBack 2025-07-09 11:54:28 +03:30
MahanCh
2714732750 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-07-08 13:51:59 +03:30
MahanCh
2a78a9dc1a change employee upload picture change name style 2025-07-08 13:51:52 +03:30
MahanCh
60b53f6e39 add payment PaymentGateway 2025-07-08 12:54:23 +03:30
SamSys
87f8517afb Registration Worklow api 2025-07-08 08:29:36 +03:30
SamSys
45a4a735ca register/init merged 2025-07-08 05:57:22 +03:30
SamSys
6e5f41ec60 dad-mehr ConnectionStrings added 2025-07-07 14:28:15 +03:30
MahanCh
629ae1f0df Merge branch 'master' into API 2025-07-07 14:10:46 +03:30
MahanCh
b9db912441 Revert "set cookie domain"
This reverts commit b3d339d7fb.
2025-07-07 14:00:21 +03:30
MahanCh
b3d339d7fb set cookie domain 2025-07-07 13:01:50 +03:30
38171581d3 fix : set group for pending create employee group 2025-07-06 13:33:27 +03:30
MahanCh
0d66a79d49 fix some bugs 2025-07-03 15:39:24 +03:30
MahanCh
35f948484e chnage use cors placement 2025-07-03 13:46:06 +03:30
MahanCh
4ec744a6bd Merge branch 'API' of https://github.com/syntax24/OriginalGozareshgir into API 2025-07-02 12:03:31 +03:30
MahanCh
c30c460a68 feature : add login controller and get detail profile
Add user profile and permissions handling

- Updated `AuthHelper` to deserialize permissions from claims.
- Introduced `GetDates` method in `GeneralController` for date info.
- Created `LoginController` with `GetProfile` method to return user profile details.
2025-07-02 12:03:25 +03:30
SamSys
861efc48e0 Completed new Workshop options 2025-07-02 04:28:38 +03:30
MahanCh
f2580c8e28 Fix take image bug 2025-07-01 16:09:37 +03:30
SamSys
6f292ddac6 Program.cs change 2025-07-01 03:23:43 +03:30
MahanCh
b99c503b58 fix create group js bug 2025-06-30 12:16:19 +03:30
SamSys
2fd1878126 Merge weeklyofday 2025-06-29 14:35:43 +03:30
MahanCh
a8c449c101 TOMAM for Change friday work with WeeklyOfDays 2025-06-29 14:30:36 +03:30
MahanCh
80c0ec28d5 finishOffDayOfWeek for CWS 2025-06-29 14:01:47 +03:30
MahanCh
b133aa67d2 merge fom master 2025-06-29 13:25:23 +03:30
SamSys
8122c9d841 Edit Employee Insurance Validation 2025-06-29 13:00:03 +03:30
SamSys
75e2a3c558 Create Employee Validation for InsuranceHistory 2025-06-28 13:33:52 +03:30
MahanCh
4415cb8128 change checkout styles 2025-06-25 16:07:02 +03:30
MahanCh
b9943cf460 change select list parameter name 2025-06-25 15:50:18 +03:30
MahanCh
8d490cd3fe change name spaces 2025-06-25 15:02:10 +03:30
MahanCh
1e3780be38 change base controllers name - add dates and add admin select List 2025-06-25 15:01:29 +03:30
MahanCh
92f68d8555 fix enum convertor for api and razor 2025-06-25 11:00:35 +03:30
SamSys
f0547828a6 add new metods in workFlow to CreateChekout 2025-06-25 04:48:12 +03:30
SamSys
b5afc9eef0 skipRollCall aded 2025-06-25 03:55:09 +03:30
SamSys
83a17a7e86 Contract Sign opreation completed - new option to check workflow to create checkout 2025-06-25 03:50:39 +03:30