33a2c0be95
Merge branch 'Feature/EmployeesBankInfo/client-api' into Main
2026-02-02 10:23:17 +03:30
fedfc372d0
add BankController and methods for retrieving bank list; update EmployeeBankInfoController with Excel download functionality
2026-02-02 10:22:34 +03:30
db26c29057
Merge branch 'Feature/EmployeesBankInfo/client-api' into Main
2026-02-01 18:16:33 +03:30
gozareshgir
c51bb90a2b
merge from master
2026-01-27 14:14:40 +03:30
gozareshgir
c97ea5356f
Add Reward To checkout Completed
2026-01-24 18:57:53 +03:30
gozareshgir
331fb24a99
CheckoutReward
2026-01-24 16:29:01 +03:30
ce836476a1
Merge branch 'Feature/program-manager/request-additional-time' into Main
...
# Conflicts:
# ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/ProjectTask.cs
2026-01-24 14:04:29 +03:30
gozareshgir
3bb16c02b4
merge from AdminCheckoutApi
2026-01-21 19:57:48 +03:30
gozareshgir
5b6f967fca
workshopSelectList api and employeeSelectlist
2026-01-20 18:17:32 +03:30
4bde4ade2d
add time request status
2026-01-20 11:01:58 +03:30
gozareshgir
5cd30e5910
Checkout Print Api init
2026-01-19 19:12:48 +03:30
gozareshgir
7bb507c841
merge from adminCheckoutApi
2026-01-18 18:07:10 +03:30
e9d0efc52f
Merge branch 'Feature/roll-call/client-api' into Main
...
# Conflicts:
# CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs
# CompanyManagment.EFCore/Repository/RollCallRepository.cs
2026-01-18 13:18:27 +03:30
301a8f06f4
Merge branch 'Feature/Checkout/client-api' into Main
2026-01-18 13:15:37 +03:30
63a3027a17
add client checkout list controller
2026-01-18 12:51:58 +03:30
gozareshgir
12af5dcb56
get checkout list init
2026-01-14 16:39:05 +03:30
1382305433
add EmployeeBankInfoController.cs and set api for get list and get details
2026-01-14 16:32:46 +03:30
d179c90c48
change paginated to list
2026-01-13 18:31:10 +03:30
gozareshgir
377f95561c
Merge branch 'Feature/SmsRepoetApi' into Main
2026-01-13 16:43:29 +03:30
gozareshgir
b5c5be2cb6
change smsResult grouping
2026-01-13 16:26:04 +03:30
gozareshgir
2e95846336
Merge branch 'Feature/SmsRepoetApi' into Main
2026-01-13 11:40:46 +03:30
b286923dfe
Merge branch 'Feature/fine/client-api' into Main
...
# Conflicts:
# .gitignore
# ServiceHost/Program.cs
2026-01-13 11:30:45 +03:30
gozareshgir
f7bfa37a77
SmsSettings List , create, edit, delete
2026-01-13 11:17:25 +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
gozareshgir
e4355faffc
block and unblock
2026-01-11 21:10:29 +03:30
05d860795e
add rollcall title case history query
2026-01-11 15:12:08 +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
SamSys
0ab3052251
Send Warning and leagal action Message
2026-01-08 14:04:34 +03:30
SamSys
35e6355069
get Warning sms List on new repo
2026-01-08 11:19:25 +03:30
SamSys
07a4ce1f64
merge from SmsReportApi
2026-01-07 18:40:15 +03:30
SamSys
4de2e12ac5
AmaApiReport
2026-01-07 18:38:12 +03:30
SamSys
7207172ce0
Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main
2026-01-07 16:29:51 +03:30
SamSys
48b75d2baa
Sms Report get list init
2026-01-07 16:29:03 +03:30
7ba85fe1aa
Merge branch 'Feature/institution-contract/sent-to-customer-flag' into Main
2026-01-07 15:03:51 +03:30
4ade9e12a6
feat: add InstitutionContractIsSentFlag to track contract send status
2026-01-07 15:03:21 +03:30
SamSys
63edb33bf5
Sms Report Init
2026-01-07 14:49:44 +03:30
dd7e816767
feat: add SetContractSendFlag method and related request for contract send tracking
2026-01-07 14:46:34 +03:30
1deeff996f
feat: implement InstitutionContractSendFlag repository and model for contract send tracking
2026-01-07 14:35:17 +03:30
SamSys
ebcb7530e0
Merge branch 'WorskhopClassifiedPlan' into Main
2026-01-06 17:36:05 +03:30
SamSys
9ff9b0be18
add salary list
2026-01-06 17:33:40 +03:30
SamSys
ceb328cfa7
Save AddOrEdit Jobs to group
2026-01-06 15:28:12 +03:30
SamSys
ba88a012ff
Merge branch 'WorskhopClassifiedPlan' into Main
2026-01-05 16:48:11 +03:30
SamSys
e4c41bb704
JobSelectList api
2026-01-05 16:41:58 +03:30
SamSys
94466bbb27
merge from ClassificationScheme
2026-01-05 15:41:22 +03:30
SamSys
be4bc2c900
GroupAndJobList
2026-01-04 19:13:46 +03:30
SamSys
ef86c6d07d
Merge from ClassificationScheme
2026-01-04 16:06:15 +03:30
SamSys
5b15596696
SchemeList, Edit, Create, delete
2026-01-04 15:35:06 +03:30
d7dd91eaba
Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir into Main
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-01-01 12:30:38 +03:30
SamSys
946024d81e
Merg from Master
2026-01-01 12:29:39 +03:30