MahanCh
|
bdc5ccae13
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-26 17:36:44 +03:30 |
|
MahanCh
|
d37ad552df
|
feat: add ContractStart and ContractEnd properties to institution contract response
|
2025-08-26 17:36:12 +03:30 |
|
MahanCh
|
9c04fd439d
|
Merge branch 'fix/institution-contract/add-contracting-partyId' into Main
# Conflicts:
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
|
2025-08-26 12:31:38 +03:30 |
|
MahanCh
|
2b3067dab2
|
fix: add ContractingPartyId to institution contract list items
|
2025-08-26 12:29:17 +03:30 |
|
MahanCh
|
86682a28e2
|
feat: add method to update institution contract status based on workshop completion
|
2025-08-26 11:28:18 +03:30 |
|
MahanCh
|
5720c30f7a
|
feat: add method to include workshop details in institution contract retrieval
|
2025-08-26 11:17:16 +03:30 |
|
MahanCh
|
c90a68a8cc
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-26 10:45:29 +03:30 |
|
MahanCh
|
a71205aa2b
|
feat: add LawType property to Law model and update related classes
|
2025-08-26 10:43:05 +03:30 |
|
MahanCh
|
641dcc1767
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-26 09:58:15 +03:30 |
|
MahanCh
|
b1a15bfa54
|
feat: update institution plan calculator to use total amount directly and remove workshop list parameter
|
2025-08-26 09:57:50 +03:30 |
|
MahanCh
|
d4f9c810ea
|
feat: implement workshop creation workflow and enhance employer registration process
|
2025-08-25 18:24:07 +03:30 |
|
MahanCh
|
09574150b6
|
feat: add employer creation functionality and institution workshop detail retrieval
|
2025-08-25 17:06:44 +03:30 |
|
MahanCh
|
7ccf600885
|
feat: add contact info creation and account registration in institution contract process
|
2025-08-25 16:23:14 +03:30 |
|
MahanCh
|
a7b7bfc745
|
feat: add grouping SVG and update image reference in rollcall
|
2025-08-25 15:03:39 +03:30 |
|
MahanCh
|
170a0ddba0
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-25 14:42:43 +03:30 |
|
MahanCh
|
33a736ab5d
|
feat: remove payment model parameter from GetTotalPaymentAndWorkshopList method
|
2025-08-25 14:42:27 +03:30 |
|
MahanCh
|
fa5e079db5
|
fix: update image references for contract and insurance sections
|
2025-08-25 14:31:24 +03:30 |
|
MahanCh
|
e34fef37d7
|
Merge branch 'master' into Main
|
2025-08-23 16:28:04 +03:30 |
|
MahanCh
|
5e7bfe0634
|
fix: improve case history data handling and add debugging logs
|
2025-08-23 16:22:26 +03:30 |
|
MahanCh
|
23723e4b7a
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-23 15:05:01 +03:30 |
|
MahanCh
|
859f8ea8ca
|
feat: update financial response models to use string type for amounts
|
2025-08-23 15:04:42 +03:30 |
|
MahanCh
|
2732ec09b2
|
fix: sort payment transactions by creation date
|
2025-08-23 13:11:10 +03:30 |
|
MahanCh
|
3744b5f470
|
Merge branch 'fix/payment-transaction/list-bug' into Main
|
2025-08-23 13:02:57 +03:30 |
|
MahanCh
|
13d93b3e1d
|
fix: handle null card numbers in payment transaction list
|
2025-08-23 13:02:03 +03:30 |
|
MahanCh
|
db78fb1cd4
|
Merge branch 'master' into Main
|
2025-08-23 11:55:57 +03:30 |
|
MahanCh
|
7ce2142517
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs
|
2025-08-23 11:54:09 +03:30 |
|
MahanCh
|
98146b4aa7
|
fix: calculate balance correctly in financial transaction details
|
2025-08-23 11:53:08 +03:30 |
|
MahanCh
|
5f65c13b45
|
fix: calculate balance correctly in financial transaction details
|
2025-08-23 11:51:46 +03:30 |
|
MahanCh
|
8bde7aa3d1
|
feat: add PublicId to institution contract and update response models for calculators
|
2025-08-23 10:50:07 +03:30 |
|
SamSys
|
da8579d2a6
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-22 01:07:04 +03:30 |
|
SamSys
|
41503101b6
|
create rollcallservice transaction chnages
|
2025-08-22 00:58:42 +03:30 |
|
syntax24
|
1cd4cd4b49
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-21 16:46:56 +03:30 |
|
syntax24
|
7afa112e63
|
appsettings.dev changes
|
2025-08-21 16:46:40 +03:30 |
|
SamSys
|
3aa5668696
|
CustomizeCheckout enable or disable on client menu bug fixed
|
2025-08-21 16:44:51 +03:30 |
|
MahanCh
|
76e5a93ee5
|
feat: update RegistrationStatus to use string type and add Completed status
|
2025-08-21 13:50:27 +03:30 |
|
MahanCh
|
469a8808d1
|
refactor: remove TODO comment for amount calculation in InstitutionContractApplication
|
2025-08-21 13:32:50 +03:30 |
|
MahanCh
|
d3157780ea
|
feat: refactor registration workflow to use InstitutionContractDuration and add new endpoint for registration workflow items
|
2025-08-21 13:32:24 +03:30 |
|
MahanCh
|
2d2dc24280
|
Merge branch 'Main' into Feature/InstitutionContract/add-registration-style
|
2025-08-21 11:53:32 +03:30 |
|
MahanCh
|
362b306c48
|
feat: add InstitutionContractWorkshopDetail and related mappings for workshop management
|
2025-08-21 11:05:26 +03:30 |
|
MahanCh
|
b0c02d47c4
|
fix: update HTTP POST routes to include ID parameter for contract actions
|
2025-08-21 10:05:26 +03:30 |
|
MahanCh
|
6869ccb436
|
feat: update registration status handling in InstitutionContract and Workshop models
|
2025-08-21 09:55:41 +03:30 |
|
MahanCh
|
605fe16ced
|
feat: add registration details and pricing to InstitutionContract and related models
|
2025-08-21 09:32:49 +03:30 |
|
MahanCh
|
dfb78db2fa
|
feat: add installment management to InstitutionContract and related classes
|
2025-08-20 13:32:55 +03:30 |
|
SamSys
|
13ebe2fc2a
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-20 03:33:11 +03:30 |
|
SamSys
|
54fbbc964f
|
change OvertTimeWOrking Compute - Send EmployeeMandatoryHours To Save
|
2025-08-20 03:27:54 +03:30 |
|
MahanCh
|
f0daa0b283
|
feat: add workshop details handling to InstitutionContract and InstitutionContractApplication
|
2025-08-19 14:52:52 +03:30 |
|
MahanCh
|
82f68d1bbe
|
feat: add ContractingPartyId property to EditInstitutionContractRequest
|
2025-08-19 14:43:43 +03:30 |
|
MahanCh
|
48c2186110
|
feat: enhance CreateInstitutionContractRequest with detailed properties and enums for legal and real parties
|
2025-08-19 14:41:50 +03:30 |
|
MahanCh
|
72fe632516
|
Merge branch 'fix/client-menu/customize-checkout-bug' into Main
|
2025-08-18 11:59:44 +03:30 |
|
MahanCh
|
b92aaaffa0
|
fix: enable and manage customize checkout options in client menu
|
2025-08-18 11:55:34 +03:30 |
|