Commit Graph

1711 Commits

Author SHA1 Message Date
409fc0df96 Merge remote-tracking branch 'origin/Main' into Main 2025-11-25 16:46:38 +03:30
7533bc821a Merge branch 'Feature/client/dashboard' into Main 2025-11-25 16:46:20 +03:30
6d3d599449 add DashboardController to provide client dashboard view with calendar and holiday information 2025-11-25 16:45:36 +03:30
Mahan Chamani
ca520c7291 Update dotnet-developPublish.yml 2025-11-25 15:41:25 +03:30
2d28bd1f98 Merge branch 'Feature/InstitutionContract/edit-phone' 2025-11-25 15:30:46 +03:30
0a3bdb2720 Merge branch 'master' into Main 2025-11-25 13:06:36 +03:30
75ae3efb65 refactor UidService to improve code formatting and readability 2025-11-25 12:56:21 +03:30
eb53fd67ef update mobile and national code matching logic in temporary client registration and increase UidService timeout 2025-11-25 12:52:49 +03:30
1eb3b7d066 Merge branch 'Feature/InstitutionContract/edit-phone' into Main 2025-11-25 12:11:22 +03:30
8ec717916c add unauthenticated edit support for contracting party phone and info in institution contracts 2025-11-25 11:40:44 +03:30
64bdbcbd2d update authentication error handling to include status code 3 as unavailable 2025-11-24 19:35:49 +03:30
7e9ba23b97 add Excel export for workshop roll call data with new exporter and view model 2025-11-23 12:52:07 +03:30
SamSys
e6640a1636 remove PitzaAmir(resturan) HasRollCallRecord sekip condition 2025-11-22 19:53:09 +03:30
SamSys
e9665c190b Remove pitzaamir(resturan) costum static checkout Condition 2025-11-22 19:50:48 +03:30
bc3cb5b115 Merge branch 'master' into Main 2025-11-22 15:43:35 +03:30
ea3baf14e8 add HttpPost attribute to Create action in ContactUsController 2025-11-22 15:43:19 +03:30
c9f519d7ec Merge remote-tracking branch 'origin/Main' into Main 2025-11-22 15:29:41 +03:30
aabb53c6d2 Merge branch 'master' into Main 2025-11-22 15:29:30 +03:30
36f104f316 add ContactUsController to handle contact us form submissions 2025-11-22 15:27:49 +03:30
Mahan Chamani
0fe0c05e5c Fix destination path in deployment script 2025-11-22 14:44:20 +03:30
Mahan Chamani
62349c0a54 Refactor Web Deploy command for better readability 2025-11-22 14:01:16 +03:30
Mahan Chamani
cb08e11593 Refactor IIS deployment step in workflow 2025-11-22 13:42:25 +03:30
Mahan Chamani
7eba632f1c Refactor .NET workflow to use project-specific commands
Updated the .NET GitHub Actions workflow to specify project files for restore, build, and publish steps. Replaced hardcoded credentials with GitHub secrets for deployment.
2025-11-22 13:31:47 +03:30
de37555db9 enable real-time status updates via SignalR in contract processing methods 2025-11-22 12:45:01 +03:30
6102ec3be8 Merge branch 'master' into Main 2025-11-22 12:07:14 +03:30
aaea658e58 refactor: remove unused SignalR hub context and related code from InstitutionContractRepository 2025-11-22 10:23:09 +03:30
42cae1295f Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-11-21 17:34:14 +03:30
95b281c3a4 change pizza amir lateEntry fine 2025-11-21 17:27:15 +03:30
SamSys
e704258c23 merg from master 2025-11-20 16:02:29 +03:30
SamSys
c239b094d7 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-11-20 15:51:03 +03:30
9e61bd3f55 Merge branch 'master' into Feature/customize-checkout/pizza-amir 2025-11-20 15:21:06 +03:30
7025478417 feat: add dynamic deduction items to customize checkout and temp entities with migration 2025-11-20 15:20:45 +03:30
SamSys
b5ee4f01c7 update BackgroundInstitutionContract 2025-11-20 14:29:03 +03:30
3937cd8a9f feat: add dynamic deduction items for late entry and insurance fines to checkout calculations 2025-11-20 12:58:25 +03:30
SamSys
3ed14bf2bd update block sms method 2025-11-20 11:37:04 +03:30
ea153d17b7 Merge branch 'master' into Main
# Conflicts:
#	Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	CompanyManagment.Application/InstitutionContractApplication.cs
#	CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-11-20 11:11:06 +03:30
933dd3d937 Enhance face embedding service notifications and error handling; add new shift date actions and improve UidService timeout 2025-11-20 10:52:29 +03:30
90d7de4901 Increase max length for contact info and names in contract entities; update related migrations and improve SMS service logic 2025-11-19 21:23:28 +03:30
37aa57d773 Refactor repository and remove unused Index files
Refactored `IPersonalContractingPartyRepository` to replace `GetByRegisterId` with `GetByNationalId`. Updated `InstitutionContractApplication` to use the new method and removed duplicate `RegisterId` validation logic.

Removed `Index.cshtml` and `Index.cshtml.cs` files, including all associated HTML, scripts, styles, and backend logic, indicating a deprecation or restructuring of the related functionality.
2025-11-19 19:16:55 +03:30
cce903f2ae Merge remote-tracking branch 'origin/master' 2025-11-19 11:10:33 +03:30
873ad2f41f Adjust institution contract creation flow to ensure entity is saved before invoice generation 2025-11-19 11:09:42 +03:30
2035b6fff8 feat: add dynamic deductions to checkout model and enhance roll call difference calculations 2025-11-19 10:45:40 +03:30
SamSys
d31cf8470f Sms Sttings Update 2025-11-18 19:13:09 +03:30
SamSys
5a34c9a6c9 Merg from Master 2025-11-18 16:06:13 +03:30
SamSys
4eb78996d5 Instan Send Block Sms Completed 2025-11-18 15:59:02 +03:30
SamSys
9d8e40c841 Instant block sms started 2025-11-18 15:14:18 +03:30
SamSys
4ba21db7c7 Instant Send Smms for reminder completed 2025-11-18 15:10:32 +03:30
dce24e3849 Merge branch 'Feature/InstitutionContract/add-workshop-totalAmount-to-list' into Main 2025-11-18 15:08:52 +03:30
f112bab021 Add endpoint for workshop details: implement GetWorkshopsDetails method in institutionContractController 2025-11-18 15:07:38 +03:30
00ffb08e2e Merge branch 'Feature/InstitutionContract/add-workshop-totalAmount-to-list' into Main
# Conflicts:
#	Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
#	CompanyManagment.Application/InstitutionContractApplication.cs
#	CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-11-18 14:55:54 +03:30