Commit Graph

2077 Commits

Author SHA1 Message Date
gozareshgir
bef21edf22 chnage GetContractAndIncluded 2026-01-26 14:44:30 +03:30
gozareshgir
c151e2d3f7 some changes 2026-01-25 19:40:28 +03:30
gozareshgir
1e36966767 merge from master 2026-01-25 19:39:51 +03:30
gozareshgir
0d2ac58bbb change 2026-01-25 12:52:25 +03:30
43ccb3a1dd Merge remote-tracking branch 'origin/master' 2026-01-24 19:10:59 +03:30
0134111aba fix bug for extensions 2026-01-24 19:10:24 +03:30
gozareshgir
3cc7adae35 Merge branch 'Feature/CheckoutReward' 2026-01-24 18:58:24 +03:30
gozareshgir
c97ea5356f Add Reward To checkout Completed 2026-01-24 18:57:53 +03:30
69f4819bf6 Add Migration For Reward checkout 2026-01-24 16:58:45 +03:30
gozareshgir
1257e15b62 changeMapping 2026-01-24 16:45:10 +03:30
gozareshgir
331fb24a99 CheckoutReward 2026-01-24 16:29:01 +03:30
3be1547137 fix mannually verify error 2026-01-24 16:25:22 +03:30
gozareshgir
1324baa9c7 GetContractsAndIncludeDataDataToCreateCheckout changes 2026-01-24 14:48:35 +03:30
gozareshgir
48cc07bf2a GetContractsAndIncludeDataDataToCreateCheckout 2026-01-22 16:09:27 +03:30
900b4b3f4d add convention for print InstitutionContract for pending data 2026-01-22 12:58:43 +03:30
gozareshgir
d3dacceab1 GetContractToCreateCheckout change 2026-01-22 12:37:28 +03:30
bdc6f95af8 fix activate all after create new 2026-01-22 12:26:13 +03:30
gozareshgir
7a79343b2f GetContractsToCreateCheckout Completed 2026-01-21 19:20:15 +03:30
gozareshgir
dfc392f07a Merge branch 'AdminCheckoutApi' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into AdminCheckoutApi 2026-01-21 12:57:41 +03:30
a68b879e95 comment the unfinished rollcall 2026-01-20 19:58:49 +03:30
161f3a92a7 Merge remote-tracking branch 'origin/AdminCheckoutApi' into AdminCheckoutApi
# Conflicts:
#	CompanyManagment.EFCore/Repository/CheckoutRepository.cs
2026-01-20 19:46:23 +03:30
5a1ec104a1 add salary aid and loan for checkout print 2026-01-20 19:44:40 +03:30
gozareshgir
7fc5ac7ccd change 2026-01-20 18:48:00 +03:30
gozareshgir
5b6f967fca workshopSelectList api and employeeSelectlist 2026-01-20 18:17:32 +03:30
gozareshgir
3317bde6d6 checkout group and one print 2026-01-20 14:16:00 +03:30
gozareshgir
5cd30e5910 Checkout Print Api init 2026-01-19 19:12:48 +03:30
gozareshgir
4463fdc177 Rotating Shift api completed 2026-01-19 13:41:36 +03:30
gozareshgir
2ce63d1e0f Merge branch 'master' into AdminCheckoutApi 2026-01-19 12:57:57 +03:30
gozareshgir
21302803b6 insurance WorkingDays bug Fixed 2026-01-19 12:32:51 +03:30
gozareshgir
38603b2249 rotatingshift init 2026-01-18 18:54:33 +03:30
gozareshgir
bf03247f81 checkout list completed 2026-01-18 15:59:17 +03:30
gozareshgir
12af5dcb56 get checkout list init 2026-01-14 16:39:05 +03:30
gozareshgir
8ec13ffae1 Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir 2026-01-14 14:40:50 +03:30
gozareshgir
5508d4e88f Checkout Compute Minuts Base 2026-01-14 14:39:51 +03:30
43abb74c61 Merge branch 'Feature/program-manager/chat'
# Conflicts:
#	ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs
2026-01-14 10:57:07 +03:30
73e6681baa add message type to search query 2026-01-14 10:46:44 +03:30
90b2fd2eab add order for skills in set time 2026-01-14 10:13:57 +03:30
d9c431e20e add project name search for board list 2026-01-13 09:23:53 +03:30
gozareshgir
2746bf69ea Merge branch 'master' into Feature/SmsRepoetApi 2026-01-12 14:38:15 +03:30
gozareshgir
77dbb50512 BlueDeActiveAfterZeroDebt hangfire completed 2026-01-12 14:32:50 +03:30
gozareshgir
1c7e8824c7 DeActiveInstitutionEndOfContract hangfire completed 2026-01-12 13:10:58 +03:30
0eff1b9a66 change default task priority from medium to low 2026-01-12 12:07:43 +03:30
gozareshgir
0d33d79620 unblock hangfire completed 2026-01-11 22:07:58 +03:30
gozareshgir
e4355faffc block and unblock 2026-01-11 21:10:29 +03:30
gozareshgir
577fe5db76 Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Feature/SmsRepoetApi 2026-01-11 12:58:36 +03:30
587fa40d81 fix percnetage condition 2026-01-10 10:45:38 +03:30
b741ab9ed2 fix contains no element error for empty skills 2026-01-10 10:34:20 +03:30
b6fde4903a Merge branch 'Feature/institution-contract/sent-to-customer-flag' 2026-01-08 15:03:07 +03:30
0772604432 feat: enhance GetMessagesQuery to include additional time notes in message retrieval 2026-01-08 15:02:43 +03:30
SamSys
ec8333c715 merg from master 2026-01-08 15:00:40 +03:30