Commit Graph

228 Commits

Author SHA1 Message Date
MahanCh
4ffdf14de2 add excel export for file page 2025-04-14 16:02:51 +03:30
MahanCh
252c601eb4 fix some bugs 2025-04-13 19:36:38 +03:30
SamSys
4f673f22d5 merge from Delete-bug-after-openning-Create-modal into master 2025-04-13 16:54:58 +03:30
SamSys
d4a80f5b87 TemporaryClientRegister -ReviewAndPayment 2025-04-13 16:51:38 +03:30
MahanCh
0c73ac44e8 fix delete bug in customize checkout 2025-04-13 16:45:14 +03:30
MahanCh
059624ff9f fix year and month on creating checkout unofficial 2025-04-13 16:30:09 +03:30
SamSys
408a78fb27 merge from master 2025-04-10 14:38:03 +03:30
SamSys
6f7eb05047 TemporaryClientRegister - Chekout-Bonuses Bug Fixed 2025-04-10 14:23:39 +03:30
SamSys
03ee772974 TemporaryClientRegister - Compelet edcreatWorkshopTemp 2025-04-09 19:18:00 +03:30
MahanCh
53ece03000 fix task schedule bug 2025-04-09 19:12:45 +03:30
MahanCh
d4f56b2d82 add shift duration on create leave 2025-04-08 19:27:25 +03:30
MahanCh
a4bdd55161 fix bug for task schedule 2025-04-08 17:45:57 +03:30
MahanCh
a43e32fa04 merge Task schedule with customize checkout header 2025-04-08 17:04:47 +03:30
MahanCh
4801fcfd89 finish customize chekcout header 2025-04-08 16:50:51 +03:30
MahanCh
caa887cd04 merge from master 2025-04-08 16:33:17 +03:30
MahanCh
baededb717 fix conflict 2025-04-08 16:32:10 +03:30
SamSys
67b2d3ab55 GroupingRollCall fix mobile view proplem 2025-04-07 23:02:43 +03:30
MahanCh
ecfae75010 add task schedule 2025-04-07 19:44:22 +03:30
SamSys
51a4e5c1fe plan and service new 2025-04-06 21:26:07 +03:30
MahanCh
3e914b7b1d fix add reward bug 2025-04-05 12:29:29 +03:30
MahanCh
40f021197b add method for creating reward for kebab mahdi 2025-04-05 09:47:00 +03:30
d5d0634807 revert back 2025-03-30 19:19:34 +03:30
SamSys
44a0a2df86 merge from master 2025-03-30 18:40:03 +03:30
SamSys
6583706db6 Print & delet Permission Customizechekout ajax ug fixed 2025-03-30 18:33:51 +03:30
bf5f416470 Merge branch 'Feature/Customize-Checkout-Header' of https://github.com/syntax24/OriginalGozareshgir into Feature/Customize-Checkout-Header 2025-03-30 13:18:40 +03:30
6526aefbbf fix not found bug in customize checkout 2025-03-30 13:18:33 +03:30
SamSys
1fec40982c Revert "changes"
This reverts commit 677adbeddb.
2025-03-30 04:14:37 +03:30
SamSys
c627ba6d3d merg from master 2025-03-30 03:41:03 +03:30
SamSys
dadf541dd1 Permission for CustomizeCheckoutTemp Bug Fixed 2025-03-30 03:37:55 +03:30
677adbeddb changes 2025-03-30 00:44:01 +03:30
SamSys
e2e0171564 change 2025-03-29 20:23:09 +03:30
e0bdde8264 fix reward paginate problem 2025-03-25 17:30:45 +03:30
67111fff6b add filter for create reward 2025-03-25 17:22:14 +03:30
b621a709aa add reward creation method - fix create left work tremp 2025-03-25 15:36:41 +03:30
SamSys
aa8eac6923 Merge From Master to customizeCheckoutBug 2025-03-25 03:37:21 +03:30
SamSys
1707c90072 tomam for kabab mahdi 2025-03-25 03:35:15 +03:30
9bd85fc22e fix late work hout problem in customize checkout - fix front print problem 2025-03-24 20:55:08 +03:30
SamSys
7f14c14589 appsetting fix to original 2025-03-24 19:27:52 +03:30
SamSys
80486a5f3a Merge From Master 2025-03-24 19:27:03 +03:30
SamSys
9ff7fc7a90 resgisteration test commented 2025-03-24 19:25:52 +03:30
99bfb472b0 fix search bug 2025-03-24 19:11:47 +03:30
SamSys
21b209b83a register 2025-03-24 19:01:13 +03:30
SamSys
14f54149ea appsetting 2025-03-21 19:15:52 +03:30
d2d629d750 fix employee upload picture bug 2025-03-21 18:16:34 +03:30
MahanCh
9311c7bfc7 employee document part 3 2025-03-18 17:03:17 +03:30
MahanCh
f6a710dc03 fix bug employee document part 2 2025-03-18 16:49:57 +03:30
MahanCh
db47f8f354 fix employee document bug and add bank and salary aid in customize checkout list 2025-03-18 16:41:28 +03:30
SamSys
9deb0ca4c6 add permission tag helper 2025-03-17 21:43:43 +03:30
SamSys
c99e242caa permission pug fixed 2025-03-17 21:43:29 +03:30
SamSys
f5a767abc4 appsetting 2025-03-17 21:13:31 +03:30