Commit Graph

260 Commits

Author SHA1 Message Date
MahanCh
e3f29e5efa change header login button 2025-07-29 17:14:51 +03:30
MahanCh
60bd120196 add main page and commented "register" buttons 2025-07-28 12:43:00 +03:30
SamSys
c7b9f2ae20 add RollCall service transaction 2025-07-20 13:14:12 +04:00
MahanCh
ccbc180c96 add checkout salaryAid option To Create 2025-07-16 11:45:45 +03:30
MahanCh
376d9d1d78 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-07-16 10:16:11 +03:30
MahanCh
7ddd51034a revert print confirm employer for block workshop 2025-07-16 10:13:34 +03:30
SamSys
0579692a55 add new descriptonOption to financialStatment 2025-07-16 02:49:48 +04:00
SamSys
e26df8026e add new Description Option to financialStatment create and edit 2025-07-16 02:39:46 +04:00
MahanCh
2bdfdb366e fix create employee by client 2025-07-15 15:39:32 +03:30
MahanCh
b1a5333a25 add archive code to insurance list 2025-07-15 13:55:17 +03:30
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
358544e56c Merge branch 'master' into API 2025-07-13 14:58:30 +03:30
MahanCh
8eb74fea15 refactor: comment InsuranceConfirm Condtion in InsuranceList index.js 2025-07-13 10:24:52 +03:30
MahanCh
e8f7f6b778 fix : update data from edit employee in grouping in cws 2025-07-09 13:01:36 +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
SamSys
45a4a735ca register/init merged 2025-07-08 05:57:22 +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
f2580c8e28 Fix take image bug 2025-07-01 16:09:37 +03:30
MahanCh
b99c503b58 fix create group js bug 2025-06-30 12:16:19 +03:30
MahanCh
80c0ec28d5 finishOffDayOfWeek for CWS 2025-06-29 14:01:47 +03:30
SamSys
9b28c63317 Merge branch 'OpretionForEmployeeOptoins' 2025-06-23 00:34:23 +03:30
SamSys
8fd51f4e42 contractTerm And CutEndYear completed on EmployeeOptions 2025-06-22 23:22:19 +03:30
SamSys
146ab74524 employeeOptions bug fixed 2025-06-22 20:58:56 +03:30
SamSys
fcad12d3ef ClientCreateEmployee change merged 2025-06-22 15:11:51 +03:30
8afdf13863 change string and extract number 2025-06-22 13:21:15 +03:30
a6c25ec8e8 complete front but backend still not finished 2025-06-19 13:51:05 +03:30
7b2eefa954 create employee without auth for client p1 - not finished 2025-06-18 15:31:13 +03:30
831b426f9f initialize options for create and sign in checkout and contract 2025-06-11 21:07:36 +03:30
SamSys
befcc70d46 Client Sidebar bug fixed 2025-06-11 15:34:40 +03:30
3b2fd137e4 fix some style bug 2025-06-09 16:37:57 +03:30
2098e843a5 fix conflict 2025-06-08 16:10:03 +03:30
f6b6dfa046 merge from team work 2025-06-08 16:04:54 +03:30
SamSys
c948498307 merged changes 2025-06-03 21:27:14 +03:30
SamSys
87afbbe44c change of register 2025-06-03 16:48:42 +03:30
16d45c6dc4 merge from master 2025-06-02 22:21:30 +03:30
45e746b194 merge from team work 2025-06-02 22:20:04 +03:30
SamSys
d8c0471878 Client CameraAccounts new permission added 2025-05-31 17:40:42 +03:30
SamSys
e109a41b90 subAccountRole merged 2025-05-31 00:45:26 +03:30
SamSys
0811482370 add selected workshops on editRole subAccount 2025-05-31 00:34:36 +03:30
e889b61d27 test 2025-05-30 18:04:12 +03:30
b492aa39e8 changes 2025-05-30 18:03:47 +03:30
2201ade168 merge from teamwork 2025-05-30 15:45:12 +03:30
SamSys
7c2354b386 institutionContract bug 0 fixed add new date coler for expiered 2025-05-29 03:05:52 +03:30
SamSys
a9c489b43d change 2025-05-27 21:33:09 +03:30
MahanCh
2db6a9695c add access accounts to search 2025-05-27 18:40:42 +03:30