SamSys
8c37826367
merge from master
2025-11-12 12:44:13 +03:30
7f9531f07b
Integrate Sepehr payment gateway via Parbad library
...
Added `Parbad.Gateway.Sepehr` package to enable Sepehr payment gateway integration. Updated `Index.cshtml.cs` to handle online payment requests using `IOnlinePayment`. Configured Sepehr gateway in `Program.cs` with terminal ID from `appsettings.Development.json`. Enabled Swagger for development builds.
2025-11-12 12:01:44 +03:30
3e5520d8a0
merge from master
2025-11-11 19:57:05 +03:30
8436f70aa0
Refactor and enhance contract handling logic
...
- Added `DailyWage`, `AvgWorkingHour`, and `FamilyAllowance` properties to `GetContractListForClientResponse`.
- Refactored `WorkingHoursWeekly` conversion logic by introducing a reusable `WeeklyHourConvertor` method in `ContractRepository`.
- Updated query result mapping to include new properties and utilize `WeeklyHourConvertor` for `AvgWorkingHour`.
- Improved code readability and maintainability by centralizing repetitive logic.
2025-11-11 19:26:45 +03:30
76666b3da7
add pizza amir calculation method
2025-11-08 19:25:14 +03:30
cd1cf93ad1
Merge remote-tracking branch 'origin/master'
2025-11-08 18:25:46 +03:30
dff6bc2541
feat: add SMS settings configuration and refactor SMS sending methods for institution creation verification
2025-11-06 12:37:06 +03:30
SamSys
d8b432ca1e
Admin Report ---> bug fixed
2025-11-05 19:17:24 +03:30
SamSys
74dca1d2d2
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
2025-11-04 17:38:29 +03:30
SamSys
a9b4eb6195
some change report admin
2025-11-04 17:37:22 +03:30
SamSys
2125e15fb9
Admin Repoert --> add EmployeeOptionsCheck to report
2025-11-04 17:27:55 +03:30
b7f7d3b223
feat: add HasLeft property to employee settings and update related logic in group settings
2025-11-04 12:15:11 +03:30
e124a4d5d9
feat: implement method to retrieve paginated contract list for client with filtering options
2025-11-03 17:43:50 +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
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
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
7f3f785e39
InsuranceEmployeeShare comput on checkout completed
2025-10-28 19:10:31 +03:30
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
595b2c8a2d
feat: update verification date and time properties in institution contract model
2025-10-28 13:15:46 +03:30
SamSys
3d013cfa60
compute insuranceEmployeeShare on checkout
2025-10-27 16:41:02 +03:30
280db87408
Merge branch 'Feature/InstitutionContract/print-api'
2025-10-26 14:00:18 +03:30
4c6de6a76f
refactor: improve sorting logic in Fine, Loan, and Reward repositories
2025-10-25 17:25:08 +03:30
25c7b67eb5
feat: extend SMS service to include contracting party and institution contract IDs in verification link and code methods
2025-10-25 14:18:04 +03:30
6b6b0767e3
Merge branch 'master' into Feature/InstitutionContract/print-api
2025-10-23 16:44:36 +03:30
3d86ba401f
fix: update IsOldContract logic to handle null and empty workshop groups
2025-10-23 16:44:19 +03:30
6a6e2e532a
feat: add print API for institution contracts and include verifier details
2025-10-23 14:13:55 +03:30
ca6638d6a3
feat: enhance workshop query with additional filtering options and improved mapping
2025-10-22 19:26:10 +03:30
608fb824dc
refactor: remove unnecessary console logging in workshop selection
2025-10-22 17:23:17 +03:30
174edbf87d
Merge branch 'Feature/InstitutionContract/add-old-edit-api' into Main
...
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-22 15:29:43 +03:30
a827470831
feat: add API for editing old institution contracts with new properties
2025-10-22 15:19:17 +03:30
7fd8851f71
refactor: optimize employee count calculation in InstitutionContractRepository
2025-10-21 21:57:04 +03:30
d4c2ab939e
fix: correct workshop ID reference in employee count calculation
2025-10-21 14:55:23 +03:30
5822005b68
Merge branch 'master' into Feature/InstitutionContract/upgrade
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-21 14:45:22 +03:30
85e2481680
feat: enhance financial statement retrieval with contracting party validation and creation
2025-10-21 13:50:42 +03:30
acdd7de4f6
feat: update InsertAmendmentTempWorkshops method to return detailed response and refactor related classes
2025-10-21 11:02:10 +03:30
78458f24e5
feat: add entry and exit time differences to roll call reports
2025-10-20 15:43:59 +03:30
fde58a7c75
feat: add temporary workshop management for institution contract amendments
2025-10-20 13:13:43 +03:30
488454d354
feat: add authorized bank details functionality with repository and application layers
2025-10-19 13:20:54 +03:30
7d6b57affd
feat: make Workshops property public and update CalculateInstallment method visibility
2025-10-18 16:50:40 +03:30
ce4fc33daa
Merge branch 'Feature/Registeration-workflow/add-existed-employer' into Main
2025-10-16 15:42:21 +03:30
f5d95b21b0
feat: enhance employer gender handling in registration workflow
2025-10-16 15:41:49 +03:30
9140f1ea0b
Merge branch 'Feature/contracting-party-bank-account/add-inquiry' into Main
2025-10-16 14:00:37 +03:30
c8018948c2
feat: add validation to prevent upgrading institution contracts with zero-priced workshops
2025-10-16 11:56:45 +03:30
a5e68cbd90
feat: remove deprecated account info endpoints and update request context structure in UidService
2025-10-16 10:20:02 +03:30
37a6920a74
feat: implement account information retrieval methods in DashboardController and UidService
2025-10-16 09:20:47 +03:30
2f38470746
Merge branch 'Feature/InstitutionContract/upgrade' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
# CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-10-15 17:49:23 +03:30
13a2cd78cd
feat: improve institution contract retrieval and ensure account creation consistency
2025-10-15 12:28:30 +03:30