Commit Graph

170 Commits

Author SHA1 Message Date
MahanCh
2bdfdb366e fix create employee by client 2025-07-15 15:39:32 +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
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
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
SamSys
befcc70d46 Client Sidebar bug fixed 2025-06-11 15:34:40 +03:30
SamSys
c948498307 merged changes 2025-06-03 21:27:14 +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
7d1eb780a5 amo merged 2025-05-25 21:56:13 +03:30
MahanCh
7bcc052ec6 finish AMO 2025-05-25 21:19:31 +03:30
SamSys
659f647b31 static print merged 2025-05-24 18:45:39 +03:30
SamSys
3058f95e0e EmployeDocment Upload change size 2025-05-20 22:37:21 +03:30
SamSys
8fa8c33415 ReCalculate Values meged 2025-05-20 22:19:54 +03:30
MahanCh
59112d9635 add static checkout style 2025-05-20 18:34:30 +03:30
MahanCh
987c1b51fa merge from loan added to checkout 2025-05-20 17:47:34 +03:30
MahanCh
99e807fa23 fix step4 bug 2025-05-20 17:45:43 +03:30
MahanCh
2ce17dcac9 change some styles 2025-05-19 18:04:47 +03:30
MahanCh
233c1a3aa9 merge from master 2025-05-19 18:04:36 +03:30
MahanCh
aeebb983a4 recalculate values grouping 2025-05-19 17:48:13 +03:30
MahanCh
37cd07c2b8 fix conflict 2025-05-18 17:54:55 +03:30
MahanCh
6201492879 change step4 2025-05-18 17:52:33 +03:30
SamSys
489528d076 new version of Register 2025-05-14 21:24:06 +03:30
SamSys
b8e831ce4d RotatingShiftReport BackEnd Changed 2025-05-14 18:51:36 +03:30
MahanCh
3c73a277ce fix case history bug 2025-05-14 18:36:46 +03:30
MahanCh
56def568b5 fix bugs 2025-05-14 16:26:53 +03:30
MahanCh
ffa728d05d send missed merge 2025-05-13 22:05:41 +03:30
MahanCh
30c70c83b2 recalculte values group 2025-05-13 19:39:19 +03:30
MahanCh
ec0996f53c Add rotating shift report 2025-05-13 19:21:26 +03:30
SamSys
88a0552a07 Sepration js client/Contract/index 2025-05-13 15:39:49 +03:30
MahanCh
541f60d6cd finish loan and salaryAid to Checkout 2025-05-12 17:40:46 +03:30
MahanCh
71c55cd779 fix new employee bug 2025-05-12 15:20:52 +03:30