60a1d1cd8e
Merge branch 'master' into Main
2025-12-28 19:31:51 +03:30
8b6786c09a
add route for excel download
2025-12-28 19:20:25 +03:30
45c5d20323
add excel download
2025-12-28 19:17:50 +03:30
aa0eae6c83
feat: implement Excel export for institution contracts with categorized tabs
2025-12-28 13:01:40 +03:30
SamSys
4ac51f24b5
marge from master
2025-12-23 15:14:15 +03:30
8750604d96
feat: add financial transaction handling during institution contract verification
2025-12-22 17:43:32 +03:30
SamSys
bb9074df34
merge from ServiceAmountsManagment
2025-12-22 13:24:03 +03:30
4385a65cbc
feat: add manual verification endpoint for institution contracts
2025-12-20 18:27:59 +03:30
SamSys
582e140726
Merge from programMangeruserAccount
2025-12-07 15:36:10 +03:30
d2f0ed46ae
Refactor discount calculation and response models for institution contracts
...
- Replace InstitutionContractExtensionPaymentResponse with InstitutionContractDiscountResponse in discount-related methods and endpoints
- Update request and response models to include OneMonthAmount, Obligation, and improved discount fields
- Adjust method signatures and controller actions to use new response types
- Refactor discount calculation logic to support new structure and ensure correct plan updates for both installment and one-time payments
- Improve naming consistency for discount percentage fields
2025-11-29 20:07:29 +03:30
8015e583bf
Merge branch 'Feature/InstitutionContract/set-discount' into Main
2025-11-29 11:31:10 +03:30
5e5910e0fd
Add [FromBody] attribute to ResetDiscountForCreate endpoint parameter
2025-11-29 11:30:49 +03:30
524660d7b4
Merge branch 'Feature/InstitutionContract/set-discount' into Main
2025-11-29 11:12:03 +03:30
5d81731512
Add reset discount functionality for institution contract creation and extension
2025-11-29 11:11:34 +03:30
b5d52feee4
Merge branch 'Feature/InstitutionContract/set-discount' into Main
...
# Conflicts:
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
2025-11-29 09:45:43 +03:30
511932fa58
Add discount support for institution contract extensions
...
- Introduce DiscountPercentage and DiscountAmount fields to contract creation and payment models
- Implement discount calculation logic in repository
- Add SetDiscountForExtension API endpoint and related request/response models
- Update contract creation and extension flows to handle discounts
2025-11-29 09:44:30 +03:30
ea153d17b7
Merge branch 'master' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.Application/InstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-11-20 11:11:06 +03:30
dce24e3849
Merge branch 'Feature/InstitutionContract/add-workshop-totalAmount-to-list' into Main
2025-11-18 15:08:52 +03:30
f112bab021
Add endpoint for workshop details: implement GetWorkshopsDetails method in institutionContractController
2025-11-18 15:07:38 +03:30
00ffb08e2e
Merge branch 'Feature/InstitutionContract/add-workshop-totalAmount-to-list' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.Application/InstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-11-18 14:55:54 +03:30
8b39eed7bb
Add workshop total amount details: include price properties in InstitutionContract and implement GetContractWorkshopsDetails method
2025-11-18 14:53:08 +03:30
164388dac3
Update payment redirect logic in Verify method to include callback URL
2025-11-18 12:46:50 +03:30
f238b5af6b
Enhance financial invoice handling by adding InvoiceNumber property and increasing DescriptionOption max length; implement SetPendingWorkflow method
2025-11-17 20:51:21 +03:30
ed746cb60a
Refactor invoice handling to use TransactionId and add InvoiceNumber property
2025-11-17 17:06:31 +03:30
7b71bd36b1
feat: add verification status and amendment tracking to institution contract models
2025-10-27 15:22:45 +03:30
62900a22a1
feat: add amendment verification details retrieval methods and update related classes
2025-10-27 11:30:56 +03:30
e6977b29fc
feat: add methods for creating institution contract amendment changes and enhance personnel count handling
2025-10-26 14:00:03 +03:30
7cce903f6e
Merge branch 'Feature/InstitutionContract/print-api' into Feature/InstitutionContract/upgrade
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.Application/InstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-10-26 12:03:39 +03:30
6a6e2e532a
feat: add print API for institution contracts and include verifier details
2025-10-23 14:13:55 +03:30
1a70569a36
feat: implement amendment completion functionality with payment details
2025-10-23 11:44:12 +03:30
8d24339f04
Merge branch 'master' into Feature/InstitutionContract/upgrade
...
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-23 09:29:05 +03:30
174edbf87d
Merge branch 'Feature/InstitutionContract/add-old-edit-api' into Main
...
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-22 15:29:43 +03:30
a827470831
feat: add API for editing old institution contracts with new properties
2025-10-22 15:19:17 +03:30
bea858d4e7
feat: add AmendmentComplete method and request class to InstitutionContractApplication
2025-10-22 13:33:30 +03:30
7fd8851f71
refactor: optimize employee count calculation in InstitutionContractRepository
2025-10-21 21:57:04 +03:30
5822005b68
Merge branch 'master' into Feature/InstitutionContract/upgrade
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-21 14:45:22 +03:30
232a834dc9
feat: add resend verification link end point added
2025-10-21 11:41:23 +03:30
c5b521bc50
feat: add endpoints for inserting, removing, and retrieving amendment workshops and payment details
2025-10-21 11:04:46 +03:30
2f38470746
Merge branch 'Feature/InstitutionContract/upgrade' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-10-15 17:49:23 +03:30
23c02abe65
feat: add endpoint to retrieve amendment workshops by institution contract ID
2025-10-15 17:34:16 +03:30
d0b29e7643
feat: add GetInstitutionContractSelectList method for improved search functionality
2025-10-14 14:05:44 +03:30
560ea04f33
refactor: remove unused ExtensionInquiry method and clean up IInstitutionContractApplication interface
2025-10-11 13:28:04 +03:30
4707c389ae
refactor: standardize extension naming and add extension inquiry handling
2025-10-11 10:26:02 +03:30
3fa05b99dd
add [FromBody] attribute to ExtenstionComplete parameter in institutionContractController
2025-10-09 13:48:58 +03:30
d70ea10d2d
add [FromBody] attribute to GetExtenstionPaymentMethod parameter in institutionContractController
2025-10-09 12:32:27 +03:30
9f7d267afb
add payment method handling to InstitutionContractExtension, update repository and controller
2025-10-09 11:54:30 +03:30
4ce82679ff
add extension completion handling in InstitutionContract workflows and update repositories
2025-10-08 18:05:55 +03:30
dbe7aebf37
add institution contract extension plan service and integrate with controller
2025-10-07 17:05:11 +03:30
8912215bbc
rename workshop service calculator route and add placeholders for future methods
2025-10-07 15:08:49 +03:30
6d0072c8ac
add InstitutionContractExtenstionTemp - add mongodb Config
2025-10-06 15:04:26 +03:30
