MahanCh
|
8bde7aa3d1
|
feat: add PublicId to institution contract and update response models for calculators
|
2025-08-23 10:50:07 +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
|
b0c02d47c4
|
fix: update HTTP POST routes to include ID parameter for contract actions
|
2025-08-21 10:05:26 +03:30 |
|
MahanCh
|
605fe16ced
|
feat: add registration details and pricing to InstitutionContract and related models
|
2025-08-21 09:32:49 +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 |
|
MahanCh
|
2a315ff7ae
|
refactor: rename InstitutionContractStatus to InstitutionContractListStatus and update related properties
|
2025-08-18 10:40:17 +03:30 |
|
MahanCh
|
204355acd6
|
add PublicId and RegistrationStatus enum to InstitutionContractTemp and related classes
|
2025-08-16 16:50:29 +03:30 |
|
MahanCh
|
8fd3930393
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-16 11:24:08 +03:30 |
|
MahanCh
|
b2694ca281
|
add temporary institution contract creation functionality
|
2025-08-16 11:23:29 +03:30 |
|
MahanCh
|
7cb3551dc8
|
Merge branch 'Feature/Chcekout/AddHasConflict' into Main
|
2025-08-13 15:52:08 +03:30 |
|
MahanCh
|
873a30ecd1
|
enhance tooltip initialization and clean up code structure
|
2025-08-13 15:51:41 +03:30 |
|
MahanCh
|
c048e89da8
|
Merge branch 'Feature/Chcekout/AddHasConflict' into Main
|
2025-08-13 15:33:10 +03:30 |
|
MahanCh
|
c91df337d4
|
refactor checkout process to simplify salary aid conflict handling
|
2025-08-13 15:27:39 +03:30 |
|
MahanCh
|
5902472b86
|
Merge branch 'Feature/InstitutionContract/add-registration-style' into Main
|
2025-08-13 11:53:04 +03:30 |
|
MahanCh
|
9aa8855a46
|
add temporary client registration features and workshop service calculations
|
2025-08-13 11:52:21 +03:30 |
|
MahanCh
|
366ad25a3a
|
add conflict indication for salary aids in checkout process
|
2025-08-12 12:44:48 +03:30 |
|
MahanCh
|
463e4bc080
|
Merge branch 'refs/heads/master' into Feature/Chcekout/AddHasConflict
|
2025-08-12 12:43:12 +03:30 |
|
MahanCh
|
b77538218f
|
add conflict indicator for employee customize checkout records
|
2025-08-12 11:17:02 +03:30 |
|
MahanCh
|
e877aca832
|
Merge branch 'Main' into Feature/Chcekout/AddHasConflict
|
2025-08-12 09:56:50 +03:30 |
|
MahanCh
|
4aa710b7d6
|
add search
|
2025-08-11 15:13:31 +03:30 |
|
MahanCh
|
25903856b2
|
add has conflict in List for checkout
|
2025-08-10 11:02:16 +03:30 |
|
MahanCh
|
d1b7e0c3e1
|
changes
|
2025-08-09 15:15:38 +03:30 |
|
MahanCh
|
ac4bd3453a
|
Merge branch 'master' into Main
# Conflicts:
# CompanyManagment.Application/SalaryAidApplication.cs
|
2025-08-09 14:46:36 +03:30 |
|
MahanCh
|
77e03f3d7f
|
Merge remote-tracking branch 'origin/master'
|
2025-08-09 14:45:14 +03:30 |
|
MahanCh
|
a9008beb24
|
Change CreateAsync For SalaryAid
|
2025-08-09 14:45:04 +03:30 |
|
SamSys
|
a30d5b68d7
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2025-08-09 14:21:30 +03:30 |
|
SamSys
|
93c72e16e7
|
Computing OverTimeWork WithOut Leaves - AbsenceDeduction changed to zero
|
2025-08-09 14:21:22 +03:30 |
|
MahanCh
|
290e1639e8
|
Merge branch 'master' into Main
|
2025-08-09 14:10:33 +03:30 |
|
MahanCh
|
3650b46b8e
|
fix 404 Error on sending data for checkout exists in SalaryAid
|
2025-08-09 14:10:12 +03:30 |
|
MahanCh
|
f9de490c13
|
cors
|
2025-08-07 17:13:43 +03:30 |
|
MahanCh
|
563fe563c0
|
fix appsetting bug
|
2025-08-07 14:29:44 +03:30 |
|
MahanCh
|
c75e3464d7
|
fix bug
|
2025-08-07 10:08:56 +03:30 |
|
MahanCh
|
e3a5fb578b
|
Change Payment Instrument api
|
2025-08-07 10:08:02 +03:30 |
|
MahanCh
|
8cb99b2862
|
ADD ROUTE
|
2025-08-07 10:00:28 +03:30 |
|
MahanCh
|
efbd74479b
|
fix error
|
2025-08-06 14:23:21 +03:30 |
|
MahanCh
|
8432b2660e
|
Merge branch 'Feature/Chcekout/AddHasConflict' into Main
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/FinancialStatementController.cs
|
2025-08-06 14:11:06 +03:30 |
|
MahanCh
|
2f9426bdaf
|
Merge branch 'Feature/InstitutionContract/Create-Api' into Main
|
2025-08-06 14:07:44 +03:30 |
|
MahanCh
|
5477519464
|
add extensionAsync in institutionContract for Api
|
2025-08-06 14:07:12 +03:30 |
|
MahanCh
|
5efe58d23d
|
add bank inquiry data from body
|
2025-08-06 13:40:10 +03:30 |
|
MahanCh
|
648ca44ebb
|
change bank card to bank number
|
2025-08-06 13:17:12 +03:30 |
|
MahanCh
|
ce8a0b397d
|
Merge branch 'Feature/InstitutionContract/Create-Api' into Main
|
2025-08-06 11:37:37 +03:30 |
|
MahanCh
|
c1fcaa1726
|
add transaction controller and create api
edit institutionContractController.cs and add excel download
|
2025-08-06 11:37:06 +03:30 |
|
MahanCh
|
94aa4fda51
|
Merge branch 'master' into Main
|
2025-08-05 17:57:38 +03:30 |
|
MahanCh
|
2d2207565e
|
test
|
2025-08-05 17:55:48 +03:30 |
|
MahanCh
|
2b602e4199
|
Merge branch 'Feature/PaymentInstrument/Init' into Main
|
2025-08-05 15:54:46 +03:30 |
|
MahanCh
|
9557f860bb
|
Merge branch 'Feature/ContractingPartyBankAccount/Init' into Main
|
2025-08-05 15:54:41 +03:30 |
|
MahanCh
|
cf0dc95b5c
|
add create range for ContractingPartyBankAccounts
|
2025-08-05 15:54:09 +03:30 |
|
MahanCh
|
c7f7b17866
|
add list create for payment instrument
|
2025-08-05 15:51:53 +03:30 |
|