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

1575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahan
36b60555f3 Merge branch 'Feature/contracts/api' into Main 2025-11-05 11:45:18 +03:30
mahan
9cf8447a83 feat: add API for retrieving paginated contract list for client with filtering options 2025-11-03 17:49:51 +03:30
mahan
e124a4d5d9 feat: implement method to retrieve paginated contract list for client with filtering options 2025-11-03 17:43:50 +03:30
mahan
7b9e7881c6 feat: add commented-out method for retrieving contract list for client 2025-11-03 14:45:41 +03:30
mahan
379126c513 Merge branch 'Feature/InstitutionContract/upgrade' into Main 2025-11-02 11:29:55 +03:30
mahan
d078feccf9 feat: sort institution contract responses by price in descending order 2025-11-02 11:28:29 +03:30
mahan
18c27d7a9a fix dates js error 2025-11-02 11:05:27 +03:30
SamSys
c080e11fe0 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-11-01 13:23:04 +03:30
SamSys
0eb9ecc373 client checkou warning message FrontEnd 2025-11-01 13:21:41 +03:30
mahan
fb2d67c069 Merge branch 'Feature/roll-call/current-day-api' into Main 2025-11-01 12:15:52 +03:30
mahan
d1ac8e49ba feat: add API endpoint to retrieve working employees select list for current workshop 2025-11-01 12:15:35 +03:30
mahan
470651cb76 feat: add method to remove roll call employee statuses and update handling of left work dates 2025-10-29 18:43:23 +03:30
mahan
c596bf78f4 Merge branch 'Feature/InstitutionContract/upgrade' into Main 2025-10-29 15:11:15 +03:30
mahan
c6a7e0a0bd feat: add workshop response handling to institution contract amendment payment response 2025-10-29 15:08:14 +03:30
mahan
2a9d9574e3 feat: filter employers in institution contract repository to exclude specific contracting party 2025-10-29 12:06:17 +03:30
SamSys
7b1542d5c6 Merge branch 'InsuranceEmployeeShareoCheckout' 2025-10-29 11:11:52 +03:30
SamSys
981fd2d4ee Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-10-29 11:10:15 +03:30
mahan
d0fa1b2f58 Merge branch 'Feature/roll-call/current-day-api' into Main 2025-10-29 11:09:53 +03:30
mahan
c10ae17f8c feat: update current day roll call search model to use EmployeeId instead of WorkshopId 2025-10-29 11:09:30 +03:30
mahan
e612150f1d Merge remote-tracking branch 'origin/Main' into Main 2025-10-29 10:47:16 +03:30
mahan
f3c391582c Merge branch 'Feature/roll-call/current-day-api' into Main 2025-10-29 10:46:41 +03:30
mahan
c13ad3a8a7 feat: update current day roll call API to accept search model for filtering 2025-10-29 10:46:21 +03:30
SamSys
2803c34591 Merge from InsuranceEmployeeShare 2025-10-28 19:11:55 +03:30
SamSys
7f3f785e39 InsuranceEmployeeShare comput on checkout completed 2025-10-28 19:10:31 +03:30
mahan
ca1ef420af feat: add exception for Amir's pizza workshop to adjust roll call date handling 2025-10-28 17:31:43 +03:30
mahan
d7baf358cc Merge branch 'Feature/InstitutionContract/print-api' 2025-10-28 14:58:03 +03:30
SamSys
676c8d2fa6 add CheckoutWarningMessage 2025-10-28 14:56:54 +03:30
mahan
f76a12d45c Merge branch 'Feature/InstitutionContract/upgrade' into Main 
# Conflicts:
#	ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
 2025-10-28 13:18:41 +03:30
mahan
2d5efb62be Merge remote-tracking branch 'origin/Main' into Main 2025-10-28 13:17:55 +03:30
SamSys
632ab3631b added UseWebSockets 2025-10-28 13:16:56 +03:30
mahan
ef3338c648 Merge branch 'Feature/InstitutionContract/print-api' into Main 2025-10-28 13:16:04 +03:30
mahan
595b2c8a2d feat: update verification date and time properties in institution contract model 2025-10-28 13:15:46 +03:30
mahan
fcf2b38457 feat: add previous ID handling and price difference validation to institution contract amendment workshops 2025-10-28 13:13:55 +03:30
SamSys
82bb932cfc useWebSockets added 2025-10-28 13:05:20 +03:30
mahan
c7bace728e feat: integrate workshop repository for roll call workflows 2025-10-28 12:31:08 +03:30
SamSys
82c2b641fe maarge from InsuranceEmployeeSharecheckout 2025-10-27 17:20:38 +03:30
mahan
8134216a4a feat: update roll call links to use dynamic domain 2025-10-27 16:46:09 +03:30
SamSys
3d013cfa60 compute insuranceEmployeeShare on checkout 2025-10-27 16:41:02 +03:30
mahan
30bfc96cbe Merge branch 'Feature/roll-call/admin-report-api' 2025-10-27 16:29:37 +03:30
mahan
7b71bd36b1 feat: add verification status and amendment tracking to institution contract models 2025-10-27 15:22:45 +03:30
mahan
bdc142d577 Merge branch 'Feature/roll-call/admin-report-api' into Main 2025-10-27 13:26:57 +03:30
mahan
5d55118c3c feat: add endpoint to retrieve distinct workshops for roll call reporting 2025-10-27 13:25:20 +03:30
mahan
62900a22a1 feat: add amendment verification details retrieval methods and update related classes 2025-10-27 11:30:56 +03:30
mahan
f7b9389f55 refactor: comment out unused amendment verification methods in institutionContractController 2025-10-26 18:09:00 +03:30
mahan
1c2ff03c90 Merge branch 'Feature/InstitutionContract/upgrade' into Main 2025-10-26 18:03:46 +03:30
mahan
280db87408 Merge branch 'Feature/InstitutionContract/print-api' 2025-10-26 14:00:18 +03:30
mahan
e6977b29fc feat: add methods for creating institution contract amendment changes and enhance personnel count handling 2025-10-26 14:00:03 +03:30
mahan
6e902011ca feat: enhance institution contract verification process and update SMS service methods 2025-10-26 12:21:14 +03:30
mahan
7cce903f6e Merge branch 'Feature/InstitutionContract/print-api' into Feature/InstitutionContract/upgrade 
# Conflicts:
#	Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	CompanyManagment.Application/InstitutionContractApplication.cs
#	CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
 2025-10-26 12:03:39 +03:30
mahan
4d6077c93d Merge branch 'refs/heads/master' into Feature/InstitutionContract/upgrade 2025-10-26 11:50:48 +03:30