be7fad2cf5
Merge remote-tracking branch 'origin/Feature/ClientLeavePageApi' into Main
2025-12-24 10:19:31 +03:30
a79f9a28fb
Merge branch 'master' into Main
2025-12-23 20:40:56 +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
30b4f52896
add: refactor RollCall application to support asynchronous operations and enhance transaction handling
2025-12-23 20:16:33 +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
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
SamSys
dd68473150
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
2025-12-23 04:18:08 +03:30
SamSys
72e3859d2c
next ui upload from wbe completed
2025-12-23 04:17:52 +03:30
46d193b45e
Merge branch 'Feature/program-manager/test-upload'
2025-12-22 19:51:49 +03:30
6a446d5972
add: implement AutoStopOverTimeTaskSections command and related functionality
2025-12-22 19:13:34 +03:30
0e91e6f287
Merge remote-tracking branch 'origin/master'
2025-12-22 17:44:20 +03:30
9df56ee19b
Merge branch 'Feature/institution-contract/verify-mannually'
2025-12-22 17:44:04 +03:30
8750604d96
feat: add financial transaction handling during institution contract verification
2025-12-22 17:43:32 +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
12fab5a9a5
add {id:guid} convention for controllers
2025-12-20 20:57:34 +03:30
b4526a4338
Merge branch 'Feature/institution-contract/verify-mannually'
2025-12-20 20:09:13 +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
SamSys
5bdfbc572b
add next deploy and contractingParty add to workshop on AndroidApk page
2025-12-20 18:42:53 +03:30
186cb95c70
refactor: remove unused discount-related classes and update workshop ID handling
2025-12-20 18:37:44 +03:30
b1f9bc98ba
Merge branch 'Feature/institution-contract/verify-mannually' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
# Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs
# Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
2025-12-20 18:33:39 +03:30
4385a65cbc
feat: add manual verification endpoint for institution contracts
2025-12-20 18:27:59 +03:30
722f8dae7c
feat: implement manual verification for institution contracts and add signing type handling
2025-12-20 18:27:17 +03:30
SamSys
07113353c4
add uploadFrontEnd btn to AndroidApk page
2025-12-20 16:01:07 +03:30
93ee88ba46
Merge branch 'Feature/contracts/api' into Main
2025-12-20 15:52:32 +03:30
4b39994de6
feat: add API endpoint for printing multiple contracts
2025-12-20 15:50:34 +03:30
e81a3ea7aa
Merge branch 'Feature/contracts/api' into Main
2025-12-20 14:23:47 +03:30
20c00893b6
feat: add API endpoint for printing contract details and enhance contract print logic
2025-12-20 14:23:23 +03:30
20e3d454cf
feat: add ContractAmountWithTax calculation and update related references
2025-12-20 13:35:52 +03:30
2bf31db6b2
fix: enhance parameter binding logic for route parameters
2025-12-20 12:05:34 +03:30
5de90be51e
Merge branch 'Feature/Insurance/client-api' into Main
2025-12-20 11:25:20 +03:30
3ce4cf3966
add insurance print api for client
2025-12-18 13:34:31 +03:30
a121e62102
Merge branch 'master' into Main
...
# Conflicts:
# 0_Framework/Application/Sms/ISmsService.cs
# ServiceHost/Program.cs
# ServiceHost/Properties/launchSettings.json
2025-12-18 11:01:54 +03:30
4f16d7680c
feat: add insurance client list retrieval with pagination and filtering
2025-12-18 10:59:06 +03:30
SamSys
7a10d5ce59
changes
2025-12-18 10:40:11 +03:30
SamSys
3d88feeee7
Clent Add Employee Change to authorizedCanceled
2025-12-17 19:13:47 +03:30
SamSys
f408624463
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
2025-12-17 13:25:38 +03:30
SamSys
8296292e49
checkout week finder switch fixed bug
2025-12-17 13:25:24 +03:30
be8deef167
fix: update license context setting for Excel packages
2025-12-17 11:33:40 +03:30
84fb29c8c8
feat: enhance project creation validation and add operation result filter
2025-12-16 20:18:54 +03:30
SamSys
3b71b7d707
add pmPermission to claim
2025-12-16 18:24:18 +03:30
ec74db17eb
Merge branch 'master' into Feature/program-manager/set-permission-board
2025-12-16 17:10:41 +03:30
dc118cf18b
Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir
2025-12-16 17:09:54 +03:30
a11e54c333
Add project board detail endpoint & validation improvements
...
- Added GET /board/{id:guid} endpoint to ProjectController for detailed project board info.
- Enforced max length of 15 characters for project names in CreateProjectCommandValidator.
- Improved SetTimeProjectCommandHandler: skip zero/negative initial times, removed duplicate error message, and cleaned up formatting.
- Enhanced RollCallApplication to use employee-specific workshop shift settings when available.
2025-12-16 17:09:28 +03:30
SamSys
2383e7a54f
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
2025-12-16 17:03:02 +03:30
