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
8b39eed7bb
Add workshop total amount details: include price properties in InstitutionContract and implement GetContractWorkshopsDetails method
2025-11-18 14:53:08 +03:30
58e30eb297
Merge branch 'Feature/InstitutionContract/add-workshop-totalAmount-to-list' into Main
2025-11-17 17:12:21 +03:30
3258deeb2c
Add support for APK versioning with force update functionality and separate APK types
2025-11-16 13:38:24 +03:30
16c29bc2d0
Add SepehrPaymentGateway and enhance payment tracking
...
Introduced the SepehrPaymentGateway to replace the previous
payment gateway, AqayePardakht. Added `Rrn` and `DigitalReceipt`
columns to the `PaymentTransactions` table for improved payment
tracking and verification. Updated the Entity Framework model
and mappings to reflect these changes.
Refactored payment transaction logic to support the new gateway,
including creating, verifying, and handling payments. Added new
request/response models for Sepehr gateway integration. Enhanced
error handling and financial statement creation upon successful
payment verification. Removed legacy code and updated dependency
injection for the Parbad library.
2025-11-12 20:59:37 +03:30
3282825719
Merge branch 'Feature/roll-call/camera-api'
2025-11-10 09:52:29 +03:30
f4c73a418b
Merge branch 'Feature/roll-call/camera-api' into Main
2025-11-08 12:37:45 +03:30
b36919e0b6
Merge branch 'Feature/InstitutionContract/upgrade' into Main
2025-11-06 13:00:03 +03:30
c7d4481a6d
Merge branch 'master' into Feature/InstitutionContract/upgrade
...
# Conflicts:
# 0_Framework/Application/Sms/ISmsService.cs
# CompanyManagment.EFCore/Services/SmsService.cs
2025-11-06 12:38:57 +03:30
22b67b344a
feat: update WorkshopEmbedding method and enhance EmployeeFaceEmbedding model with additional properties
2025-11-06 10:02:11 +03:30
6ab418c4ab
feat: implement EmployeeFaceEmbedding model and application logic for managing embeddings
2025-11-05 14:50:44 +03:30
36b60555f3
Merge branch 'Feature/contracts/api' into Main
2025-11-05 11:45:18 +03:30
SamSys
2125e15fb9
Admin Repoert --> add EmployeeOptionsCheck to report
2025-11-04 17:27:55 +03:30
752c7c72ab
feat: add EmployeeFaceEmbedding model and related metadata classes
2025-11-03 20:06:28 +03:30
9cf8447a83
feat: add API for retrieving paginated contract list for client with filtering options
2025-11-03 17:49:51 +03:30
e124a4d5d9
feat: implement method to retrieve paginated contract list for client with filtering options
2025-11-03 17:43:50 +03:30
7b9e7881c6
feat: add commented-out method for retrieving contract list for client
2025-11-03 14:45:41 +03:30
fb2d67c069
Merge branch 'Feature/roll-call/current-day-api' into Main
2025-11-01 12:15:52 +03:30
d1ac8e49ba
feat: add API endpoint to retrieve working employees select list for current workshop
2025-11-01 12:15:35 +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
e612150f1d
Merge remote-tracking branch 'origin/Main' into Main
2025-10-29 10:47:16 +03:30
f3c391582c
Merge branch 'Feature/roll-call/current-day-api' into Main
2025-10-29 10:46:41 +03:30
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
SamSys
676c8d2fa6
add CheckoutWarningMessage
2025-10-28 14:56:54 +03:30
f76a12d45c
Merge branch 'Feature/InstitutionContract/upgrade' into Main
...
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-28 13:18:41 +03:30
fcf2b38457
feat: add previous ID handling and price difference validation to institution contract amendment workshops
2025-10-28 13:13:55 +03:30
SamSys
82c2b641fe
maarge from InsuranceEmployeeSharecheckout
2025-10-27 17:20:38 +03:30
SamSys
3d013cfa60
compute insuranceEmployeeShare on checkout
2025-10-27 16:41:02 +03:30
7b71bd36b1
feat: add verification status and amendment tracking to institution contract models
2025-10-27 15:22:45 +03:30
62900a22a1
feat: add amendment verification details retrieval methods and update related classes
2025-10-27 11:30:56 +03:30
280db87408
Merge branch 'Feature/InstitutionContract/print-api'
2025-10-26 14:00:18 +03:30
e6977b29fc
feat: add methods for creating institution contract amendment changes and enhance personnel count handling
2025-10-26 14:00:03 +03:30
6e902011ca
feat: enhance institution contract verification process and update SMS service methods
2025-10-26 12:21:14 +03:30
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
4d6077c93d
Merge branch 'refs/heads/master' into Feature/InstitutionContract/upgrade
2025-10-26 11:50:48 +03:30
1a3558df52
Merge branch 'refs/heads/Main' into Feature/roll-call/current-day-api
2025-10-25 16:18:02 +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
818d88d859
feat: update InstitutionContractAmendmentChange to include roll call options and current workshop ID
2025-10-23 16:32:45 +03:30
6a6e2e532a
feat: add print API for institution contracts and include verifier details
2025-10-23 14:13:55 +03:30
1a70569a36
feat: implement amendment completion functionality with payment details
2025-10-23 11:44:12 +03:30
bc6ae854f8
Merge branch 'Feature/InstitutionContract/upgrade' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
2025-10-21 15:07:16 +03:30
68f1f81b53
feat: add BSON representation for Id property in InstitutionContractAmendmentTemp
2025-10-21 15:05:48 +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
53aeb60861
Merge branch 'Feature/InstitutionContract/upgrade' into Main
2025-10-21 14:37:41 +03:30
c2a08d9c33
feat: add BsonRepresentation attribute to Id property for string representation in MongoDB
2025-10-21 14:37:11 +03:30
b711e803a9
Merge branch 'master' into Main
...
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
2025-10-21 11:50:45 +03:30
55f7b4f7c0
Merge branch 'Feature/InstitutionContract/upgrade' into Main
...
# Conflicts:
# Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs
# Company.Domain/InstitutionContractAgg/InstitutionContract.cs
2025-10-21 11:10:06 +03:30
acdd7de4f6
feat: update InsertAmendmentTempWorkshops method to return detailed response and refactor related classes
2025-10-21 11:02:10 +03:30
