Commit Graph

1746 Commits

Author SHA1 Message Date
ff04dff0ca Merge remote-tracking branch 'origin/Main' into Main 2025-12-01 12:27:02 +03:30
SamSys
c04089b68a Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main 2025-12-01 11:49:15 +03:30
SamSys
d9ee96c057 change edit role 2025-12-01 11:49:05 +03:30
fc45e46502 Merge branch 'Feature/InstitutionContract/set-discount' into Main 2025-11-29 14:57:25 +03:30
40dd90074b Add discount amount and percentage fields to InstitutionContract entity and database schema 2025-11-29 14:56:45 +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
c2d9d809f1 Fix misplaced CreateLegalContractingPartyEntity method and correct method ordering 2025-11-29 09:48:07 +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
f3fa76c292 Prevent duplicate financial invoices by checking for existing unpaid invoices before creation 2025-11-27 11:39:03 +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
ac6bbc3587 service 2025-11-26 20:15:54 +03:30
947d7590f4 Fix contract validation and authentication checks
Updated authentication checks for LegalParty and RealParty to
prevent null reference exceptions by ensuring existingContractingParty
is not null before invoking unauthentication methods.

Added a validation step to prevent duplicate contracts by checking
for existing records in the repository based on ContractingPartyId,
RepresentativeId, and TypeOfContract.
2025-11-26 19:47:24 +03:30
91403a52a3 Replace VerifySend with SendInstitutionVerificationCode
Replaced the `_smsService.VerifySend` method with the new
asynchronous `_smsService.SendInstitutionVerificationCode`
method. The new method includes additional parameters:
`contractingPartyFullName`, `contractingParty.id`, and
`institutionContract.id`, providing more context for the
verification process. Added `await` to ensure proper
asynchronous execution.
2025-11-26 18:25:26 +03:30
7e80342f80 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-11-26 17:12:02 +03:30
5e92207778 Refactor financial transaction and invoice handling
Refactored and streamlined the handling of financial transactions, invoices, and installment logic in `InstitutionContractApplication` and `InstitutionContractRepository`. Removed redundant code and consolidated logic for creating financial transactions and invoices into a reusable structure.

- Delegated financial transaction and invoice creation to the application layer.
- Simplified installment handling by directly managing installment lists.
- Introduced modular logic for handling installment and full payment scenarios.
- Replaced redundant `FinancialInvoice` and `FinancialInvoiceItem` creation in the repository layer.
- Added logic to retrieve `financialStatement` from the repository when available.
- Improved consistency in handling `invoiceAmount` across payment-related operations.
- Removed unused code for unpaid invoice retrieval and associated logic.
- Added support for creating `CreateContactInfo` objects for institution contracts.

These changes improve code maintainability, readability, and modularity by reducing duplication and ensuring responsibilities are handled at the appropriate layers.
2025-11-26 17:11:53 +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
409fc0df96 Merge remote-tracking branch 'origin/Main' into Main 2025-11-25 16:46:38 +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
Mahan Chamani
ca520c7291 Update dotnet-developPublish.yml 2025-11-25 15:41:25 +03:30
2d28bd1f98 Merge branch 'Feature/InstitutionContract/edit-phone' 2025-11-25 15:30:46 +03:30
0a3bdb2720 Merge branch 'master' into Main 2025-11-25 13:06:36 +03:30
75ae3efb65 refactor UidService to improve code formatting and readability 2025-11-25 12:56:21 +03:30
eb53fd67ef update mobile and national code matching logic in temporary client registration and increase UidService timeout 2025-11-25 12:52:49 +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
64bdbcbd2d update authentication error handling to include status code 3 as unavailable 2025-11-24 19:35:49 +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
90a420c8c5 unitOfWork Added 2025-11-23 12:28:05 +03:30
SamSys
e6640a1636 remove PitzaAmir(resturan) HasRollCallRecord sekip condition 2025-11-22 19:53:09 +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