fc45e46502
Merge branch 'Feature/InstitutionContract/set-discount' into Main
2025-11-29 14:57:25 +03:30
452b0b6277
Refactor institution contract discount calculation to use TotalAmount instead of PaymentAmount
2025-11-29 13:26:04 +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
95891d5bae
Handle BuyInstitutionContractInstallment items in invoice processing and add GetIdByInstallmentId method
2025-11-27 21:12:52 +03:30
4c58942e15
delete end region
2025-11-27 20:58:01 +03:30
edf8c8c92d
add missing #endregion in Program.cs for code region clarity
2025-11-27 15:04:30 +03:30
SamSys
8eaeefecc8
change
2025-11-27 13:41:32 +03:30
SamSys
911c29ea6b
fix httpContext to get url on program.cs
2025-11-27 13:21:48 +03:30
8fc798746f
Refactor error handling and IHttpContextAccessor usage
...
Simplified error message construction in RoleApplication.cs by
removing redundant properties. Refactored IHttpContextAccessor
registration in Program.cs to use the service provider after
app initialization. Removed redundant no-op code in
NullFaceEmbeddingNotificationService.cs.
2025-11-27 12:45:18 +03:30
3526fdbf2f
update domain checks for InternalApi baseUrl and improve error details in RoleApplication
2025-11-27 12:16:55 +03:30
SamSys
9d0bb7df0e
InternalApi appsetiings change
2025-11-27 11:25:46 +03:30
SamSys
a1d0c3ba5b
Merge from ProgramManagerUserAccount
2025-11-27 10:49:43 +03:30
SamSys
16b04fc75c
ProgrmmaagerUserAccount completed
2025-11-27 10:48:03 +03:30
SamSys
29484e9565
changes
2025-11-26 13:50:28 +03:30
SamSys
86ac300e00
edit role completed
2025-11-26 13:37:04 +03:30
ba640494d2
update workshop plan calculation to use latest roll call service status
2025-11-26 12:36:51 +03:30
6974a505b4
Refactor contract logic and improve async handling
...
Refactored the `InstitutionContractListStatus.PendingForRenewal` logic in `InstitutionContractRepository.cs` to include additional checks for conflicting contracts.
Updated `OnPostShiftDateNew` in `Index.cshtml.cs` to be asynchronous, removed unused code, and added a call to the new `UpdateInstitutionContract` method.
Introduced `UpdateInstitutionContract` to filter contracts by a predefined list of IDs and streamline related entity inclusion.
2025-11-26 11:52:37 +03:30
7533bc821a
Merge branch 'Feature/client/dashboard' into Main
2025-11-25 16:46:20 +03:30
6d3d599449
add DashboardController to provide client dashboard view with calendar and holiday information
2025-11-25 16:45:36 +03:30
1eb3b7d066
Merge branch 'Feature/InstitutionContract/edit-phone' into Main
2025-11-25 12:11:22 +03:30
7e9ba23b97
add Excel export for workshop roll call data with new exporter and view model
2025-11-23 12:52:07 +03:30
SamSys
e9665c190b
Remove pitzaamir(resturan) costum static checkout Condition
2025-11-22 19:50:48 +03:30
SamSys
73563b0421
add create ProgramManagerAccount Api
2025-11-22 19:47:11 +03:30
bc3cb5b115
Merge branch 'master' into Main
2025-11-22 15:43:35 +03:30
ea3baf14e8
add HttpPost attribute to Create action in ContactUsController
2025-11-22 15:43:19 +03:30
aabb53c6d2
Merge branch 'master' into Main
2025-11-22 15:29:30 +03:30
36f104f316
add ContactUsController to handle contact us form submissions
2025-11-22 15:27:49 +03:30
SamSys
e704258c23
merg from master
2025-11-20 16:02:29 +03:30
9e61bd3f55
Merge branch 'master' into Feature/customize-checkout/pizza-amir
2025-11-20 15:21:06 +03:30
7025478417
feat: add dynamic deduction items to customize checkout and temp entities with migration
2025-11-20 15:20:45 +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
933dd3d937
Enhance face embedding service notifications and error handling; add new shift date actions and improve UidService timeout
2025-11-20 10:52:29 +03:30
37aa57d773
Refactor repository and remove unused Index files
...
Refactored `IPersonalContractingPartyRepository` to replace `GetByRegisterId` with `GetByNationalId`. Updated `InstitutionContractApplication` to use the new method and removed duplicate `RegisterId` validation logic.
Removed `Index.cshtml` and `Index.cshtml.cs` files, including all associated HTML, scripts, styles, and backend logic, indicating a deprecation or restructuring of the related functionality.
2025-11-19 19:16:55 +03:30
2035b6fff8
feat: add dynamic deductions to checkout model and enhance roll call difference calculations
2025-11-19 10:45:40 +03:30
SamSys
d31cf8470f
Sms Sttings Update
2025-11-18 19:13:09 +03:30
SamSys
5a34c9a6c9
Merg from Master
2025-11-18 16:06:13 +03:30
SamSys
4eb78996d5
Instan Send Block Sms Completed
2025-11-18 15:59:02 +03:30
SamSys
9d8e40c841
Instant block sms started
2025-11-18 15:14:18 +03:30
SamSys
4ba21db7c7
Instant Send Smms for reminder completed
2025-11-18 15:10:32 +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
e81a44dd2f
Merge branch 'Feature/FinancialInvoice/Init'
...
# Conflicts:
# PersonalContractingParty.Config/PersonalBootstrapper.cs
2025-11-17 20:52:31 +03:30
