|
|
5f21b59cb3
|
Merge branch 'Feature/institution-contract/refactor-creation' into Main
# Conflicts:
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
|
2025-12-30 10:42:48 +03:30 |
|
|
|
836e721b6f
|
feat: refactor institution contract creation classes and endpoints
|
2025-12-30 10:38:07 +03:30 |
|
|
|
8fca1f3a91
|
feat: add institution contract creation inquiry functionality
|
2025-12-29 22:19:16 +03:30 |
|
|
|
e0ea5aec53
|
Merge remote-tracking branch 'origin/Main' into Main
|
2025-12-29 19:31:40 +03:30 |
|
SamSys
|
43000bde7e
|
Merge From ClientEmployeeApi
|
2025-12-29 19:26:36 +03:30 |
|
|
|
2984d2a3cf
|
Merge branch 'Main' of https://github.com/syntax24/OriginalGozareshgir into Main
|
2025-12-29 19:16:07 +03:30 |
|
|
|
bc6854f8a7
|
Merge branch 'Feature/institution-contract/verification-modifies' into Main
|
2025-12-29 19:15:37 +03:30 |
|
SamSys
|
6b6ec79faa
|
add PrintAllDetailsPersonnelInfoClient metoth controler
|
2025-12-29 17:57:24 +03:30 |
|
SamSys
|
1304a3e8ef
|
Merge branch 'master' into Feature/ClientEmployeePageApi
|
2025-12-29 17:03:07 +03:30 |
|
SamSys
|
6154c2c7f5
|
selectlist employee refactor
|
2025-12-29 17:01:06 +03:30 |
|
SamSys
|
647909319f
|
refactor selectList
|
2025-12-29 17:00:42 +03:30 |
|
|
|
4ed1907075
|
feat: add GetWorkingEmployeesSelectList method and update controller to use it
|
2025-12-29 16:42:44 +03:30 |
|
SamSys
|
d2acf59eba
|
PrintAllEmployeesInfoClient api
|
2025-12-29 16:14:25 +03:30 |
|
SamSys
|
3139552217
|
Change Method name
|
2025-12-29 13:41:23 +03:30 |
|
|
|
84416fe1f5
|
feat: add validation for in-person contract approval and suppress documentation warnings
|
2025-12-29 13:29:32 +03:30 |
|
SamSys
|
ed8f9558d6
|
change
|
2025-12-29 09:57:34 +03:30 |
|
SamSys
|
dc4c8e9a26
|
get employee List for api completed
|
2025-12-28 18:45:32 +03:30 |
|
|
|
d22805892a
|
Merge branch 'Feature/Insurance/client-api'
# Conflicts:
# CompanyManagment.EFCore/Repository/InsuranceListRepository.cs
|
2025-12-28 18:25:14 +03:30 |
|
|
|
4da496cab8
|
Merge branch 'Feature/contracts/api'
|
2025-12-28 13:08:56 +03:30 |
|
SamSys
|
0e7cb00a9f
|
Merge branch 'Feature/ClientLeavePageApi' into Main
|
2025-12-27 17:00:07 +03:30 |
|
SamSys
|
a98300cacd
|
GetHourlyLeaveDuration
|
2025-12-27 15:49:39 +03:30 |
|
SamSys
|
ee486eb706
|
mearge from clientleavePageApi
|
2025-12-27 14:11:16 +03:30 |
|
SamSys
|
daded35ab1
|
Merge branch 'master' into Feature/ClientLeavePageApi
|
2025-12-27 14:06:29 +03:30 |
|
SamSys
|
ba778bb519
|
LeaveListPrint
|
2025-12-27 14:06:10 +03:30 |
|
|
|
b58481a36f
|
add employee client api
|
2025-12-24 18:07:43 +03:30 |
|
|
|
4f0e5a34a4
|
add: implement reactivation logic for institution contracts and retrieve previous contracts
|
2025-12-24 15:40:06 +03:30 |
|
SamSys
|
57d13b9bed
|
Merge branch 'Feature/ClientLeavePageApi' into Main
|
2025-12-24 12:54:18 +03:30 |
|
SamSys
|
4bc65e500d
|
Merge branch 'Feature/ClientLeavePageApi' of https://github.com/samsyntax24/OriginalGozareshgir into Feature/ClientLeavePageApi
|
2025-12-24 11:53:15 +03:30 |
|
|
|
2e274dd280
|
Merge branch 'Feature/ClientLeavePageApi' into Main
|
2025-12-24 11:18:25 +03:30 |
|
|
|
07587d162f
|
add: implement PrintAllAsync and PrintOneAsync methods for leave printing functionality
|
2025-12-24 11:17:53 +03:30 |
|
|
|
be7fad2cf5
|
Merge remote-tracking branch 'origin/Feature/ClientLeavePageApi' into Main
|
2025-12-24 10:19:31 +03:30 |
|
|
|
0d4b5774b6
|
Merge remote-tracking branch 'origin/Main' into Main
# Conflicts:
# CompanyManagment.Application/InstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs
|
2025-12-23 20:18:37 +03:30 |
|
SamSys
|
59bbb7aae6
|
ini leave groupList
|
2025-12-23 18:15:48 +03:30 |
|
SamSys
|
89de3162de
|
GetLewvList Api
|
2025-12-23 17:03:54 +03:30 |
|
SamSys
|
4ac51f24b5
|
marge from master
|
2025-12-23 15:14:15 +03:30 |
|
|
|
a1736fa3cc
|
refactor: clean up InstitutionContractApplication and remove unused properties from InstitutionContractPrintViewModel
|
2025-12-23 11:20:10 +03:30 |
|
|
|
62f6817640
|
Merge remote-tracking branch 'origin/Main' into Main
# Conflicts:
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
# Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs
# Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.Application/InstitutionContractApplication.cs
# ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
|
2025-12-23 11:13:46 +03:30 |
|
|
|
1a91743916
|
add: update CalculateDiscount method to include contractStart parameter
|
2025-12-23 10:50:11 +03:30 |
|
SamSys
|
21b69edf93
|
merg from ServiceAmountsmanagment
|
2025-12-22 14:22:38 +03:30 |
|
SamSys
|
82bf10c2d5
|
ServiceAmount GetList
|
2025-12-22 14:21:01 +03:30 |
|
SamSys
|
68b42c98d6
|
changes
|
2025-12-22 13:24:53 +03:30 |
|
SamSys
|
f13688ccb2
|
changes
|
2025-12-22 13:24:44 +03:30 |
|
SamSys
|
bb9074df34
|
merge from ServiceAmountsManagment
|
2025-12-22 13:24:03 +03:30 |
|
SamSys
|
19a72ac78d
|
load data and create service percentage
|
2025-12-22 12:35:51 +03:30 |
|
|
|
04c65eae93
|
Merge branch 'Feature/institution-contract/print'
# Conflicts:
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
|
2025-12-20 20:10:30 +03:30 |
|
|
|
b4526a4338
|
Merge branch 'Feature/institution-contract/verify-mannually'
|
2025-12-20 20:09:13 +03:30 |
|
|
|
a9511ffa82
|
Merge branch 'Feature/institution-contract/print' into Main
|
2025-12-20 19:38:55 +03:30 |
|
|
|
56e79d2099
|
fix: correct ContractAmountWithTax calculation for old contracts
|
2025-12-20 19:38:32 +03:30 |
|
|
|
18da3221d7
|
Merge branch 'Feature/institution-contract/print' into Main
# Conflicts:
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
|
2025-12-20 19:21:16 +03:30 |
|
|
|
93891f3837
|
add one month more details for InstitutionContract.cs print
|
2025-12-20 19:18:27 +03:30 |
|
