Commit Graph

138 Commits

Author SHA1 Message Date
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
aeebb983a4 recalculate values grouping 2025-05-19 17:48:13 +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
MahanCh
a9c2f09f9e FIX SubAccountChangePassword 2025-05-11 18:13:39 +03:30
SamSys
51291d6de7 Merge Edit CustomizeChekout after change salaryAid or .... 2025-05-10 20:49:49 +03:30
MahanCh
802f9a39c5 fix small front bugs for salaryAid and edit checkout 2025-05-10 16:40:42 +03:30
MahanCh
a9c5c8f8ca fix js bugs 2025-05-10 14:08:18 +03:30
MahanCh
d1e5adf96f add salaryAid calculation Date and
edit checkout on cahnge salary & ...
2025-05-08 14:08:28 +03:30
SamSys
d1aef862cf merge ModalCamera change Clinet 2025-05-06 21:52:29 +03:30
MahanCh
a6984e5f1b fix little bugs 2025-05-06 18:33:15 +03:30
MahanCh
fe8eb5d92b fix cleave js bug 2025-05-06 18:18:20 +03:30
MahanCh
6eec454685 employeeDocument Refactor 2025-05-05 18:09:53 +03:30
MahanCh
13cad28356 add WorkshopSettingsPage in client 2025-05-05 14:03:33 +03:30
MahanCh
718a7d42b7 fix case history bug 2025-05-04 20:03:04 +03:30
MahanCh
dbc73509b5 Finish recalculation on change CWES 2025-04-30 17:14:02 +03:30
MahanCh
9592960a40 add recalculate values 2025-04-30 14:55:38 +03:30
MahanCh
f901f8a682 change the create leave modal 2025-04-22 19:57:45 +03:30
MahanCh
2901a9ecf4 fix rotating shift validation 2025-04-22 17:39:53 +03:30
MahanCh
7055839538 fix excel bugs 2025-04-22 13:35:15 +03:30
MahanCh
aeb65dc152 add sms report for admin 2025-04-20 20:43:45 +03:30
MahanCh
6b7c3730ad fix loan fine and reward style bug 2025-04-16 20:41:17 +03:30
MahanCh
9cc62d76c2 change side bar names 2025-04-16 20:06:25 +03:30
MahanCh
9eb9c0d49a fix bugs for employees select list 2025-04-16 20:05:21 +03:30
MahanCh
cc740439ec get the employees select2 changes 2025-04-16 20:04:57 +03:30
MahanCh
f2a2afc7a4 fix sidebar bugs 2025-04-16 17:14:23 +03:30
MahanCh
13080fd64c Merge branch 'Feature/Main/Header' into Upload/Dad-mehr 2025-04-13 22:55:04 +03:30
MahanCh
39eb401575 add loan details 2025-04-13 22:51:21 +03:30
MahanCh
ac46886922 add grouping search for loan reward SA fine 2025-04-13 22:23:25 +03:30
SamSys
d4a80f5b87 TemporaryClientRegister -ReviewAndPayment 2025-04-13 16:51:38 +03:30
MahanCh
a792936d66 FIx SideBar and add currentDay css 2025-04-12 11:15:54 +03:30
MahanCh
3354e0343c fix case history bug 2025-04-09 19:08:10 +03:30