admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,938 Commits 109 Branches 0 Tags
62f6817640db61a4812be4bb7664ba8910a98247
Commit Graph

1938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahan
62f6817640 Merge remote-tracking branch 'origin/Main' into Main 
# Conflicts:
#	Company.Domain/InstitutionContractAgg/InstitutionContract.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	CompanyManagment.Application/InstitutionContractApplication.cs
#	ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
 2025-12-23 11:13:46 +03:30
SamSys
27edcc5f7b changed 2025-12-22 17:48:04 +03:30
SamSys
21b69edf93 merg from ServiceAmountsmanagment 2025-12-22 14:22:38 +03:30
SamSys
82bf10c2d5 ServiceAmount GetList 2025-12-22 14:21:01 +03:30
SamSys
68b42c98d6 changes 2025-12-22 13:24:53 +03:30
SamSys
f13688ccb2 changes 2025-12-22 13:24:44 +03:30
SamSys
bb9074df34 merge from ServiceAmountsManagment 2025-12-22 13:24:03 +03:30
SamSys
19a72ac78d load data and create service percentage 2025-12-22 12:35:51 +03:30
SamSys
9cb42b7cef background job changed 2025-12-22 11:16:50 +03:30
mahan
1a6248f15d Merge branch 'Feature/Insurance/client-api' into Main 2025-12-21 11:03:49 +03:30
mahan
8e5d4c312e fix: correct spelling of 'Month' and enhance insurance client list retrieval with additional properties 2025-12-21 11:03:23 +03:30
mahan
12fab5a9a5 add {id:guid} convention for controllers 2025-12-20 20:57:34 +03:30
mahan
20dd8f64f4 add: include OneMonthWithoutTax and OneMonthTax properties in InstitutionContractPrintViewModel 2025-12-20 20:28:08 +03:30
mahan
b827493306 refactor: remove unused discount-related classes from IInstitutionContractApplicationpnpm 2025-12-20 20:12:31 +03:30
mahan
04c65eae93 Merge branch 'Feature/institution-contract/print' 
# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
 2025-12-20 20:10:30 +03:30
mahan
b4526a4338 Merge branch 'Feature/institution-contract/verify-mannually' 2025-12-20 20:09:13 +03:30
mahan
2d879ce80a fix: update workshop identification logic in InstitutionContractApplication 2025-12-20 20:06:28 +03:30
mahan
a9511ffa82 Merge branch 'Feature/institution-contract/print' into Main 2025-12-20 19:38:55 +03:30
mahan
56e79d2099 fix: correct ContractAmountWithTax calculation for old contracts 2025-12-20 19:38:32 +03:30
mahan
6f3d6e986c fix conflict bug 2025-12-20 19:29:38 +03:30
mahan
18da3221d7 Merge branch 'Feature/institution-contract/print' into Main 
# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
 2025-12-20 19:21:16 +03:30
mahan
93891f3837 add one month more details for InstitutionContract.cs print 2025-12-20 19:18:27 +03:30
SamSys
5bdfbc572b add next deploy and contractingParty add to workshop on AndroidApk page 2025-12-20 18:42:53 +03:30
mahan
186cb95c70 refactor: remove unused discount-related classes and update workshop ID handling 2025-12-20 18:37:44 +03:30
mahan
b1f9bc98ba Merge branch 'Feature/institution-contract/verify-mannually' into Main 
# Conflicts:
#	Company.Domain/InstitutionContractAgg/InstitutionContract.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs
#	Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs
 2025-12-20 18:33:39 +03:30
mahan
4385a65cbc feat: add manual verification endpoint for institution contracts 2025-12-20 18:27:59 +03:30
mahan
722f8dae7c feat: implement manual verification for institution contracts and add signing type handling 2025-12-20 18:27:17 +03:30
SamSys
07113353c4 add uploadFrontEnd btn to AndroidApk page 2025-12-20 16:01:07 +03:30
mahan
93ee88ba46 Merge branch 'Feature/contracts/api' into Main 2025-12-20 15:52:32 +03:30
mahan
4b39994de6 feat: add API endpoint for printing multiple contracts 2025-12-20 15:50:34 +03:30
mahan
5c6af6184c Merge branch 'Feature/contracts/api' into Main 2025-12-20 15:22:07 +03:30
mahan
0dd2dc7c43 add workshopCode on client contract print 2025-12-20 15:21:34 +03:30
mahan
8c6336b9bd fix: correct IsOldContract logic to properly identify old contracts 2025-12-20 14:35:02 +03:30
mahan
e81a3ea7aa Merge branch 'Feature/contracts/api' into Main 2025-12-20 14:23:47 +03:30
mahan
20c00893b6 feat: add API endpoint for printing contract details and enhance contract print logic 2025-12-20 14:23:23 +03:30
mahan
20e3d454cf feat: add ContractAmountWithTax calculation and update related references 2025-12-20 13:35:52 +03:30
mahan
b0d174a575 feat: implement contract printing methods and view models 2025-12-20 13:04:30 +03:30
mahan
7d92ae6658 Merge branch 'Feature/contracts/api' into Main 2025-12-20 12:11:02 +03:30
mahan
2bf31db6b2 fix: enhance parameter binding logic for route parameters 2025-12-20 12:05:34 +03:30
mahan
5de90be51e Merge branch 'Feature/Insurance/client-api' into Main 2025-12-20 11:25:20 +03:30
mahan
a1ead80a42 Merge branch 'master' into Main 2025-12-20 11:25:15 +03:30
mahan
7a4a6de84f feat: add OneMonthPrice to institution contract details 2025-12-20 10:56:36 +03:30
mahan
293ea0f6f4 feat: enhance insurance client print model with additional properties and update related logic 2025-12-20 10:13:13 +03:30
mahan
3ce4cf3966 add insurance print api for client 2025-12-18 13:34:31 +03:30
mahan
a121e62102 Merge branch 'master' into Main 
# Conflicts:
#	0_Framework/Application/Sms/ISmsService.cs
#	ServiceHost/Program.cs
#	ServiceHost/Properties/launchSettings.json
 2025-12-18 11:01:54 +03:30
mahan
4f16d7680c feat: add insurance client list retrieval with pagination and filtering 2025-12-18 10:59:06 +03:30
SamSys
7a10d5ce59 changes 2025-12-18 10:40:11 +03:30
SamSys
3d88feeee7 Clent Add Employee Change to authorizedCanceled 2025-12-17 19:13:47 +03:30
SamSys
f408624463 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-12-17 13:25:38 +03:30
SamSys
8296292e49 checkout week finder switch fixed bug 2025-12-17 13:25:24 +03:30