Commit Graph

287 Commits

Author SHA1 Message Date
SamSys
5053b69295 EmployeeMandatoryHourse bug fixed 2025-08-31 16:18:34 +03:30
MahanCh
ec2defab69 feat: add employee mandatory hours to checkout model and database 2025-08-25 10:33:43 +03:30
SamSys
b82456f172 chnages 2025-08-15 16:22:27 +03:30
SamSys
c04a8f86a4 new metod To Compute Spreation BaseYear 2025-08-15 15:49:35 +03:30
MahanCh
b77538218f add conflict indicator for employee customize checkout records 2025-08-12 11:17:02 +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
a9008beb24 Change CreateAsync For SalaryAid 2025-08-09 14:45:04 +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
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
346756c766 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 16:05:54 +03:30
MahanCh
20f208ac0e Add IsActive to group 2025-08-05 16:05:17 +03:30
MahanCh
a71433f751 add AmountConflict in checkout 2025-08-05 13:11:12 +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
08adccb2f1 fix: update GetList method return type in IContractingPartyBankAccountsRepository 2025-08-04 12:50:19 +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
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
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
be282fa548 change get list in InstitutionContractApplication.cs 2025-07-31 12:22:01 +03:30
MahanCh
12356c927b Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-07-31 11:23:54 +03:30
MahanCh
133b99d5fc change GetList of ContractingPartyBankAccounts and add count to it 2025-07-31 10:54:20 +03:30
MahanCh
9879857a97 init PaymentInstrument 2025-07-30 17:03:01 +03:30
MahanCh
b96ed1c7c3 Feat:init ContractingPartyBankAccount Module 2025-07-26 15:58:01 +03:30
MahanCh
6317ebb079 Merge branch 'master' into Api 2025-07-24 11:26:29 +03:30
MahanCh
744078dd6c add id to select lists 2025-07-23 10:46:00 +03:30
MahanCh
bb3a50eb18 add pagination Queryrable - add pagination for workshop select List 2025-07-22 11:07:16 +03:30
SamSys
6e7199cf6d add new option to insurance 2025-07-21 19:43:22 +04:00
MahanCh
f2717de5bf merge from CreateApi for GetDetailsByPublicId 2025-07-21 15:11:18 +03:30
MahanCh
6932ba7b79 add query for getting data from sms preview 2025-07-21 14:57:36 +03:30
MahanCh
cc3b18bc99 add publicId to financialStatement 2025-07-21 14:19:51 +03:30
MahanCh
5a3b99d07c add id to workshopSelectList 2025-07-21 11:21:14 +03:30
MahanCh
0859cd3ba4 merged from client/financial/api 2025-07-20 13:06:17 +03:30
MahanCh
200f86b270 add using 2025-07-20 13:05:25 +03:30
MahanCh
54b3d6ad2c fix bugs 2025-07-20 13:05:13 +03:30
SamSys
60252ab032 Insurance bug fix - CreateTransction for rolllCall 2025-07-19 18:43:05 +04:00
MahanCh
15e608a1cf merge from Feature/ContractingParty/AddSearchForSelectList 2025-07-19 16:37:19 +03:30
MahanCh
f3bf66aeb0 feat: add search for contractingparty select list 2025-07-19 16:35:21 +03:30
MahanCh
f8a1aa596d merge from api createApigateway 2025-07-19 13:25:58 +03:30
MahanCh
62bcd4d6b6 add payment for api gateway 2025-07-17 15:20:34 +03:30
MahanCh
558021ac6a feat: add debt amount in client profile 2025-07-16 14:24:39 +03:30
SamSys
042530b6e3 Create Debt for stand from Excel 2025-07-16 03:39:33 +04:00
MahanCh
8f8a971a41 merge from CreateEmployeeBug 2025-07-15 11:08:40 +03:30
SamSys
725559e7c1 new metod to InstitutionContract 2025-07-15 02:58:26 +03:30
MahanCh
fb52e99c68 add financial statement controller 2025-07-13 14:17:52 +03:30
MahanCh
3099881416 Merge branch 'API' of https://github.com/syntax24/OriginalGozareshgir into API 2025-07-09 13:15:31 +03:30