MahanCh
|
b2694ca281
|
add temporary institution contract creation functionality
|
2025-08-16 11:23:29 +03:30 |
|
MahanCh
|
9aa8855a46
|
add temporary client registration features and workshop service calculations
|
2025-08-13 11:52:21 +03:30 |
|
MahanCh
|
4aa710b7d6
|
add search
|
2025-08-11 15:13:31 +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 |
|
MahanCh
|
d9259bf7c4
|
Merge branch 'Feature/PaymentInstrument/Init' into Main
|
2025-08-05 15:21:12 +03:30 |
|
MahanCh
|
55dc4c891f
|
fix bug
|
2025-08-05 15:19:40 +03:30 |
|
MahanCh
|
daa2a0fdc1
|
add bank inquiry
|
2025-08-05 15:12:07 +03:30 |
|
MahanCh
|
6d6ce93f74
|
some changes
|
2025-08-05 14:25:32 +03:30 |
|
MahanCh
|
a71433f751
|
add AmountConflict in checkout
|
2025-08-05 13:11:12 +03:30 |
|
SamSys
|
68d1a8d9fe
|
financialStament transaction list bug fixed
|
2025-08-05 04:16:15 +03:30 |
|
MahanCh
|
99a8cc181d
|
Refactor: add stats method for tabs in GetList InstitutionContract
|
2025-08-04 16:27:16 +03:30 |
|
MahanCh
|
a4bcb1ac55
|
refactor: update GetList methods to use PagedResult for paginated responses in InstitutionContract-related components
|
2025-08-04 15:36:20 +03:30 |
|
MahanCh
|
08bf8395c4
|
Merge branch 'Feature/InstitutionContract/Create-Api' into Main
|
2025-08-04 14:05:13 +03:30 |
|
MahanCh
|
bc6378beca
|
Add Edit, Deactivate, Activate, and Sign/Unsign methods to institutionContractController and application
|
2025-08-04 14:04:49 +03:30 |
|
MahanCh
|
5e24071175
|
Merge branch 'Feature/PaymentInstrument/Init' into Main
# Conflicts:
# Company.Domain/ContractingPartyBankAccountsAgg/IContractingPartyBankAccountsRepository.cs
# CompanyManagment.App.Contracts/ContractingPartyBankAccounts/IContractingPartyBankAccountsApplication.cs
# CompanyManagment.Application/ContractingPartyBankAccountsApplication.cs
# CompanyManagment.EFCore/Repository/ContractingPartyBankAccountsRepository.cs
# ServiceHost/Areas/Admin/Controllers/ContractingPartyBankAccountController.cs
|
2025-08-04 12:18:08 +03:30 |
|
MahanCh
|
ebc377603a
|
refactor: replace OperationResult with raw data for select list methods in repositories and controllers
|
2025-08-04 12:10:17 +03:30 |
|
SamSys
|
00357df859
|
test
|
2025-08-04 05:00:13 +03:30 |
|
MahanCh
|
de64933d06
|
Merge branch 'Feature/PaymentInstrument/Init' into Main
# Conflicts:
# CompanyManagment.EFCore/Repository/ContractingPartyBankAccountsRepository.cs
|
2025-08-03 13:19:47 +03:30 |
|
MahanCh
|
44763da729
|
add select list methods for PaymentInstrument and enhance repository logic
|
2025-08-03 13:10:51 +03:30 |
|
MahanCh
|
1f3bf123c4
|
update institutionContractController and application to improve validation and switch to async operations for contract creation
|
2025-08-03 10:53:08 +03:30 |
|
MahanCh
|
d9717033cf
|
add Create method in institutionContractController to handle institution contract creation with validations and account registration
|
2025-08-02 14:27:55 +03:30 |
|
MahanCh
|
beafd047bf
|
Merge branch 'Main' into Feature/InstitutionContract/Create-Api
|
2025-08-02 13:21:02 +03:30 |
|
MahanCh
|
7c3abeb463
|
Merge branch 'master' into Feature/InstitutionContract/Create-Api
|
2025-08-02 13:05:42 +03:30 |
|
MahanCh
|
040f40df52
|
add status for GetList in InstitutionContractRepository.cs
|
2025-08-02 13:05:32 +03:30 |
|
MahanCh
|
8da9f09663
|
add debt alert for users who don't have permissions
|
2025-07-31 14:09:16 +03:30 |
|