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
SamSys
5bdfbc572b
add next deploy and contractingParty add to workshop on AndroidApk page
2025-12-20 18:42:53 +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
722f8dae7c
feat: implement manual verification for institution contracts and add signing type handling
2025-12-20 18:27:17 +03:30
8c6336b9bd
fix: correct IsOldContract logic to properly identify old contracts
2025-12-20 14:35:02 +03:30
e81a3ea7aa
Merge branch 'Feature/contracts/api' into Main
2025-12-20 14:23:47 +03:30
20e3d454cf
feat: add ContractAmountWithTax calculation and update related references
2025-12-20 13:35:52 +03:30
b0d174a575
feat: implement contract printing methods and view models
2025-12-20 13:04:30 +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
01d33ff340
add InstitutionContract Confirm Reminder Sms completed
2025-12-15 18:49:13 +03:30
d2e832d52e
Merge branch 'Feature/program-manager/signalR-notification' into Main
...
# Conflicts:
# ServiceHost/appsettings.Development.json
# ServiceHost/appsettings.json
2025-12-14 12:15:14 +03:30
2d0eb52211
merge from programManager Move
2025-12-13 20:24:20 +03:30
370feca81e
Refactor bug report pages to use string identifiers and improve styling
2025-12-13 18:26:01 +03:30
339cea998a
Merge branch 'Feature/roll-call/camera-bug-report'
...
# Conflicts:
# PersonalContractingParty.Config/PersonalBootstrapper.cs
2025-12-13 17:30:31 +03:30
c9882f0b59
update to 10
2025-12-13 14:54:45 +03:30
b3f42af77c
Refactor bug report system to use Guid for identifiers instead of long
2025-12-13 11:19:17 +03:30
eb49bf771d
changes mongo camera report
2025-12-12 19:42:08 +03:30
27e8a26ed8
Add new domain models and interfaces for project management features
2025-12-08 14:47:03 +03:30
167b2bce09
Implement camera bug report system with CRUD operations and logging
2025-12-07 17:54:55 +03:30
SamSys
582e140726
Merge from programMangeruserAccount
2025-12-07 15:36:10 +03:30
SamSys
80fdd1fece
add programManager Domains and context
2025-12-06 16:58:14 +03:30
6a2e4405de
add check for gender if is empty
2025-12-02 14:00:01 +03:30
e78c838cab
Add method to edit legal party details from institution in contracting party
2025-12-02 13:00:34 +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
40dd90074b
Add discount amount and percentage fields to InstitutionContract entity and database schema
2025-11-29 14:56:45 +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
SamSys
a1d0c3ba5b
Merge from ProgramManagerUserAccount
2025-11-27 10:49:43 +03:30
SamSys
86ac300e00
edit role completed
2025-11-26 13:37:04 +03:30
1eb3b7d066
Merge branch 'Feature/InstitutionContract/edit-phone' into Main
2025-11-25 12:11:22 +03:30
8ec717916c
add unauthenticated edit support for contracting party phone and info in institution contracts
2025-11-25 11:40:44 +03:30
SamSys
90a420c8c5
unitOfWork Added
2025-11-23 12:28:05 +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
3937cd8a9f
feat: add dynamic deduction items for late entry and insurance fines to checkout calculations
2025-11-20 12:58:25 +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
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
SamSys
5a34c9a6c9
Merg from Master
2025-11-18 16:06:13 +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
e81a44dd2f
Merge branch 'Feature/FinancialInvoice/Init'
...
# Conflicts:
# PersonalContractingParty.Config/PersonalBootstrapper.cs
2025-11-17 20:52:31 +03:30
SamSys
f5cb6b276e
RemoveSetting Completed
2025-11-17 17:35:04 +03:30
58e30eb297
Merge branch 'Feature/InstitutionContract/add-workshop-totalAmount-to-list' into Main
2025-11-17 17:12:21 +03:30
