Compare commits

...

463 Commits

Author SHA1 Message Date
bd72dada76 has ticket access 2025-09-21 14:24:37 +03:30
e79dabbb2d add accounts by role 2025-09-21 11:57:48 +03:30
f527c59603 Merge branch 'Feature/admin-dashboard/api' into Main 2025-09-21 11:32:19 +03:30
112369c2a5 add fridays to holiday in DashboardController 2025-09-21 11:30:46 +03:30
518719a6b8 Merge branch 'Feature/admin-dashboard/api' into Main 2025-09-21 11:04:17 +03:30
53eab1be67 feat: Add DashboardController for Admin 2025-09-21 11:03:06 +03:30
Mahan Chamani
21aa17d856 Update dotnet-developPublish.yml 2025-09-18 10:42:41 +03:30
b8d6911756 Merge remote-tracking branch 'origin/Main' into Main 2025-09-18 10:40:27 +03:30
2e8f098937 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-18 10:38:58 +03:30
c9cae74cd4 Add HeadTitle and Notifications properties to Law model and update related mappings 2025-09-18 10:38:14 +03:30
Mahan Chamani
abe8774d6f Update dotnet-developPublish.yml 2025-09-18 10:04:15 +03:30
Mahan Chamani
eab0441f00 Update dotnet-developPublish.yml 2025-09-18 09:44:25 +03:30
13250d9f62 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-17 16:15:19 +03:30
e77eb217f7 Refine search query in LawRepository to focus on item headers and details 2025-09-17 16:15:08 +03:30
39200da4b5 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-17 15:51:24 +03:30
49050a8990 Add search functionality to law retrieval with filtering options 2025-09-17 15:49:58 +03:30
9474f3ff1a Add transaction ID to financial statement mapping 2025-09-16 11:51:20 +03:30
ad4cffffcd Add status and verification code handling to ContractingPartyTemp 2025-09-16 11:46:17 +03:30
SamSys
74c7b1ebbd Optimized leaves affected on checkout 2025-09-15 23:44:37 +03:30
SamSys
b2c6ad2541 SickLeaving Bug on Static Checkout Fixed 2025-09-15 17:31:05 +03:30
8eded713da fix: update gender handling in Create and CreateEmployee views 2025-09-15 16:12:17 +03:30
MahanCh
18e559f1ae Enhance law management functionality and API
Updated ILawApplication with new methods for activating and deactivating laws by type. Added UpsertLaw method for creating and updating laws. Modified LawViewModel and EditLaw to include LawType. Enhanced LawApplication methods to support new features and updated GetLawByType to return default laws when none exist. Introduced LawController with endpoints for law operations.
2025-09-14 10:47:31 +03:30
MahanCh
e1dfd8c8e1 Enhance institution contract query to support 'blue' as an active status and update discounted amount calculation in client registration 2025-09-13 18:23:12 +03:30
MahanCh
b1c9b2669d Update institution contract query to include 'blue' as a valid active status 2025-09-13 16:52:47 +03:30
MahanCh
116f40d87d Add exception handling for unsuccessful institution contract creation 2025-09-13 13:15:32 +03:30
MahanCh
6a982a80f7 Refactor date of birth handling in EmployerApplication 2025-09-13 12:52:44 +03:30
SamSys
c3cb3df3d3 change compute leaving model on checkout 2025-09-13 06:29:25 +03:30
MahanCh
604ac76a1a Add employer workflow registration edit and delete functionality 2025-09-11 12:58:50 +03:30
SamSys
f9947dc138 change leaving time on checkout for EndOfyear or OnLeftWork Employees 2025-09-09 18:41:16 +03:30
SamSys
3b12be04b5 test defualt remote 2025-09-09 16:18:38 +03:30
MahanCh
5a1d2640c3 Merge branch 'Main' into Feature/InstitutionContract/add-registration-style 2025-09-09 13:12:02 +03:30
MahanCh
de0e21f98b Sort law items by OrderNumber in LawRepository for consistent ordering 2025-09-09 13:11:55 +03:30
MahanCh
80ed1e9469 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-09 11:55:31 +03:30
MahanCh
0609c66e0a Refactor LawApplication class for improved readability and consistency 2025-09-09 11:55:19 +03:30
MahanCh
add5b8ef8e Enforce minimum item requirement for law creation and editing; remove unused OrderNumber property from LawItemViewModel 2025-09-09 11:55:01 +03:30
MahanCh
c5091c53a4 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-09 10:56:43 +03:30
MahanCh
3f1664a844 Refactor payment calculations in PlanPercentageRepository and TemporaryClientRegistrationApplication for improved accuracy 2025-09-09 10:56:19 +03:30
MahanCh
fdc5ea950f Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-08 17:02:41 +03:30
MahanCh
39d62eb02d Adjust online and in-person sum amount calculation for accuracy 2025-09-08 16:42:33 +03:30
MahanCh
a42ef19470 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-08 13:02:10 +03:30
MahanCh
7ae7d8fc07 Throw InternalServerException for null API response and specific error codes in employer and temporary client registration applications 2025-09-08 13:01:55 +03:30
MahanCh
2bc7766ba1 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-08 12:29:50 +03:30
MahanCh
d780f24b36 Validate birth date against existing person's record in UidService 2025-09-08 12:29:30 +03:30
MahanCh
d7b49f8fc3 Comment out unused properties in PlanPercentageRepository for clarity 2025-09-08 11:59:55 +03:30
SamSys
82d035b7e1 mirrorTest4 2025-09-08 01:20:58 +03:30
SamSys
e80621280c mirror test 2025-09-08 01:09:15 +03:30
SamSys
1c6b0ac292 test miror 2025-09-08 01:04:02 +03:30
SamSys
01bc8ef01b Merge branch 'master' of https://git.dadmehrg.ir/gozareshgir/OriginalGozareshgir 2025-09-08 00:42:41 +03:30
SamSys
ca350aa795 delete test files 2025-09-08 00:40:17 +03:30
MahanCh
58c015b151 fix: remove unnecessary whitespace in development environment check 2025-09-07 17:22:01 +03:30
MahanCh
14480eb683 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-07 16:16:11 +03:30
MahanCh
882a295413 Refactor Law model to use LawType enum and update repository methods for asynchronous operations 2025-09-07 16:14:44 +03:30
MahanCh
785e364efc Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-07 15:06:33 +03:30
MahanCh
bd83ed3880 Add Remove method to institution contract controller for contract deletion 2025-09-07 15:06:19 +03:30
MahanCh
fae3c7cbd3 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-07 14:46:31 +03:30
MahanCh
052b94a66e Remove TelephoneNumber property from employer application model 2025-09-07 14:46:16 +03:30
MahanCh
369757aebe Merge branch 'Feature/Ticket/Add-Api' into Main 2025-09-07 14:30:54 +03:30
MahanCh
38d8e88fd6 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-07 14:10:42 +03:30
MahanCh
bcedb0d690 Add Persian date of birth property to employer application model 2025-09-07 14:10:14 +03:30
MahanCh
3662502db1 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-07 11:54:56 +03:30
MahanCh
0701b334e4 Add [FromBody] attribute to AuthenticateEmployer method parameter 2025-09-07 11:54:20 +03:30
MahanCh
631bf3a920 feat: add TicketController for admin ticket management with CRUD operations 2025-09-07 10:28:41 +03:30
MahanCh
874bce1113 feat: add TicketController with CRUD operations for ticket management 2025-09-07 09:22:03 +03:30
SamSys
1daaeff194 test 2 2025-09-07 05:29:07 +03:30
SamSys
9cd00a1886 test 2025-09-07 05:25:46 +03:30
MahanCh
1f897fa0c9 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-06 14:43:01 +03:30
MahanCh
5f7c27e45c Add handling for deactivated institution contracts in query logic 2025-09-06 14:42:50 +03:30
MahanCh
824a80d1fe Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-06 12:43:48 +03:30
MahanCh
9e2ec49247 Refactor institution contract status handling and improve query logic 2025-09-06 12:43:37 +03:30
MahanCh
f5137d0bab Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-03 17:25:08 +03:30
MahanCh
881bdfa7ae Add discounted amount for one month in client registration application 2025-09-03 17:24:51 +03:30
MahanCh
e063870b36 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-03 16:32:41 +03:30
MahanCh
fe8335af55 Update obligation calculation to use one-time payment without tax 2025-09-03 16:32:27 +03:30
MahanCh
179ff95d54 fix: normalize file extension check to lowercase 2025-09-03 15:22:55 +03:30
MahanCh
5c3119d3d2 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-03 13:47:34 +03:30
MahanCh
0c56240158 Remove unnecessary assignment of discount in one-time payment calculation 2025-09-03 13:47:21 +03:30
MahanCh
2e703c49f7 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-03 13:12:33 +03:30
MahanCh
e9dbfb411a Update installment labels in client registration application to use simplified Persian terms 2025-09-03 13:11:33 +03:30
MahanCh
40a02dbede Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-03 10:15:30 +03:30
MahanCh
030ce880f8 Add discounted amount calculations to institution contract responses 2025-09-03 10:15:16 +03:30
MahanCh
2b8cc9d05a Update DailyCompensation to use response value from institution contract 2025-09-02 17:14:46 +03:30
MahanCh
0136e219a1 Refactor institution plan calculator response type and return structure 2025-09-02 16:59:47 +03:30
MahanCh
60ed37b965 Add detailed response structure for institution plan calculator 2025-09-02 16:44:52 +03:30
MahanCh
5355e74830 Merge branch 'Main' into Feature/InstitutionContract/add-registration-style 2025-09-02 14:20:01 +03:30
MahanCh
87609773e5 feat: refine payment calculation logic in TemporaryClientRegistrationApplication 2025-09-02 14:19:23 +03:30
MahanCh
6112e969b6 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-02 13:23:20 +03:30
MahanCh
3e4c57d813 feat: update institution plan calculator to return review and payment view model 2025-09-02 13:23:02 +03:30
MahanCh
efc510a09b Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-02 12:47:19 +03:30
MahanCh
a6c1ae7971 feat: add daily compensation and obligation properties to institution contract response 2025-09-02 12:46:10 +03:30
MahanCh
8bf707056e Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-02 11:56:10 +03:30
MahanCh
ee72c95d55 feat: change properties in InstitutionContract to private setters for encapsulation 2025-09-02 11:55:47 +03:30
MahanCh
f4f8ab8272 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-02 10:28:48 +03:30
MahanCh
1c6def5d70 feat: adjust installment start date handling to use the first day of the month 2025-09-02 10:27:57 +03:30
MahanCh
87e0181a8d Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-09-02 10:08:56 +03:30
MahanCh
66d566847e feat: add daily compensation and obligation properties to payment result 2025-09-02 09:46:28 +03:30
MahanCh
dbfffafbee feat: enhance institution plan calculator with in-person contract handling and tax calculations 2025-08-31 16:55:27 +03:30
SamSys
b2a70bc5a9 merge add-employee-avrage [EmployeeMandatoryHours ] 2025-08-31 16:23:39 +03:30
SamSys
5053b69295 EmployeeMandatoryHourse bug fixed 2025-08-31 16:18:34 +03:30
MahanCh
969a707000 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-30 15:35:35 +03:30
MahanCh
57b625f3b2 feat: add discount and contracting party properties to institution contract responses 2025-08-30 15:35:15 +03:30
MahanCh
62572a9b64 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-30 14:48:33 +03:30
MahanCh
6d0b7de149 feat: update contract start date handling and optimize workshop and employer data retrieval 2025-08-30 14:48:11 +03:30
MahanCh
34d8e068df Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-30 13:49:39 +03:30
MahanCh
3a1dfa7e11 fix: correct InstitutionContractId assignment in RegistrationWorkflowMainListViewModel 2025-08-30 13:47:24 +03:30
MahanCh
866725e3b4 feat: simplify institution plan calculator by removing contract start type parameter and updating response properties 2025-08-30 13:42:52 +03:30
MahanCh
7772bff9f4 fix bug 2025-08-27 18:08:24 +03:30
MahanCh
033461641a feat: update domain in development configuration 2025-08-27 17:59:36 +03:30
MahanCh
83a251ad3b feat: update menu links for institution contracts and payment gateway 2025-08-27 17:39:37 +03:30
MahanCh
cdf282a17a Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-27 16:35:23 +03:30
MahanCh
4bc3fd2fbc feat: add employer authentication method and view model to registration workflow 2025-08-27 16:34:55 +03:30
MahanCh
c826c3614d feat: enhance employer workflow registration with detailed properties for real and legal employers 2025-08-27 13:39:24 +03:30
MahanCh
b8ea59b814 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-27 12:04:08 +03:30
MahanCh
f82d0d5925 feat: add in-person contract and insurance plan properties to workshop details 2025-08-27 12:02:04 +03:30
MahanCh
701ebaeb96 feat: add in-person contract and insurance plan properties to institution contract 2025-08-27 11:47:41 +03:30
MahanCh
a1d57b291c Merge branch 'Feature/authorize-person/init' into Main
# Conflicts:
#	CompanyManagment.EFCore/CompanyContext.cs
2025-08-27 11:21:16 +03:30
MahanCh
e7d43316ad feat: implement AuthorizedPerson management with repository and application services 2025-08-27 11:11:32 +03:30
MahanCh
bdc5ccae13 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-26 17:36:44 +03:30
MahanCh
d37ad552df feat: add ContractStart and ContractEnd properties to institution contract response 2025-08-26 17:36:12 +03:30
MahanCh
df39072944 feat: add employee mandatory hours to print layouts and view models 2025-08-26 13:52:21 +03:30
MahanCh
9c04fd439d Merge branch 'fix/institution-contract/add-contracting-partyId' into Main
# Conflicts:
#	CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
2025-08-26 12:31:38 +03:30
MahanCh
2b3067dab2 fix: add ContractingPartyId to institution contract list items 2025-08-26 12:29:17 +03:30
MahanCh
6f8ced3192 feat: enhance print layout for employee attendance details 2025-08-26 12:25:14 +03:30
MahanCh
86682a28e2 feat: add method to update institution contract status based on workshop completion 2025-08-26 11:28:18 +03:30
MahanCh
5720c30f7a feat: add method to include workshop details in institution contract retrieval 2025-08-26 11:17:16 +03:30
MahanCh
c90a68a8cc Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-26 10:45:29 +03:30
MahanCh
a71205aa2b feat: add LawType property to Law model and update related classes 2025-08-26 10:43:05 +03:30
MahanCh
641dcc1767 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-26 09:58:15 +03:30
MahanCh
b1a15bfa54 feat: update institution plan calculator to use total amount directly and remove workshop list parameter 2025-08-26 09:57:50 +03:30
SamSys
f7166ca17f bug fixed : workshopTime setting save on client 2025-08-25 18:56:35 +03:30
MahanCh
d4f9c810ea feat: implement workshop creation workflow and enhance employer registration process 2025-08-25 18:24:07 +03:30
MahanCh
09574150b6 feat: add employer creation functionality and institution workshop detail retrieval 2025-08-25 17:06:44 +03:30
MahanCh
7ccf600885 feat: add contact info creation and account registration in institution contract process 2025-08-25 16:23:14 +03:30
MahanCh
a7b7bfc745 feat: add grouping SVG and update image reference in rollcall 2025-08-25 15:03:39 +03:30
MahanCh
170a0ddba0 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-25 14:42:43 +03:30
MahanCh
33a736ab5d feat: remove payment model parameter from GetTotalPaymentAndWorkshopList method 2025-08-25 14:42:27 +03:30
MahanCh
fa5e079db5 fix: update image references for contract and insurance sections 2025-08-25 14:31:24 +03:30
MahanCh
ec2defab69 feat: add employee mandatory hours to checkout model and database 2025-08-25 10:33:43 +03:30
MahanCh
e34fef37d7 Merge branch 'master' into Main 2025-08-23 16:28:04 +03:30
MahanCh
5e7bfe0634 fix: improve case history data handling and add debugging logs 2025-08-23 16:22:26 +03:30
MahanCh
23723e4b7a Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-23 15:05:01 +03:30
MahanCh
859f8ea8ca feat: update financial response models to use string type for amounts 2025-08-23 15:04:42 +03:30
MahanCh
2732ec09b2 fix: sort payment transactions by creation date 2025-08-23 13:11:10 +03:30
MahanCh
3744b5f470 Merge branch 'fix/payment-transaction/list-bug' into Main 2025-08-23 13:02:57 +03:30
MahanCh
13d93b3e1d fix: handle null card numbers in payment transaction list 2025-08-23 13:02:03 +03:30
MahanCh
db78fb1cd4 Merge branch 'master' into Main 2025-08-23 11:55:57 +03:30
MahanCh
7ce2142517 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	CompanyManagment.EFCore/Repository/FinancialStatmentRepository.cs
2025-08-23 11:54:09 +03:30
MahanCh
98146b4aa7 fix: calculate balance correctly in financial transaction details 2025-08-23 11:53:08 +03:30
MahanCh
5f65c13b45 fix: calculate balance correctly in financial transaction details 2025-08-23 11:51:46 +03:30
MahanCh
8bde7aa3d1 feat: add PublicId to institution contract and update response models for calculators 2025-08-23 10:50:07 +03:30
SamSys
da8579d2a6 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-22 01:07:04 +03:30
SamSys
41503101b6 create rollcallservice transaction chnages 2025-08-22 00:58:42 +03:30
syntax24
1cd4cd4b49 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-21 16:46:56 +03:30
syntax24
7afa112e63 appsettings.dev changes 2025-08-21 16:46:40 +03:30
SamSys
3aa5668696 CustomizeCheckout enable or disable on client menu bug fixed 2025-08-21 16:44:51 +03:30
MahanCh
76e5a93ee5 feat: update RegistrationStatus to use string type and add Completed status 2025-08-21 13:50:27 +03:30
MahanCh
469a8808d1 refactor: remove TODO comment for amount calculation in InstitutionContractApplication 2025-08-21 13:32:50 +03:30
MahanCh
d3157780ea feat: refactor registration workflow to use InstitutionContractDuration and add new endpoint for registration workflow items 2025-08-21 13:32:24 +03:30
MahanCh
2d2dc24280 Merge branch 'Main' into Feature/InstitutionContract/add-registration-style 2025-08-21 11:53:32 +03:30
MahanCh
362b306c48 feat: add InstitutionContractWorkshopDetail and related mappings for workshop management 2025-08-21 11:05:26 +03:30
MahanCh
b0c02d47c4 fix: update HTTP POST routes to include ID parameter for contract actions 2025-08-21 10:05:26 +03:30
MahanCh
6869ccb436 feat: update registration status handling in InstitutionContract and Workshop models 2025-08-21 09:55:41 +03:30
MahanCh
605fe16ced feat: add registration details and pricing to InstitutionContract and related models 2025-08-21 09:32:49 +03:30
MahanCh
dfb78db2fa feat: add installment management to InstitutionContract and related classes 2025-08-20 13:32:55 +03:30
SamSys
13ebe2fc2a Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-20 03:33:11 +03:30
SamSys
54fbbc964f change OvertTimeWOrking Compute - Send EmployeeMandatoryHours To Save 2025-08-20 03:27:54 +03:30
MahanCh
f0daa0b283 feat: add workshop details handling to InstitutionContract and InstitutionContractApplication 2025-08-19 14:52:52 +03:30
MahanCh
82f68d1bbe feat: add ContractingPartyId property to EditInstitutionContractRequest 2025-08-19 14:43:43 +03:30
MahanCh
48c2186110 feat: enhance CreateInstitutionContractRequest with detailed properties and enums for legal and real parties 2025-08-19 14:41:50 +03:30
MahanCh
72fe632516 Merge branch 'fix/client-menu/customize-checkout-bug' into Main 2025-08-18 11:59:44 +03:30
MahanCh
b92aaaffa0 fix: enable and manage customize checkout options in client menu 2025-08-18 11:55:34 +03:30
MahanCh
2a315ff7ae refactor: rename InstitutionContractStatus to InstitutionContractListStatus and update related properties 2025-08-18 10:40:17 +03:30
MahanCh
204355acd6 add PublicId and RegistrationStatus enum to InstitutionContractTemp and related classes 2025-08-16 16:50:29 +03:30
MahanCh
e1ac481dc3 remove Version property from Law model and related classes - Add migration 2025-08-16 13:20:47 +03:30
MahanCh
8fd3930393 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-16 11:24:08 +03:30
MahanCh
b2694ca281 add temporary institution contract creation functionality 2025-08-16 11:23:29 +03:30
SamSys
b82456f172 chnages 2025-08-15 16:22:27 +03:30
SamSys
c04a8f86a4 new metod To Compute Spreation BaseYear 2025-08-15 15:49:35 +03:30
MahanCh
e0f7ff5ec7 Merge branch 'Feature/Chcekout/AddHasConflict' 2025-08-13 16:29:49 +03:30
MahanCh
7cb3551dc8 Merge branch 'Feature/Chcekout/AddHasConflict' into Main 2025-08-13 15:52:08 +03:30
MahanCh
873a30ecd1 enhance tooltip initialization and clean up code structure 2025-08-13 15:51:41 +03:30
MahanCh
c048e89da8 Merge branch 'Feature/Chcekout/AddHasConflict' into Main 2025-08-13 15:33:10 +03:30
MahanCh
c91df337d4 refactor checkout process to simplify salary aid conflict handling 2025-08-13 15:27:39 +03:30
MahanCh
b88cda4007 fix logic for employee checkout validation in AdminMonthlyOverviewRepository 2025-08-13 13:18:21 +03:30
MahanCh
5902472b86 Merge branch 'Feature/InstitutionContract/add-registration-style' into Main 2025-08-13 11:53:04 +03:30
MahanCh
9aa8855a46 add temporary client registration features and workshop service calculations 2025-08-13 11:52:21 +03:30
MahanCh
9556be42ea add Law domain model and application services 2025-08-12 15:10:14 +03:30
MahanCh
3ebaeb645c add InstitutionContractContactInfoTemp entity and repository 2025-08-12 14:02:45 +03:30
MahanCh
366ad25a3a add conflict indication for salary aids in checkout process 2025-08-12 12:44:48 +03:30
MahanCh
463e4bc080 Merge branch 'refs/heads/master' into Feature/Chcekout/AddHasConflict 2025-08-12 12:43:12 +03:30
MahanCh
785309c731 fix leave date comparison logic in LeaveRepository 2025-08-12 11:55:13 +03:30
MahanCh
f0126d365d add HasAmountConflict column to CustomizeCheckoutTemps and CustomizeCheckouts 2025-08-12 11:17:43 +03:30
MahanCh
b77538218f add conflict indicator for employee customize checkout records 2025-08-12 11:17:02 +03:30
MahanCh
e877aca832 Merge branch 'Main' into Feature/Chcekout/AddHasConflict 2025-08-12 09:56:50 +03:30
MahanCh
f66293a637 add id to finacialtransaction viewmodel 2025-08-11 16:30:19 +03:30
MahanCh
4aa710b7d6 add search 2025-08-11 15:13:31 +03:30
MahanCh
2547fec258 Merge branch 'Feature/AdminMonthlyOverview/AddEmployeeOption' 2025-08-11 13:06:19 +03:30
MahanCh
acb572d94a fix admin monthly overview bug 2025-08-11 13:05:55 +03:30
MahanCh
5ff08ebb2f fix error for payment transactions 2025-08-10 11:20:31 +03:30
MahanCh
fd122fe582 fix error 2025-08-10 11:08:59 +03:30
MahanCh
25903856b2 add has conflict in List for checkout 2025-08-10 11:02:16 +03:30
MahanCh
d1b7e0c3e1 changes 2025-08-09 15:15:38 +03:30
MahanCh
9c0d5b65be comment condition for one month ago for creating salaryAid 2025-08-09 15:13:43 +03:30
MahanCh
ac4bd3453a Merge branch 'master' into Main
# Conflicts:
#	CompanyManagment.Application/SalaryAidApplication.cs
2025-08-09 14:46:36 +03:30
MahanCh
77e03f3d7f Merge remote-tracking branch 'origin/master' 2025-08-09 14:45:14 +03:30
MahanCh
a9008beb24 Change CreateAsync For SalaryAid 2025-08-09 14:45:04 +03:30
SamSys
a30d5b68d7 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-09 14:21:30 +03:30
SamSys
93c72e16e7 Computing OverTimeWork WithOut Leaves - AbsenceDeduction changed to zero 2025-08-09 14:21:22 +03:30
MahanCh
290e1639e8 Merge branch 'master' into Main 2025-08-09 14:10:33 +03:30
MahanCh
3650b46b8e fix 404 Error on sending data for checkout exists in SalaryAid 2025-08-09 14:10:12 +03:30
MahanCh
734de19bc2 Merge branch 'master' into Main 2025-08-09 13:32:55 +03:30
MahanCh
398bb35815 Merge remote-tracking branch 'origin/master' 2025-08-09 12:47:18 +03:30
MahanCh
697bd9fefe fix error for "get last personnelCode" 2025-08-09 12:47:04 +03:30
MahanCh
2743493a11 add correct validation for create ContractingPartyBankAccounts 2025-08-09 11:02:32 +03:30
MahanCh
f9de490c13 cors 2025-08-07 17:13:43 +03:30
MahanCh
f374ff3012 PaymentTransaction Get data from it 2025-08-07 15:09:50 +03:30
MahanCh
563fe563c0 fix appsetting bug 2025-08-07 14:29:44 +03:30
MahanCh
c75e3464d7 fix bug 2025-08-07 10:08:56 +03:30
MahanCh
e3a5fb578b Change Payment Instrument api 2025-08-07 10:08:02 +03:30
MahanCh
8cb99b2862 ADD ROUTE 2025-08-07 10:00:28 +03:30
MahanCh
57b2ad3445 test for deploying 2025-08-06 15:30:13 +03:30
SamSys
3befd6f0d9 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-08-06 15:01:02 +03:30
SamSys
8f10aa54a8 PaidLiveTimeSapn on checkout Footer bug fixed 2025-08-06 15:00:13 +03:30
MahanCh
efbd74479b fix error 2025-08-06 14:23:21 +03:30
MahanCh
8432b2660e Merge branch 'Feature/Chcekout/AddHasConflict' into Main
# Conflicts:
#	ServiceHost/Areas/Admin/Controllers/FinancialStatementController.cs
2025-08-06 14:11:06 +03:30
MahanCh
2f9426bdaf Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-06 14:07:44 +03:30
MahanCh
5477519464 add extensionAsync in institutionContract for Api 2025-08-06 14:07:12 +03:30
MahanCh
f92257b251 add order by for Get list 2025-08-06 13:49:11 +03:30
MahanCh
5efe58d23d add bank inquiry data from body 2025-08-06 13:40:10 +03:30
MahanCh
648ca44ebb change bank card to bank number 2025-08-06 13:17:12 +03:30
MahanCh
3232c979aa Merge remote-tracking branch 'origin/Main' into Main 2025-08-06 11:47:19 +03:30
MahanCh
ce8a0b397d Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-06 11:37:37 +03:30
MahanCh
c1fcaa1726 add transaction controller and create api
edit institutionContractController.cs and add excel download
2025-08-06 11:37:06 +03:30
Mahan Chamani
e1fd94db04 Update dotnet-developPublish.yml 2025-08-06 11:33:53 +03:30
Mahan Chamani
882f38d000 Update dotnet-developPublish.yml 2025-08-06 11:19:00 +03:30
Mahan Chamani
29560370d8 Update dotnet-developPublish.yml 2025-08-06 10:50:47 +03:30
Mahan Chamani
7841e8c336 Update dotnet-developPublish.yml 2025-08-06 10:41:16 +03:30
Mahan Chamani
a114cc8242 Update dotnet-developPublish.yml 2025-08-06 10:10:22 +03:30
MahanCh
473132d66a change Representative selectList 2025-08-06 09:55:33 +03:30
Mahan Chamani
9124f50577 Update dotnet-developPublish.yml 2025-08-05 18:22:41 +03:30
Mahan Chamani
7a13150223 Update dotnet-developPublish.yml 2025-08-05 18:18:14 +03:30
Mahan Chamani
f7059bcaeb Update dotnet-developPublish.yml 2025-08-05 18:08:18 +03:30
MahanCh
4c4e848f52 Merge branch 'master' into Main 2025-08-05 17:59:54 +03:30
Mahan Chamani
7984f18516 Update dotnet-developPublish.yml 2025-08-05 17:59:11 +03:30
MahanCh
94aa4fda51 Merge branch 'master' into Main 2025-08-05 17:57:38 +03:30
MahanCh
2d2207565e test 2025-08-05 17:55:48 +03:30
Mahan Chamani
3f8b85906f Create dotnet-developPublish.yml 2025-08-05 17:55:18 +03:30
MahanCh
346756c766 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 16:05:54 +03:30
MahanCh
20f208ac0e Add IsActive to group 2025-08-05 16:05:17 +03:30
MahanCh
2b602e4199 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 15:54:46 +03:30
MahanCh
9557f860bb Merge branch 'Feature/ContractingPartyBankAccount/Init' into Main 2025-08-05 15:54:41 +03:30
MahanCh
cf0dc95b5c add create range for ContractingPartyBankAccounts 2025-08-05 15:54:09 +03:30
MahanCh
c7f7b17866 add list create for payment instrument 2025-08-05 15:51:53 +03:30
MahanCh
d9259bf7c4 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-05 15:21:12 +03:30
MahanCh
55dc4c891f fix bug 2025-08-05 15:19:40 +03:30
MahanCh
daa2a0fdc1 add bank inquiry 2025-08-05 15:12:07 +03:30
MahanCh
6d6ce93f74 some changes 2025-08-05 14:25:32 +03:30
MahanCh
a71433f751 add AmountConflict in checkout 2025-08-05 13:11:12 +03:30
SamSys
68d1a8d9fe financialStament transaction list bug fixed 2025-08-05 04:16:15 +03:30
SamSys
a1dfc17ce9 static checkout fridayPay bug fixed 2025-08-04 18:17:35 +03:30
MahanCh
99a8cc181d Refactor: add stats method for tabs in GetList InstitutionContract 2025-08-04 16:27:16 +03:30
MahanCh
05cd8832d5 refactor: extract common pagination properties into PaginationRequest and apply it in InstitutionContractListSearchModel 2025-08-04 15:45:05 +03:30
MahanCh
a4bcb1ac55 refactor: update GetList methods to use PagedResult for paginated responses in InstitutionContract-related components 2025-08-04 15:36:20 +03:30
MahanCh
6cec0e39ec add PagedResult generic class to support paginated responses 2025-08-04 15:17:14 +03:30
MahanCh
08bf8395c4 Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-04 14:05:13 +03:30
MahanCh
bc6378beca Add Edit, Deactivate, Activate, and Sign/Unsign methods to institutionContractController and application 2025-08-04 14:04:49 +03:30
MahanCh
08adccb2f1 fix: update GetList method return type in IContractingPartyBankAccountsRepository 2025-08-04 12:50:19 +03:30
MahanCh
5e24071175 Merge branch 'Feature/PaymentInstrument/Init' into Main
# Conflicts:
#	Company.Domain/ContractingPartyBankAccountsAgg/IContractingPartyBankAccountsRepository.cs
#	CompanyManagment.App.Contracts/ContractingPartyBankAccounts/IContractingPartyBankAccountsApplication.cs
#	CompanyManagment.Application/ContractingPartyBankAccountsApplication.cs
#	CompanyManagment.EFCore/Repository/ContractingPartyBankAccountsRepository.cs
#	ServiceHost/Areas/Admin/Controllers/ContractingPartyBankAccountController.cs
2025-08-04 12:18:08 +03:30
MahanCh
ebc377603a refactor: replace OperationResult with raw data for select list methods in repositories and controllers 2025-08-04 12:10:17 +03:30
MahanCh
b70dbc8a6b Merge remote-tracking branch 'origin/master' 2025-08-04 11:04:13 +03:30
MahanCh
a34d81318b order payment transactions by creation date 2025-08-04 11:03:10 +03:30
SamSys
00357df859 test 2025-08-04 05:00:13 +03:30
MahanCh
ba8e07c63a Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-03 15:51:27 +03:30
MahanCh
f87b203939 Add New Searches for Get list in InstitutionContract 2025-08-03 15:49:07 +03:30
MahanCh
79807569dc add status for list of InstitutionContract 2025-08-03 15:19:09 +03:30
MahanCh
bda666b989 Merge branch 'Feature/InstitutionContract/Create-Api' into Main 2025-08-03 13:24:11 +03:30
MahanCh
9eca54276b update InstitutionContractRepository to apply pagination with PageIndex and PageSize parameters in GetList method 2025-08-03 13:23:45 +03:30
MahanCh
de64933d06 Merge branch 'Feature/PaymentInstrument/Init' into Main
# Conflicts:
#	CompanyManagment.EFCore/Repository/ContractingPartyBankAccountsRepository.cs
2025-08-03 13:19:47 +03:30
MahanCh
44763da729 add select list methods for PaymentInstrument and enhance repository logic 2025-08-03 13:10:51 +03:30
MahanCh
1f3bf123c4 update institutionContractController and application to improve validation and switch to async operations for contract creation 2025-08-03 10:53:08 +03:30
MahanCh
7a33b7da46 Merge branch 'Main' into Feature/InstitutionContract/Create-Api 2025-08-02 14:40:51 +03:30
MahanCh
da6573a147 Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-08-02 14:40:10 +03:30
MahanCh
6a6ec2610d add AccountHolderName and Type to PaymentInstrument model and repository 2025-08-02 14:39:46 +03:30
MahanCh
d9717033cf add Create method in institutionContractController to handle institution contract creation with validations and account registration 2025-08-02 14:27:55 +03:30
MahanCh
beafd047bf Merge branch 'Main' into Feature/InstitutionContract/Create-Api 2025-08-02 13:21:02 +03:30
MahanCh
7c3abeb463 Merge branch 'master' into Feature/InstitutionContract/Create-Api 2025-08-02 13:05:42 +03:30
MahanCh
040f40df52 add status for GetList in InstitutionContractRepository.cs 2025-08-02 13:05:32 +03:30
MahanCh
ac66df98f5 more complete the InstitutionContractRepository.cs get list data - NOT FINISHED YET 2025-07-31 15:13:27 +03:30
MahanCh
8da9f09663 add debt alert for users who don't have permissions 2025-07-31 14:09:16 +03:30
MahanCh
591de9acd8 add search and get some data from query for GetList in InstitutionContractRepository.cs 2025-07-31 13:37:43 +03:30
MahanCh
be282fa548 change get list in InstitutionContractApplication.cs 2025-07-31 12:22:01 +03:30
MahanCh
1b88cebdf2 delete fake data for ContractingPartyBankAccountController.cs 2025-07-31 11:42:53 +03:30
MahanCh
12356c927b Merge branch 'Feature/PaymentInstrument/Init' into Main 2025-07-31 11:23:54 +03:30
MahanCh
b73898f5ea Merge branch 'Feature/ContractingPartyBankAccount/Init' into Main 2025-07-31 11:23:42 +03:30
MahanCh
51e8686668 add pagination for get PaymentInstrument 2025-07-31 11:09:27 +03:30
MahanCh
133b99d5fc change GetList of ContractingPartyBankAccounts and add count to it 2025-07-31 10:54:20 +03:30
SamSys
6c814d5dce add new static account 2025-07-30 19:42:25 +03:30
MahanCh
9879857a97 init PaymentInstrument 2025-07-30 17:03:01 +03:30
MahanCh
e3f29e5efa change header login button 2025-07-29 17:14:51 +03:30
MahanCh
13278e2c24 fix: change the route of jquery mask in Admin new 2025-07-29 14:13:10 +03:30
MahanCh
5ca32bbbaf Add Redirect If the User is Authenticated in Home Screen 2025-07-29 14:06:38 +03:30
SamSys
3ea80c1344 merge api to master 2025-07-28 23:26:36 +03:30
MahanCh
5ae31b9cea add "debt" section for mobile 2025-07-28 16:17:53 +03:30
SamSys
0d06457e1f Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-28 14:45:27 +03:30
SamSys
bdc433b0a3 employee children delet bug fixed 2025-07-28 14:45:17 +03:30
MahanCh
e87733f5cb Add Client Menu changes and add "debt" section in header 2025-07-28 14:20:36 +03:30
MahanCh
60bd120196 add main page and commented "register" buttons 2025-07-28 12:43:00 +03:30
MahanCh
0a41751c15 Merge branch 'master' into Api 2025-07-28 11:55:12 +03:30
MahanCh
41f39fb6fa FIX: fix WeeklyOffDays Select On Null Error 2025-07-28 11:53:08 +03:30
MahanCh
e8fd8bdace change the menu for new items 2025-07-28 11:39:53 +03:30
MahanCh
9f2487f8ef add new menu Items 2025-07-27 17:40:30 +03:30
MahanCh
32dbd094e0 Feat: Add Condition For FinancialStatmentRepository.cs to set balance 0 when amount searched 2025-07-27 17:15:20 +03:30
MahanCh
b97039ee15 Feat: add institutionContractController.cs and GetList() Method but not Implemented Yet 2025-07-27 17:02:59 +03:30
MahanCh
313579cdee add fake api - disable employeeReport in Menu 2025-07-27 13:16:21 +03:30
MahanCh
3bda7116a2 Merge branch 'refs/heads/Feature/ContractingPartyBankAccount/Init' into Api
# Conflicts:
#	.gitignore
2025-07-27 12:19:04 +03:30
MahanCh
8bb29447e2 add .idea Folder to .gitignore 2025-07-27 11:32:46 +03:30
SamSys
8dc839f561 financialStatment row Balance bug fixed 2025-07-26 20:39:56 +03:30
SamSys
9f9c0d64a9 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-26 16:05:32 +03:30
SamSys
751c1a4131 change checkout footer [TotalPresent and TotalWorking] 2025-07-26 16:05:25 +03:30
MahanCh
b96ed1c7c3 Feat:init ContractingPartyBankAccount Module 2025-07-26 15:58:01 +03:30
MahanCh
500d7fc8d4 fix style bugs 2025-07-26 11:44:21 +03:30
MahanCh
b8cfc8eb56 fix menu bug problem 2025-07-24 11:30:41 +03:30
MahanCh
4c0f4bb70c Merge branch 'Api' of https://github.com/syntax24/OriginalGozareshgir into Api 2025-07-24 11:27:42 +03:30
MahanCh
6317ebb079 Merge branch 'master' into Api 2025-07-24 11:26:29 +03:30
MahanCh
91d86dbd2e fix menu admin monthly overview url for admin new 2025-07-24 11:26:14 +03:30
SamSys
aedaf84d57 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-23 19:16:54 +04:00
SamSys
b0c1f216a1 checkout MainList bug fixed 2025-07-23 19:16:47 +04:00
syntax24
bd42a6d5e9 menu change 2025-07-23 17:19:13 +03:30
syntax24
e924ca7049 change menu 2025-07-23 16:56:40 +03:30
syntax24
482eb8ab0b change menu 2025-07-23 16:54:04 +03:30
SamSys
7541abb92c Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-23 16:46:22 +04:00
SamSys
91365f5aeb bug : Load rollCall Contract to Create checkout - Fixed 2025-07-23 16:46:16 +04:00
MahanCh
0664a71047 add contracting party to get financial preview 2025-07-23 13:48:54 +03:30
MahanCh
4ff2596864 fix some bugs for admin monthly overview 2025-07-23 12:42:52 +03:30
MahanCh
744078dd6c add id to select lists 2025-07-23 10:46:00 +03:30
syntax24
1ebc93a1f8 insurance change [workshopId = 666} commented 2025-07-23 03:25:23 +03:30
SamSys
a61c62a2c3 add new metod "CreateFromBankGateway" 2025-07-23 03:43:29 +04:00
syntax24
0981dc20ec appsetting change 2025-07-22 14:21:24 +03:30
MahanCh
e8a65e51db change command 2025-07-22 13:57:58 +03:30
MahanCh
fb10d962a6 Add validation and chnage create financial statement order 2025-07-22 13:32:00 +03:30
syntax24
ad2612b60c change insurance exception workshop 2025-07-22 13:25:29 +03:30
MahanCh
3254db4a62 change financial preivew method to post 2025-07-22 12:22:03 +03:30
MahanCh
8325752355 add userType to login data 2025-07-22 11:09:42 +03:30
MahanCh
bb3a50eb18 add pagination Queryrable - add pagination for workshop select List 2025-07-22 11:07:16 +03:30
MahanCh
767022d0b8 fix bug 2025-07-22 09:39:31 +03:30
SamSys
6e7199cf6d add new option to insurance 2025-07-21 19:43:22 +04:00
MahanCh
9ab4670d68 fix failedBug 2025-07-21 17:52:55 +03:30
MahanCh
d080b093e8 change mediaType for CreateApi 2025-07-21 16:49:17 +03:30
MahanCh
f2717de5bf merge from CreateApi for GetDetailsByPublicId 2025-07-21 15:11:18 +03:30
MahanCh
e5fa554971 change Get details by public Id Name 2025-07-21 15:03:26 +03:30
MahanCh
6932ba7b79 add query for getting data from sms preview 2025-07-21 14:57:36 +03:30
MahanCh
cc3b18bc99 add publicId to financialStatement 2025-07-21 14:19:51 +03:30
MahanCh
194323004b refactor: add redirect from backend to payment gateway 2025-07-21 11:43:29 +03:30
MahanCh
5a3b99d07c add id to workshopSelectList 2025-07-21 11:21:14 +03:30
SamSys
aab65e07dc create rollcall transction add workshop name 2025-07-20 16:42:29 +04:00
MahanCh
3c6e83a967 merge from CreateApiPaymentGateWay 2025-07-20 14:56:19 +03:30
MahanCh
bfd6632940 change the step from paymentCallBack - set transactionId on create PaymentGateway 2025-07-20 14:53:50 +03:30
SamSys
39a91c269d change 2025-07-20 14:50:51 +04:00
SamSys
29875f4870 Create RollCall Transaction Completed 2025-07-20 14:48:51 +04:00
MahanCh
0859cd3ba4 merged from client/financial/api 2025-07-20 13:06:17 +03:30
MahanCh
200f86b270 add using 2025-07-20 13:05:25 +03:30
MahanCh
54b3d6ad2c fix bugs 2025-07-20 13:05:13 +03:30
SamSys
e9ab5c40ef Create Financial Transaction 2025-07-20 13:25:12 +04:00
SamSys
c7b9f2ae20 add RollCall service transaction 2025-07-20 13:14:12 +04:00
MahanCh
bf08af0b3d Merge branch 'Api' of https://github.com/syntax24/OriginalGozareshgir into Api 2025-07-20 12:16:31 +03:30
MahanCh
314ec82133 merge from financial client api branch 2025-07-20 12:16:24 +03:30
MahanCh
76448cdca4 refactor:update get financial for client 2025-07-20 12:15:20 +03:30
SamSys
9f33b481fa Add Create transaction metod 2025-07-20 12:01:28 +04:00
SamSys
f6441f916e Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-20 11:27:59 +04:00
SamSys
fe20c63baf change RollcallServiceCreateTransaction 2025-07-20 11:27:41 +04:00
syntax24
5427782b06 Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-19 18:27:48 +03:30
syntax24
0806b55dfb add client cors 2025-07-19 18:27:42 +03:30
syntax24
7f68e11f9d Merge branch 'Api' of https://github.com/samsyntax24/OriginalGozareshgir into Api 2025-07-19 18:26:02 +03:30
syntax24
f550aca7f7 add client cors 2025-07-19 18:25:53 +03:30
SamSys
f1f3ff199a Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir 2025-07-19 18:43:15 +04:00
SamSys
60252ab032 Insurance bug fix - CreateTransction for rolllCall 2025-07-19 18:43:05 +04:00
MahanCh
15e608a1cf merge from Feature/ContractingParty/AddSearchForSelectList 2025-07-19 16:37:19 +03:30
MahanCh
f3bf66aeb0 feat: add search for contractingparty select list 2025-07-19 16:35:21 +03:30
MahanCh
8ac15191ad merge from create api payment gateway 2025-07-19 15:02:32 +03:30
MahanCh
a177d6063d fix api url bug 2025-07-19 15:01:50 +03:30
MahanCh
59f063b824 merge from createApiGatewat 2025-07-19 13:30:41 +03:30
MahanCh
be2333cac8 add a validation for call back and fill Id in transaction Get details 2025-07-19 13:28:00 +03:30
MahanCh
f8a1aa596d merge from api createApigateway 2025-07-19 13:25:58 +03:30
MahanCh
64422755f2 complete payment gateway 2025-07-19 13:11:46 +03:30
8255e8679e add get profile 2025-07-17 21:15:37 +03:30
MahanCh
62bcd4d6b6 add payment for api gateway 2025-07-17 15:20:34 +03:30
MahanCh
af2c71ea09 add select workshop for admin api 2025-07-16 14:48:27 +03:30
MahanCh
0cb9cfe9b2 refactor: change Search of GetPaymentTransactions 2025-07-16 14:31:43 +03:30
MahanCh
558021ac6a feat: add debt amount in client profile 2025-07-16 14:24:39 +03:30
MahanCh
0b59e6af15 get detail from aqayepardakht for create payment transaction 2025-07-16 12:21:03 +03:30
MahanCh
eecdcc11c0 add dad-mehr api gateway for test 2025-07-16 11:59:02 +03:30
MahanCh
ccbc180c96 add checkout salaryAid option To Create 2025-07-16 11:45:45 +03:30
MahanCh
376d9d1d78 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-07-16 10:16:11 +03:30
MahanCh
7ddd51034a revert print confirm employer for block workshop 2025-07-16 10:13:34 +03:30
MahanCh
a63fed8c4a add workshopSlug in login controller 2025-07-16 09:50:28 +03:30
SamSys
042530b6e3 Create Debt for stand from Excel 2025-07-16 03:39:33 +04:00
SamSys
0579692a55 add new descriptonOption to financialStatment 2025-07-16 02:49:48 +04:00
SamSys
e26df8026e add new Description Option to financialStatment create and edit 2025-07-16 02:39:46 +04:00
MahanCh
5ebcbcf774 add get profileMethod 2025-07-15 16:00:49 +03:30
MahanCh
2bdfdb366e fix create employee by client 2025-07-15 15:39:32 +03:30
MahanCh
b1a5333a25 add archive code to insurance list 2025-07-15 13:55:17 +03:30
syntax24
bf24b3b36d api to master merged 2025-07-15 13:11:20 +03:30
MahanCh
e9b115e962 Merge branch 'master' into MergeApiToMaster 2025-07-15 11:52:40 +03:30
MahanCh
6f1e651559 Merge branch 'Feature/Insurance/Employer-Confirm-Print' of https://github.com/syntax24/OriginalGozareshgir into Feature/Insurance/Employer-Confirm-Print 2025-07-15 11:47:21 +03:30
MahanCh
143cc4943c add archivecode and set employer confirm list available 2025-07-15 11:47:16 +03:30
MahanCh
33ae219fbf print confirm employer insurance available in block workshops 2025-07-15 11:25:22 +03:30
MahanCh
8f8a971a41 merge from CreateEmployeeBug 2025-07-15 11:08:40 +03:30
MahanCh
94058660b6 fix create employee bug 2025-07-15 11:07:37 +03:30
SamSys
725559e7c1 new metod to InstitutionContract 2025-07-15 02:58:26 +03:30
MahanCh
aab30b3a4b Fix FinancialStatement bug 2025-07-14 17:19:27 +03:30
MahanCh
d0e05df33a Add AppSetting Configuration 2025-07-13 16:07:55 +03:30
MahanCh
8eaa739e5e Api merged with master 2025-07-13 15:28:29 +03:30
MahanCh
358544e56c Merge branch 'master' into API 2025-07-13 14:58:30 +03:30
MahanCh
fb52e99c68 add financial statement controller 2025-07-13 14:17:52 +03:30
MahanCh
8eb74fea15 refactor: comment InsuranceConfirm Condtion in InsuranceList index.js 2025-07-13 10:24:52 +03:30
MahanCh
00012cef52 Add RoleName Ro CurrentAccountInfo
Add Payment Transaction Time in Query
2025-07-12 16:29:14 +03:30
MahanCh
ba994a5802 feat: add wallet api for aqaye pardakht 2025-07-10 11:55:18 +03:30
MahanCh
f4ec4f43c6 add institution Contract Excel 2025-07-09 17:19:28 +03:30
MahanCh
030a622252 change payment transaction status 2025-07-09 13:39:42 +03:30
MahanCh
3099881416 Merge branch 'API' of https://github.com/syntax24/OriginalGozareshgir into API 2025-07-09 13:15:31 +03:30
MahanCh
6449776348 feat : add payment transaction controller 2025-07-09 13:15:05 +03:30
MahanCh
e8f7f6b778 fix : update data from edit employee in grouping in cws 2025-07-09 13:01:36 +03:30
MahanCh
513b093c66 set create payment transaction for sandbox creation 2025-07-09 12:45:09 +03:30
MahanCh
b0b8680125 fix: weekly offdays foreign key conflict in CreateEmployeesSettingsAndSetChanges 2025-07-09 12:06:42 +03:30
MahanCh
2e63c7b80a refactor: complete get payment transaction - add paymentCallBack 2025-07-09 11:54:28 +03:30
MahanCh
255d13049e add payment transaction 2025-07-08 16:50:09 +03:30
MahanCh
2714732750 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir 2025-07-08 13:51:59 +03:30
MahanCh
2a78a9dc1a change employee upload picture change name style 2025-07-08 13:51:52 +03:30
MahanCh
60b53f6e39 add payment PaymentGateway 2025-07-08 12:54:23 +03:30
SamSys
87f8517afb Registration Worklow api 2025-07-08 08:29:36 +03:30
SamSys
45a4a735ca register/init merged 2025-07-08 05:57:22 +03:30
SamSys
95b09278aa KababMahdi bug fixed merged 2025-07-07 18:08:08 +03:30
SamSys
6e5f41ec60 dad-mehr ConnectionStrings added 2025-07-07 14:28:15 +03:30
SamSys
f2b3a26471 employeeUploadPicture bug fixed merged 2025-07-07 14:12:27 +03:30
MahanCh
629ae1f0df Merge branch 'master' into API 2025-07-07 14:10:46 +03:30
MahanCh
b9db912441 Revert "set cookie domain"
This reverts commit b3d339d7fb.
2025-07-07 14:00:21 +03:30
MahanCh
b3d339d7fb set cookie domain 2025-07-07 13:01:50 +03:30
SamSys
33e3efeef5 manadatory Compute friday count bug fix 2025-07-07 02:14:38 +03:30
MahanCh
35f948484e chnage use cors placement 2025-07-03 13:46:06 +03:30
MahanCh
4ec744a6bd Merge branch 'API' of https://github.com/syntax24/OriginalGozareshgir into API 2025-07-02 12:03:31 +03:30
MahanCh
c30c460a68 feature : add login controller and get detail profile
Add user profile and permissions handling

- Updated `AuthHelper` to deserialize permissions from claims.
- Introduced `GetDates` method in `GeneralController` for date info.
- Created `LoginController` with `GetProfile` method to return user profile details.
2025-07-02 12:03:25 +03:30
SamSys
6f292ddac6 Program.cs change 2025-07-01 03:23:43 +03:30
MahanCh
5c5f3eefa6 complete new checkout calcualation for kebab mahdi time differences 2025-06-30 13:30:49 +03:30
MahanCh
3fa027dfd1 change rollcall mandatoory computes 2025-06-26 14:43:11 +03:30
MahanCh
b9943cf460 change select list parameter name 2025-06-25 15:50:18 +03:30
MahanCh
8d490cd3fe change name spaces 2025-06-25 15:02:10 +03:30
MahanCh
1e3780be38 change base controllers name - add dates and add admin select List 2025-06-25 15:01:29 +03:30
MahanCh
92f68d8555 fix enum convertor for api and razor 2025-06-25 11:00:35 +03:30
MahanCh
8284ec199f add new rule for rollcall 2025-06-24 12:02:23 +03:30
d27b8484a2 add entire teamwork api to original 2025-06-23 17:07:15 +03:30
5c637e3626 merge from master 2025-06-23 16:00:45 +03:30
SamSys
87afbbe44c change of register 2025-06-03 16:48:42 +03:30
5fa49a4988 change main pages 2025-06-01 18:23:51 +03:30
SamSys
5576ee5c24 api started 2025-05-30 23:04:53 +03:30
MahanCh
99e807fa23 fix step4 bug 2025-05-20 17:45:43 +03:30
MahanCh
2ce17dcac9 change some styles 2025-05-19 18:04:47 +03:30
MahanCh
233c1a3aa9 merge from master 2025-05-19 18:04:36 +03:30
MahanCh
37cd07c2b8 fix conflict 2025-05-18 17:54:55 +03:30
MahanCh
6201492879 change step4 2025-05-18 17:52:33 +03:30
SamSys
489528d076 new version of Register 2025-05-14 21:24:06 +03:30
MahanCh
3a6f87eaca fix some register financial bugs 2025-05-07 22:45:42 +03:30
MahanCh
ec277629fb fix register financial problems 2025-05-04 20:58:45 +03:30
MahanCh
faeb297f5c fix register problems 2025-04-28 15:49:56 +03:30
MahanCh
c3457881b0 add register part 2025-04-23 23:22:26 +03:30
470 changed files with 269864 additions and 10921 deletions

View File

@@ -0,0 +1,48 @@
name: Deploy Development ASP.NET Core App to IIS
on:
push:
branches:
- Main
env:
DOTNET_ENVIRONMENT: Development
jobs:
build-and-deploy:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x' # یا نسخه پروژه‌ت
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release
- name: Publish
run: dotnet publish --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
- name: Deploy to IIS via Web Deploy
shell: powershell
run: |
$publishFolder = Resolve-Path ./publish
& "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
-verb:sync `
-source:contentPath="$publishFolder" `
-dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
-allowUntrusted `
-enableRule:AppOffline
env:
SERVER_HOST: your-server-ip-or-domain
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

2
.gitignore vendored
View File

@@ -361,4 +361,4 @@ MigrationBackup/
# # Fody - auto-generated XML schema
# FodyWeavers.xsd
.idea

View File

@@ -15,8 +15,25 @@
<PackageReference Include="PersianTools.Core" Version="2.0.4" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="MD.PersianDateTime.Standard" Version="2.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Application\UID\UidService.cs" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Application\AuthorizedPerson\AuthorizedPersonApplication.cs" />
<Compile Remove="Application\AuthorizedPerson\IAuthorizedPersonApplication.cs" />
<Compile Remove="Domain\AuthorizedPersonAgg\IAuthorizedPersonRepository.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Domain\AuthorizedPersonAgg\" />
<Folder Include="InfraStructure\AuthorizedPerson\" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,6 @@
namespace _0_Framework.Application;
public class AppSettingConfiguration
{
public string Domain { get; set; }
}

View File

@@ -40,7 +40,10 @@ public class AuthHelper : IAuthHelper
result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
result.SubAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId").Value);
result.WorkshopName = claims.FirstOrDefault(x => x is { Type: "WorkshopName" })?.Value;
return result;
result.Permissions = Tools.DeserializeFromBsonList<int>(claims.FirstOrDefault(x => x is { Type: "permissions" })?.Value);
result.RoleName = claims.FirstOrDefault(x => x is { Type: "RoleName" })?.Value;
result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value??"0");
return result;
}
public List<int> GetPermissions()
@@ -74,7 +77,7 @@ public class AuthHelper : IAuthHelper
#region Vafa
public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName)
public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName,long newWorkshopId)
{
var user = _contextAccessor.HttpContext.User;
@@ -83,6 +86,7 @@ public class AuthHelper : IAuthHelper
var claimsIdentity = (ClaimsIdentity)user.Identity;
var existingClaimSlug = claimsIdentity.FindFirst("WorkshopSlug");
var existingClaimName = claimsIdentity.FindFirst("WorkshopName");
var existingWorkshopId = claimsIdentity.FindFirst("WorkshopId");
if (existingClaimSlug != null)
{
@@ -94,9 +98,14 @@ public class AuthHelper : IAuthHelper
claimsIdentity.RemoveClaim(existingClaimName);
}
if (existingWorkshopId != null)
{
claimsIdentity.RemoveClaim(existingWorkshopId);
}
claimsIdentity.AddClaim(new Claim("WorkshopSlug", newWorkshopSlug));
claimsIdentity.AddClaim(new Claim("WorkshopName", newWorkshopName));
claimsIdentity.AddClaim(new Claim("WorkshopId",newWorkshopId.ToString()));
var authProperties = new AuthenticationProperties
@@ -126,8 +135,16 @@ public class AuthHelper : IAuthHelper
return "";
}
#endregion
public long GetWorkshopId()
{
return long.Parse(_contextAccessor.HttpContext?.User.Claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value ?? "0");
}
public string CurrentAccountRole()
{
@@ -180,6 +197,7 @@ public class AuthHelper : IAuthHelper
//mahanChanges
new("workshopList",workshopBson),
new("WorkshopSlug",slug),
new("WorkshopId", account.WorkshopId.ToString()),
new("WorkshopName",account.WorkshopName??"")
};

View File

@@ -20,6 +20,7 @@ public class AuthViewModel
public int? PositionValue { get; set; }
public string WorkshopSlug { get; set; }
public long WorkshopId { get; set; }
public string WorkshopName { get; set; }
public List<WorkshopClaim> WorkshopList { get; set; }

View File

@@ -0,0 +1,8 @@
namespace _0_Framework.Application.Enums;
public enum ActivationStatus
{
None = 0,
Active = 1,
DeActive = 2
}

View File

@@ -0,0 +1,8 @@
namespace _0_Framework.Application.Enums;
public enum LegalType
{
None = 0,
Real = 1,
Legal = 2
}

View File

@@ -17,11 +17,12 @@ public interface IAuthHelper
#region Vafa
void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName);
void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName, long workshopId);
#endregion
long CurrentSubAccountId();
string GetWorkshopSlug();
string GetWorkshopName();
long GetWorkshopId();
(long Id, UserType userType, long roleId) GetUserTypeWithId();
}

View File

@@ -0,0 +1,15 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
namespace _0_Framework.Application;
public class PagedResult<T> where T : class
{
public int TotalCount { get; set; }
public List<T> List { get; set; }
}
public class PagedResult<T,TMeta>:PagedResult<T> where T : class
{
public TMeta? Meta { get; set; }
}

View File

@@ -0,0 +1,7 @@
namespace _0_Framework.Application;
public class PaginationRequest
{
public int PageIndex { get; set; } = 1;
public int PageSize { get; set; } = 30;
}

View File

@@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Json;
using System.Security.Policy;
using System.Security.Principal;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
namespace _0_Framework.Application.PaymentGateway;
public class AqayePardakhtPaymentGateway:IPaymentGateway
{
private static string _pin = "86EAF2C4D052F7D8759F";
private const string AccountNumber = "AP.1042276242";
private const string EncryptedKey = "130D2@D2923";
private readonly HttpClient _httpClient;
public AqayePardakhtPaymentGateway(IHttpClientFactory httpClientFactory,IOptions<AppSettingConfiguration> appSetting)
{
_httpClient = httpClientFactory.CreateClient();
if (appSetting.Value.Domain == ".dadmehrg.ir")
{
_pin = "7349F84E81AB584862D9";
}
}
public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command,CancellationToken cancellationToken =default)
{
var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
{
pin = _pin,
amount = command.Amount,
callback = command.CallBackUrl,
card_number = command.CardNumber,
invoice_id = command.InvoiceId,
mobile = command.Mobile,
email = command.Email??"",
description = command.Description,
}, cancellationToken: cancellationToken);
var resStr = await response.Content.ReadAsStringAsync(cancellationToken);
var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
return result;
}
public string GetStartPayUrl(string transactionId) =>
$"https://panel.aqayepardakht.ir/startpay/{transactionId}";
public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
{
var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/verify", new
{
pin = _pin,
amount = command.Amount,
transid = command.TransactionId,
}, cancellationToken: cancellationToken);
var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
return result;
}
public async Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
{
var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
{
pin = "sandbox",
amount = command.Amount,
callback = command.CallBackUrl,
card_number = command.Amount,
invoice_id = command.InvoiceId,
mobile = command.Mobile,
email = command.Email,
description = command.Email,
}, cancellationToken: cancellationToken);
var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
return result;
}
public string GetStartPaySandBoxUrl(string transactionId) =>
$"https://panel.aqayepardakht.ir/startpay/sandbox/{transactionId}";
public async Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
{
var response =await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/getmoney", new
{
account=AccountNumber,
code = EncryptedKey
}, cancellationToken: cancellationToken);
var jsonString = await response.Content.ReadAsStringAsync(cancellationToken);
var result = await response.Content.ReadFromJsonAsync<WalletAmountResponse>(cancellationToken);
return result;
}
}

View File

@@ -0,0 +1,62 @@
using Microsoft.AspNetCore.Server.HttpSys;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
namespace _0_Framework.Application.PaymentGateway;
public interface IPaymentGateway
{
Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken =default);
string GetStartPayUrl(string transactionId);
Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken=default);
Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken=default);
string GetStartPaySandBoxUrl(string transactionId);
Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken);
}
public class PaymentGatewayResponse
{
[JsonPropertyName("status")]
public string Status { get; set; }
[JsonPropertyName("code")]
public int? ErrorCode { get; set; }
[JsonPropertyName("transid")]
public string TransactionId { get; set; }
public bool IsSuccess => Status == "success";
}
public class WalletAmountResponse
{
[JsonPropertyName("status")]
public string Status { get; set; }
[JsonPropertyName("money")]
public double Amount { get; set; }
[JsonPropertyName("code")]
public int Code { get; set; }
}
public class CreatePaymentGatewayRequest
{
public double Amount { get; set; }
public string CallBackUrl { get; set; }
public string InvoiceId { get; set; }
public string CardNumber { get; set; }
public string Mobile { get; set; }
public string Email { get; set; }
public string Description { get; set; }
}
public class VerifyPaymentGateWayRequest
{
public string TransactionId { get; set; }
public double Amount { get; set; }
}

View File

@@ -0,0 +1,7 @@
namespace _0_Framework.Application;
public class SelectListViewModel
{
public long Id { get; set; }
public string Text { get; set; }
}

View File

@@ -30,8 +30,9 @@ public static class StaticWorkshopAccounts
/// 380 - افروز نظری
/// 381 - مهدی قربانی
/// 392 - عمار حسن دوست
/// 20 - سمیرا الهی نیا
/// </summary>
public static List<long> StaticAccountIds = [2, 3, 380, 381, 392];
public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20];
/// <summary>
/// این تاریخ در جدول اکانت لفت ورک به این معنیست

View File

@@ -41,6 +41,23 @@ public static class Tools
return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
}
/// <summary>
/// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
/// </summary>
/// <param name="startDate"></param>
/// <param name="monthPlus"></param>
/// <returns></returns>
public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
{
int startYear = Convert.ToInt32(startDate.Substring(0, 4));
int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
int startDay = Convert.ToInt32(startDate.Substring(8, 2));
var start = new PersianDateTime(startYear, startMonth, startDay);
var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
return ($"{end}".ToGeorgianDateTime(), $"{end}");
}
/// <summary>
/// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده

View File

@@ -38,7 +38,7 @@ public class UidBasicInformation
{
"GENDER_MALE" => Application.Gender.Male,
"GENDER_FEMALE" => Application.Gender.Female,
_ => throw new ArgumentOutOfRangeException()
_ => Application.Gender.None
};
}
public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);

View File

@@ -1,79 +0,0 @@
using System;
using System.Net.Http;
using System.Net.Http.Json;
using System.Text;
using System.Text.Json;
using System.Threading.Tasks;
using Newtonsoft.Json;
namespace _0_Framework.Application.UID;
public class UidService : IUidService
{
private readonly HttpClient _httpClient;
private const string BaseUrl = "https://json-api.uid.ir/api/inquiry/";
public UidService()
{
_httpClient = new HttpClient()
{
BaseAddress = new Uri(BaseUrl)
};
}
public async Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode, string birthDate)
{
var request = new PersonalInfoRequest
{
BirthDate = birthDate,
NationalId = nationalCode,
RequestContext = new UidRequestContext()
};
var json = JsonConvert.SerializeObject(request);
var contentType = new StringContent(json, Encoding.UTF8, "application/json");
try
{
var requestResult = await _httpClient.PostAsync("person/v2", contentType);
if (!requestResult.IsSuccessStatusCode)
return null;
var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
if (responseResult.BasicInformation != null)
{
responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
}
return responseResult;
}
catch
{
return new PersonalInfoResponse(new UidBasicInformation(),
new IdentificationInformation(default, default, default, default, default), new RegistrationStatus(),
new ResponseContext(new UidStatus(14, "")));
}
}
public async Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode, string phoneNumber)
{
var request = new PersonalInfoRequest
{
MobileNumber = phoneNumber,
NationalId = nationalCode,
RequestContext = new UidRequestContext()
};
var json = JsonConvert.SerializeObject(request);
var contentType = new StringContent(json, Encoding.UTF8, "application/json");
var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
if (!requestResult.IsSuccessStatusCode)
return null;
var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
return responseResult;
}
}

View File

@@ -119,7 +119,7 @@ public class BaseCustomizeEntity : EntityBase
public BreakTime BreakTime { get; protected set; }
public List<WeeklyOffDay> WeeklyOffDays { get; set; }
public List<WeeklyOffDay> WeeklyOffDays { get; set; } = [];
public void FridayWorkToWeeklyDayOfWeek()
{

View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore.Storage;
namespace _0_Framework.Domain;
@@ -17,4 +18,6 @@ public interface IRepository<TKey, T> where T:class
bool Exists(Expression<Func<T, bool>> expression);
void SaveChanges();
Task SaveChangesAsync();
Task<IDbContextTransaction> BeginTransactionAsync();
}

View File

@@ -0,0 +1,75 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Diagnostics;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
namespace _0_Framework.Exceptions.Handler;
public class CustomExceptionHandler : IExceptionHandler
{
private readonly ILogger<CustomExceptionHandler> _logger;
public CustomExceptionHandler(ILogger<CustomExceptionHandler> logger)
{
_logger = logger;
}
public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
{
_logger.LogError(
"Error Message: {exceptionMessage}, Time of occurrence {time}",
exception.Message, DateTime.UtcNow);
(string Detail, string Title, int StatusCode) details = exception switch
{
InternalServerException =>
(
exception.Message,
exception.GetType().Name,
context.Response.StatusCode = StatusCodes.Status500InternalServerError
),
BadRequestException =>
(
exception.Message,
exception.GetType().Name,
context.Response.StatusCode = StatusCodes.Status400BadRequest
),
NotFoundException =>
(
exception.Message,
exception.GetType().Name,
context.Response.StatusCode = StatusCodes.Status404NotFound
),
UnAuthorizeException =>
(
exception.Message,
exception.GetType().Name,
context.Response.StatusCode = StatusCodes.Status401Unauthorized
),
_ =>
(
exception.Message,
exception.GetType().Name,
context.Response.StatusCode = StatusCodes.Status500InternalServerError
)
};
var problemDetails = new ProblemDetails
{
Title = details.Title,
Detail = details.Detail,
Status = details.StatusCode,
Instance = context.Request.Path
};
problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);
return true;
}
}

View File

@@ -0,0 +1,10 @@
using System;
namespace _0_Framework.Exceptions;
public class UnAuthorizeException:Exception
{
public UnAuthorizeException(string message) : base(message)
{
}
}

View File

@@ -0,0 +1,22 @@
using System.Collections.Generic;
using System.Linq;
namespace _0_Framework.InfraStructure;
public static class QueryableExtensions
{
public static IQueryable<T> ApplyPagination<T>(this IQueryable<T> query, int page, int pageSize)
{
if (page <= 0) page = 1;
if (pageSize <= 0) pageSize = 10;
return query.Skip((page - 1) * pageSize).Take(pageSize);
}
public static IEnumerable<T> ApplyPagination<T>(this IEnumerable<T> source, int page, int pageSize)
{
if (page <= 0) page = 1;
if (pageSize <= 0) pageSize = 10;
return source.Skip((page - 1) * pageSize).Take(pageSize);
}
}

View File

@@ -6,6 +6,7 @@ using System.Text;
using System.Threading.Tasks;
using _0_Framework.Domain;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
namespace _0_Framework.InfraStructure
{
@@ -70,5 +71,10 @@ namespace _0_Framework.InfraStructure
{
await _context.SaveChangesAsync();
}
public async Task<IDbContextTransaction> BeginTransactionAsync()
{
return await _context.Database.BeginTransactionAsync();
}
}
}

View File

@@ -64,4 +64,6 @@ public interface IAccountApplication
/// <param name="userName"></param>
/// <returns></returns>
public bool CheckExistClientAccount(string userName);
List<AccountViewModel> GetAdminAccountsNew();
}

View File

@@ -259,7 +259,8 @@ public class AccountApplication : IAccountApplication
var workshop = workshopList.First();
authViewModel.WorkshopName = workshop.Name;
authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
}
authViewModel.WorkshopId = workshop.Id;
}
}
_authHelper.Signin(authViewModel);
@@ -317,6 +318,7 @@ public class AccountApplication : IAccountApplication
var workshop = workshopList.First();
authViewModel.WorkshopName = workshop.WorkshopName;
authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
authViewModel.WorkshopId = workshop.WorkshopId;
}
_authHelper.Signin(authViewModel);
idAutoriz = 2;
@@ -368,6 +370,7 @@ public class AccountApplication : IAccountApplication
var workshop = workshopList.First();
authViewModel.WorkshopName = workshop.Name;
authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
authViewModel.WorkshopId = workshop.Id;
}
}
@@ -515,6 +518,7 @@ public class AccountApplication : IAccountApplication
var workshop = authViewModel.WorkshopList.First();
authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
authViewModel.WorkshopName = workshop.Name;
authViewModel.WorkshopId = workshop.Id;
}
_authHelper.Signin(authViewModel);
return operation.Succcedded(2);
@@ -795,4 +799,8 @@ public class AccountApplication : IAccountApplication
return _accountRepository.CheckExistClientAccount(userName);
}
public List<AccountViewModel> GetAdminAccountsNew()
{
return _accountRepository.GetAdminAccountsNew();
}
}

View File

@@ -0,0 +1,51 @@
using System;
using _0_Framework.Domain;
namespace Company.Domain.AuthorizedPersonAgg;
public class AuthorizedPerson : EntityBase
{
public string NationalCode { get; private set; }
public string FirstName { get; private set; }
public string LastName { get; private set; }
public string FatherName { get; private set; }
public string BirthDate { get; private set; }
public string Gender { get; private set; }
public string DeathStatus { get; private set; }
public string ShenasnameSeri { get; private set; }
public string ShenasnameSerial { get; private set; }
public string ShenasnamehNumber { get; private set; }
public bool IsVerified { get; private set; }
public DateTime? VerificationDate { get; private set; }
public AuthorizedPerson(string nationalCode, string firstName, string lastName, string fatherName,
string birthDate, string gender, string deathStatus, string shenasnameSeri,
string shenasnameSerial, string shenasnamehNumber)
{
NationalCode = nationalCode;
FirstName = firstName;
LastName = lastName;
FatherName = fatherName;
BirthDate = birthDate;
Gender = gender;
DeathStatus = deathStatus;
ShenasnameSeri = shenasnameSeri;
ShenasnameSerial = shenasnameSerial;
ShenasnamehNumber = shenasnamehNumber;
IsVerified = true;
VerificationDate = DateTime.Now;
}
public void UpdatePersonalInfo(string firstName, string lastName, string fatherName,
string gender, string deathStatus)
{
FirstName = firstName;
LastName = lastName;
FatherName = fatherName;
Gender = gender;
DeathStatus = deathStatus;
VerificationDate = DateTime.Now;
}
protected AuthorizedPerson() { }
}

View File

@@ -0,0 +1,9 @@
using _0_Framework.Domain;
namespace Company.Domain.AuthorizedPersonAgg;
public interface IAuthorizedPersonRepository : IRepository<long, AuthorizedPerson>
{
AuthorizedPerson GetByNationalCode(string nationalCode);
bool ExistsByNationalCode(string nationalCode);
}

View File

@@ -30,7 +30,7 @@ public class Checkout : EntityBase
string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
ICollection<CheckoutLoanInstallment> loanInstallments,
ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall)
ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall,TimeSpan employeeMandatoryHours)
{
EmployeeFullName = employeeFullName;
FathersName = fathersName;
@@ -90,8 +90,10 @@ public class Checkout : EntityBase
LoanInstallments = loanInstallments;
SalaryAids = salaryAids;
CheckoutRollCall = checkoutRollCall;
EmployeeMandatoryHours = employeeMandatoryHours;
}
public string EmployeeFullName { get; private set; }
public string IsActiveString { get; private set; }
public string Signature { get; private set; }
@@ -193,7 +195,16 @@ public class Checkout : EntityBase
/// </summary>
public string TotalDayOfBunosesCompute { get; private set; }
/// <summary>
/// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
/// </summary>
public bool HasAmountConflict { get; private set; }
/// <summary>
/// ساعت موظفی پرسنل در ماه
/// </summary>
public TimeSpan EmployeeMandatoryHours { get; set; }
#region valueObjects
public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
@@ -316,6 +327,16 @@ public class Checkout : EntityBase
{
CheckoutRollCall = checkoutRollCall;
}
public void SetAmountConflict(bool hasAmountConflict)
{
HasAmountConflict = hasAmountConflict;
}
public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
{
EmployeeMandatoryHours = employeeMandatoryHours;
}
}
public class CheckoutRollCall

View File

@@ -18,7 +18,7 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
/// <param name="سال به صورت رشته عددی"></param>
/// <param name="ماه بصورت رشته عددی"></param>
/// <returns></returns>
(bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId,
(bool hasChekout, double FamilyAlloance, double OverTimePay, double RotatingShift, double Nightwork, double Fridaywork, double YraesPay) HasCheckout(long workshopId, long employeId,
string year, string month);
EditCheckout GetDetails(long id);
@@ -78,4 +78,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
long workshopId, DateTime start, DateTime end);
#endregion
Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
}

View File

@@ -10,6 +10,7 @@ namespace Company.Domain.ClassifiedSalaryAgg
{
public class ClassifiedSalary : EntityBase
{
//test
public ClassifiedSalary(double group1, double group2, double group3, double group4, double group5, double group6, double group7, double group8, double group9, double group10, double group11, double group12, double group13, double group14, double group15, double group16, double group17, double group18, double group19, double group20, DateTime startDate, DateTime endDate, int year)
{
Group1 = group1;

View File

@@ -0,0 +1,26 @@
using _0_Framework.Domain;
namespace Company.Domain.ContactUsAgg;
public class ContactUs:EntityBase
{
public ContactUs(string firstName, string lastName, string email, string phoneNumber, string title, string message)
{
FirstName = firstName.Trim();
LastName = lastName.Trim();
Email = email;
PhoneNumber = phoneNumber;
Title = title;
Message = message;
FullName = FirstName + " " + LastName;
}
public string FirstName { get; private set; }
public string LastName { get; private set; }
public string Email { get; private set; }
public string PhoneNumber { get; private set; }
public string Title { get; private set; }
public string Message { get; private set; }
public string FullName { get; private set; }
}

View File

@@ -0,0 +1,8 @@
using _0_Framework.Domain;
namespace Company.Domain.ContactUsAgg;
public interface IContactUsRepository : IRepository<long, ContactUs>
{
}

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using _0_Framework.Application;
using _0_Framework.Domain;
using AccountManagement.Application.Contracts.Account;
using System.Threading.Tasks;
namespace Company.Domain.ContarctingPartyAgg;
@@ -14,7 +15,7 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
EditPersonalContractingParty GetDetailsToEdit(long id);
string GetFullName(long id);
List<PersonalContractingPartyViewModel> Search(PersonalContractingPartySearchModel searchModel2);
int GetLastArchiveCode();
int GetLastNewArchiveCode();
#region Mahan
List<string> SearchByName(string name);
@@ -42,6 +43,35 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
#endregion
/// <summary>
/// لیست طرف حساب ها
/// </summary>
/// <param name="searchModel"></param>
/// <returns></returns>
Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
/// <summary>
/// لیست طرف حساب برای سلکت لیست سرچ
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
Task<List<ContractingPartySelectListViewModel>> GetSelectList(string search,long id);
/// <summary>
/// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
/// </summary>
/// <returns></returns>
Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
/// <summary>
/// غیرفعال کردن طرف حساب و زیرمجموعه های آن
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<OperationResult<string>> DeactivateWithSubordinates(long id);
void Remove(PersonalContractingParty entity);
Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
}

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Security.Cryptography.X509Certificates;
using _0_Framework.Application;
using _0_Framework.Domain;
using Company.Domain.ContractingPartyBankAccountsAgg;
using Company.Domain.empolyerAgg;
using Company.Domain.RepresentativeAgg;
@@ -72,17 +73,22 @@ public class PersonalContractingParty : EntityBase
/// آیا از طریق ای پی ای احراز هویت شده است
/// </summary>
public bool IsAuthenticated { get; private set; }
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; private set; }
/// <summary>
/// سمت و صاحب امضاء اوراق (فقط برای طرف حقوقی)
/// </summary>
public string LegalPosition { get; private set; }
#endregion
public List<Employer> Employers { get; private set; }
public Representative Representative { get; set; }
public List<ContractingPartyBankAccount> ContractingPartyBankAccounts { get; set; }
public PersonalContractingParty()
{
@@ -92,7 +98,7 @@ public class PersonalContractingParty : EntityBase
public PersonalContractingParty(string fName, string lName, string nationalcode, string idNumber,
/*string legalName,*/ string registerId, string nationalId, string isLegal,
string phone, string agentPhone, string address,long representativeId,
string representativeFullName, int archiveCode, string state,string city, string zone, string sureName)
string representativeFullName, int archiveCode, string state,string city, string zone, string sureName,string legalPosition=null)
{
FName = fName;
@@ -118,8 +124,7 @@ public class PersonalContractingParty : EntityBase
IsActiveString = "true";
IsBlock = "false";
BlockTimes = 0;
LegalPosition = legalPosition;
}
@@ -149,7 +154,7 @@ public class PersonalContractingParty : EntityBase
}
public void EditLegal(string lName, string registerId, string nationalId, string phone, string agentPhone, string address, long representativeId, string representativeFullName, int archiveCode,
string state, string city, string zone, string sureName)
string state, string city, string zone, string sureName,string legalPosition = null)
{
LName = lName;
@@ -166,6 +171,8 @@ public class PersonalContractingParty : EntityBase
State = state;
City = city;
Zone = zone;
if (legalPosition != null)
LegalPosition = legalPosition;
}
@@ -213,4 +220,14 @@ public class PersonalContractingParty : EntityBase
this.Gender = gender;
this.IsAuthenticated = true;
}
public void RegisterComplete(string fatherName, string idNumberSeri, string idNumberSerial, DateTime dateOfBirth, Gender gender)
{
this.FatherName = fatherName;
this.IdNumberSeri = idNumberSeri;
this.IdNumberSerial = idNumberSerial;
this.DateOfBirth = dateOfBirth;
this.Gender = gender;
this.IsAuthenticated = true;
}
}

View File

@@ -0,0 +1,27 @@
using _0_Framework.Domain;
using Company.Domain.ContarctingPartyAgg;
namespace Company.Domain.ContractingPartyBankAccountsAgg;
public class ContractingPartyBankAccount : EntityBase
{
public long ContractingPartyId { get; private set; }
public PersonalContractingParty ContractingParty { get; private set; }
public string CardNumber { get; private set; }
public string AccountHolderName { get; private set; }
public string AccountNumber { get; private set; }
public string IBan { get; private set; }
public bool IsAuth { get; private set; }
public ContractingPartyBankAccount(long contractingPartyId, string cardNumber, string accountHolderName,
string accountNumber, string iBan , bool isAuth)
{
ContractingPartyId = contractingPartyId;
CardNumber = cardNumber;
AccountHolderName = accountHolderName;
AccountNumber = accountNumber;
IBan = iBan;
IsAuth = isAuth;
}
}

View File

@@ -0,0 +1,19 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
namespace Company.Domain.ContractingPartyBankAccountsAgg;
public interface IContractingPartyBankAccountsRepository:IRepository<long,ContractingPartyBankAccount>
{
Task<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
Task<List<string>> IBanSelectList(string search, string selected);
Task<List<string>> CardNumberSelectList(string search, string selected);
Task<List<string>> AccountNumberSelectList(string search, string selected);
Task<List<string>> GetAccountHolderNameSelectList(string search, string selected);
Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
}

View File

@@ -374,6 +374,13 @@ public class CustomizeCheckout : EntityBase
TotalPayment = TotalPayment - previousAmount + newAmount;
}
/// <summary>
/// آیا مغایرت مبلغ دارد
/// </summary>
public bool HasAmountConflict { get; private set; }
public void SetHasAmountConflict(bool hasConflict)
{
HasAmountConflict = hasConflict;
}
}

View File

@@ -377,4 +377,16 @@ public class CustomizeCheckoutTemp : EntityBase
{
TotalPayment = TotalPayment - previousAmount + newAmount;
}
/// <summary>
/// آیا مغایرت مبلغ دارد
/// </summary>
public bool HasAmountConflict { get; private set; }
public void SetHasAmountConflict(bool hasConflict)
{
HasAmountConflict = hasConflict;
}
}

View File

@@ -71,7 +71,12 @@ public interface IEmployeeRepository : IRepository<long, Employee>
Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId,
long workshopId);
#endregion
#endregion
#region Api
Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
#endregion
}

View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -15,7 +16,8 @@ public class FinancialStatment : EntityBase
{
ContractingPartyId = contractingPartyId;
ContractingPartyName = contractingPartyName;
PublicId = Guid.NewGuid();
FinancialTransactionList = [];
}
public FinancialStatment()
@@ -24,9 +26,24 @@ public class FinancialStatment : EntityBase
}
public long ContractingPartyId { get; private set; }
public string ContractingPartyName { get; private set; }
public Guid PublicId { get; private set; }
[NotMapped]
public string PublicIdStr => PublicId.ToString("N");
public List<FinancialTransaction> FinancialTransactionList { get; set; }
public void SetPublicId()
{
PublicId = Guid.NewGuid();
}
public void AddFinancialTransaction(FinancialTransaction financialTransaction)
{
if (financialTransaction == null)
throw new ArgumentNullException(nameof(financialTransaction));
FinancialTransactionList.Add(financialTransaction);
}
}

View File

@@ -3,14 +3,24 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.FinancialStatment;
using Microsoft.AspNetCore.Mvc;
namespace Company.Domain.FinancialStatmentAgg;
public interface IFinancialStatmentRepository : IRepository<long, FinancialStatment>
{
[Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(long accountId,
FinancialStatementSearchModel searchModel);
Task<OperationResult<ClientFinancialStatementViewModel>> GetDetailsByPublicId(string publicId);
Task<GetFinancialStatementBalanceAmount> GetBalanceAmount(long id);
Task<double> GetClientDebtAmount(long accountId);
Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel);
}

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.FinancilTransaction;
@@ -13,4 +14,15 @@ public interface IFinancialTransactionRepository : IRepository<long, FinancialTr
{
EditFinancialTransaction GetDetails(long id);
void RemoveFinancialTransaction(long id);
/// <summary>
/// ایجاد بدهی استند حضور غیاب برای اکسل
/// </summary>
/// <param name="contractingPartyId"></param>
/// <param name="transactionDate"></param>
/// <param name="debt"></param>
/// <param name="description"></param>
/// <returns></returns>
OperationResult CreateDebtFromExcel(long contractingPartyId, string transactionDate, double debt,
string description);
}

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.InstitutionContract;
using CompanyManagment.App.Contracts.Workshop;
@@ -13,7 +14,8 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
EditInstitutionContract GetDetails(long id);
EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
List<InstitutionContractViewModel> ContractWithoutValidContactInfo();
List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
List<InstitutionContractViewModel> NewSearch(InstitutionContractSearchModel searchModel);
List<InstitutionContractViewModel> PrintAll(List<long> id);
@@ -32,4 +34,22 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
int ArchiveCodeFinder(List<WorkshopViewModel> workshopViewModels);
InstitutionContract InstitutionContractByEmployerId(long employerId);
/// <summary>
/// ایجاد سند مالی حضور غیاب
/// </summary>
/// <param name="now"></param>
/// <param name="endOfMonthGr"></param>
/// <param name="endOfMonth"></param>
/// <param name="description"></param>
void RollcallServiceCreateTransaction();
Task<PagedResult<GetInstitutionContractListItemsViewModel>> GetList(InstitutionContractListSearchModel searchModel);
Task<GetInstitutionContractListStatsViewModel> GetListStats(InstitutionContractListSearchModel searchModel);
Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
Task<InstitutionContractWorkshopDetail> GetInstitutionWorkshopDetails(long institutionWorkshopDetailsId);
Task<InstitutionContract> GetIncludeWorkshopDetailsAsync(long institutionContractId);
void UpdateStatusIfNeeded(long institutionContractId);
}

View File

@@ -1,17 +1,22 @@
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using _0_Framework.Application;
using _0_Framework.Domain;
using Company.Domain.InstitutionContractContactInfoAgg;
using CompanyManagment.App.Contracts.InstitutionContract;
namespace Company.Domain.InstitutionContractAgg;
public class InstitutionContract : EntityBase
{
public InstitutionContract(string contractNo, long representativeId, string representativeName, long contractingPartyId,
public InstitutionContract(string contractNo, long representativeId, string representativeName,
long contractingPartyId,
string contractingPartyName, DateTime contractDateGr, string contractDateFa, string state, string city,
string address, DateTime contractStartGr, string contractStartFa, DateTime contractEndGr,
string contractEndFa, double contractAmount, double dailyCompenseation, double obligation,
double totalAmount, int extensionNo, string workshopManualCount, string employeeManualCount, string description, string officialCompany,string typeOfcontract, string hasValueAddedTax, double valueAddedTax)
double totalAmount, int extensionNo, string workshopManualCount, string employeeManualCount, string description,
string officialCompany, string typeOfcontract, string hasValueAddedTax, double valueAddedTax)
{
ContractNo = contractNo;
RepresentativeId = representativeId;
@@ -43,6 +48,10 @@ public class InstitutionContract : EntityBase
TypeOfContract = typeOfcontract;
HasValueAddedTax = hasValueAddedTax;
ValueAddedTax = valueAddedTax;
Status = InstitutionContractStatus.Incomplete;
ContactInfoList = [];
WorkshopDetails = [];
Installments = [];
}
public string ContractNo { get; private set; }
@@ -55,21 +64,24 @@ public class InstitutionContract : EntityBase
public string ContractDateFa { get; private set; }
public string State { get; private set; }
public string City { get; private set; }
public string Address { get; private set; }
//public long ContactInfoId { get; private set; }
public DateTime ContractStartGr { get; private set; }
public string ContractStartFa { get; private set; }
public DateTime ContractEndGr { get; private set; }
public string ContractEndFa { get; private set; }
// مبلغ قرارداد
public double ContractAmount { get; private set; }
//خسارت روزانه
public double DailyCompenseation { get; private set; }
//وجه التزام
public double Obligation { get; private set; }
// مبلغ کل قرارداد
public double TotalAmount { get; private set; }
public string WorkshopManualCount { get; private set; }
@@ -82,28 +94,33 @@ public class InstitutionContract : EntityBase
public string TypeOfContract { get; private set; }
public string HasValueAddedTax { get; set; }
public double ValueAddedTax { get; set; }
public InstitutionContractStatus Status { get; private set; }
public List<InstitutionContractWorkshopDetail> WorkshopDetails { get; set; }
public List<InstitutionContractContactInfo> ContactInfoList { get; set; }
public List<InstitutionContractInstallment> Installments { get; set; }
public InstitutionContract()
{
ContactInfoList = new List<InstitutionContractContactInfo>();
ContactInfoList = [];
WorkshopDetails = [];
Installments = [];
}
public void Edit(DateTime contractDateGr, string contractDateFa, string state, string city, string address,
DateTime contractStartGr, string contractStartFa, DateTime contractEndGr, string contractEndFa,
double contractAmount, double dailyCompenseation, double obligation, double totalAmount,
string workshopManualCount, string employeeManualCount, string description, string officialCompany,
string workshopManualCount, string employeeManualCount, string description, string officialCompany,
string typeOfcontract, double valueAddedTax, string hasValueAddedTax)
{
ContractDateGr = contractDateGr;
ContractDateFa = contractDateFa;
State = state;
City = city;
Address = address;
ContractStartGr = contractStartGr;
ContractStartFa = contractStartFa;
ContractEndGr = contractEndGr;
@@ -124,13 +141,11 @@ public class InstitutionContract : EntityBase
public void Active()
{
this.IsActiveString = "true";
}
public void DeActive()
{
this.IsActiveString = "false";
}
@@ -148,4 +163,177 @@ public class InstitutionContract : EntityBase
{
this.Signature = "0";
}
public void Complete()
{
Status = InstitutionContractStatus.Completed;
}
public void SetWorkshopDetails(List<InstitutionContractWorkshopDetail> commandWorkshops)
{
WorkshopDetails = commandWorkshops;
}
public void SetInstallments(List<InstitutionContractInstallment> installments)
{
Installments = installments;
}
}
public class InstitutionContractWorkshopDetail:EntityBase
{
public InstitutionContractWorkshopDetail(string workshopName, bool hasRollCallPlan,
bool hasCustomizeCheckoutPlan, bool hasContractPlan,bool hasContractPlanInPerson,bool hasInsurancePlan,bool hasInsurancePlanInPerson,
int personnelCount, double price)
{
WorkshopName = workshopName;
HasRollCallPlan = hasRollCallPlan;
HasCustomizeCheckoutPlan = hasCustomizeCheckoutPlan;
HasContractPlan = hasContractPlan;
HasContractPlanInPerson = hasContractPlanInPerson;
HasInsurancePlan = hasInsurancePlan;
HasInsurancePlanInPerson = hasInsurancePlanInPerson;
PersonnelCount = personnelCount;
WorkshopCreated = false;
Price = price;
Employers = [];
}
/// <summary>
/// شناسه کارگاه
/// </summary>
public long? WorkshopId { get; private set; }
/// <summary>
/// نام کارگاه
/// </summary>
public string WorkshopName { get; private set; }
/// <summary>
/// پلن حضور و غیاب
/// </summary>
public bool HasRollCallPlan { get; private set; }
/// <summary>
/// پلن فیش غیر رسمی
/// </summary>
public bool HasCustomizeCheckoutPlan { get; private set; }
/// <summary>
/// پلن قرارداد و تصفیه
/// </summary>
public bool HasContractPlan { get; private set; }
/// <summary>
/// پلن قرارداد و تصفیه حضوری
/// </summary>
public bool HasContractPlanInPerson { get; private set; }
/// <summary>
/// پلن بیمه
/// </summary>
public bool HasInsurancePlan { get; private set; }
/// <summary>
/// پلن بیمه حضوری
/// </summary>
public bool HasInsurancePlanInPerson { get; private set; }
public int PersonnelCount { get; private set; }
public bool WorkshopCreated { get; private set; }
/// <summary>
/// شناسه قرارداد نهاد مرتبط
/// </summary>
public long InstitutionContractId { get; private set; }
/// <summary>
/// Navigation property to InstitutionContract
/// </summary>
public InstitutionContract InstitutionContract { get; private set; }
public double Price { get; private set; }
private InstitutionContractWorkshopDetail()
{
}
public List<InstitutionContractWorkshopDetailEmployer> Employers { get; private set; } = new();
public void SetEmployers(List<long> employerIds)
{
Employers.Clear();
foreach (var employerId in employerIds)
{
Employers.Add(new InstitutionContractWorkshopDetailEmployer(id, employerId));
}
}
public void AddEmployer(long employerId)
{
if (Employers.Exists(x => x.EmployerId == employerId))
return;
Employers.Add(new InstitutionContractWorkshopDetailEmployer(id, employerId));
}
public void Edit(bool hasAttendancePlan, bool hasUnofficialPayslipPlan, bool hasContractSettlementPlan)
{
HasRollCallPlan = hasAttendancePlan;
HasCustomizeCheckoutPlan = hasUnofficialPayslipPlan;
HasContractPlan = hasContractSettlementPlan;
}
public void SetWorkshopId(long workshopId)
{
WorkshopId = workshopId;
WorkshopCreated = true;
}
}
public enum InstitutionContractStatus
{
/// <summary>
/// ناتمام - قرارداد هنوز تکمیل نشده و نیاز به انجام کارهای بیشتر دارد
/// </summary>
Incomplete = 0,
/// <summary>
/// تکمیل شده - قرارداد به طور کامل انجام شده و نهایی شده است
/// </summary>
Completed = 1
}
public class InstitutionContractInstallment
{
public InstitutionContractInstallment(DateTime installmentDateGr, double amount,
string description)
{
InstallmentDateGr = installmentDateGr;
InstallmentDateFa = installmentDateGr.ToFarsi();
Amount = amount;
Description = description;
}
public long Id { get; private set; }
public DateTime InstallmentDateGr { get; private set; }
public string InstallmentDateFa { get; private set; }
public double Amount { get; private set; }
public string Description { get; private set; }
public long InstitutionContractId { get; private set; }
public InstitutionContract InstitutionContract { get; private set; }
}
public class InstitutionContractWorkshopDetailEmployer : EntityBase
{
public long InstitutionContractWorkshopDetailId { get; private set; }
public long EmployerId { get; private set; }
public InstitutionContractWorkshopDetailEmployer(long institutionContractWorkshopDetailId, long employerId)
{
InstitutionContractWorkshopDetailId = institutionContractWorkshopDetailId;
EmployerId = employerId;
}
private InstitutionContractWorkshopDetailEmployer() { }
}

View File

@@ -0,0 +1,15 @@
using _0_Framework.Domain;
using System.Collections.Generic;
using System.Threading.Tasks;
using CompanyManagment.App.Contracts.Law;
namespace Company.Domain.LawAgg
{
public interface ILawRepository : IRepository<long, Law>
{
Task<Law> GetWithItems(long id);
Task<List<Law>> GetActive();
Task<LawViewModel> GetByType(LawType type);
Task<List<LawViewModel>> GetList(LawSearchModel searchModel);
}
}

View File

@@ -0,0 +1,89 @@
using System;
using System.Collections.Generic;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.Law;
using System.Text.Json;
using System.ComponentModel.DataAnnotations.Schema;
namespace Company.Domain.LawAgg
{
public class Law : EntityBase
{
private Law(){}
public string Title { get; private set; }
public bool IsActive { get; private set; }
public List<LawItem> Items { get; private set; }
public LawType Type { get; private set; }
public string HeadTitle { get; private set; }
public string NotificationsJson { get; private set; }
[NotMapped]
public List<string> Notifications
{
get => string.IsNullOrEmpty(NotificationsJson)
? new List<string>()
: JsonSerializer.Deserialize<List<string>>(NotificationsJson);
set => NotificationsJson = JsonSerializer.Serialize(value);
}
public Law(string title, LawType lawType, List<string> notifications, string headTitle )
{
Title = title;
IsActive = true;
Items = new List<LawItem>();
Type = lawType;
Notifications = notifications ?? new List<string>();
HeadTitle = headTitle;
}
public void Edit(string title)
{
Title = title;
}
public void AddItem(string header, string details, int orderNumber)
{
Items.Add(new LawItem(header, details, orderNumber));
}
public void SetItem(List<LawItem> items)
{
Items = items ?? new List<LawItem>();
}
public void RemoveItem(int orderNumber)
{
var item = Items.Find(x => x.OrderNumber == orderNumber);
if (item != null)
Items.Remove(item);
}
public void Activate()
{
IsActive = true;
}
public void Deactivate()
{
IsActive = false;
}
}
public class LawItem
{
public long Id { get; set; }
public string Header { get; private set; }
public string Details { get; private set; }
public int OrderNumber { get; private set; }
public long LawId { get; set; }
protected LawItem() { }
public LawItem(string header, string details, int orderNumber)
{
Header = header;
Details = details;
OrderNumber = orderNumber;
}
}
}

View File

@@ -0,0 +1,12 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.PaymentInstrument;
namespace Company.Domain.PaymentInstrumentAgg;
public interface IPaymentInstrumentGroupRepository:IRepository<long,PaymentInstrumentGroup>
{
void Remove(PaymentInstrumentGroup paymentInstrumentGroup);
Task<List<PaymentInstrumentGroupsViewModel>> GetList();
}

View File

@@ -0,0 +1,19 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.PaymentInstrument;
namespace Company.Domain.PaymentInstrumentAgg;
public interface IPaymentInstrumentRepository:IRepository<long,PaymentInstrument>
{
Task<GetPaymentInstrumentListViewModel> GetList(PaymentInstrumentSearchModel searchModel);
Task<List<PosTerminalSelectListViewModel>> GetPosTerminalSelectList(string search);
Task<List<string>> PosTerminalIdSelectList(string search, string selected);
Task<List<string>> IbanSelectList(string search, string selected);
Task<List<string>> AccountNumberSelectList(string search, string selected);
Task<List<string>> CardNumberSelectList(string search, string selected);
Task<List<string>> AccountHolderNameSelectList(string search, string selected);
}

View File

@@ -0,0 +1,52 @@
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.PaymentInstrument;
namespace Company.Domain.PaymentInstrumentAgg;
public class PaymentInstrument:EntityBase
{
private PaymentInstrument(string cardNumber, string accountHolderName, string accountNumber,string iBan,bool isAuth,long paymentInstrumentGroupId)
{
CardNumber = cardNumber;
AccountHolderName = accountHolderName;
AccountNumber = accountNumber;
IBan = iBan;
IsAuth = isAuth;
PaymentInstrumentGroupId = paymentInstrumentGroupId;
Type = PaymentInstrumentType.BankAccount;
}
private PaymentInstrument(string posTerminalId , string description,long paymentInstrumentGroupId)
{
PosTerminalId = posTerminalId;
Description = description;
PaymentInstrumentGroupId = paymentInstrumentGroupId;
Type = PaymentInstrumentType.Pos;
}
public static PaymentInstrument CreatePosType(string posTerminalId, string description, long paymentInstrumentGroupId)
{
return new PaymentInstrument(posTerminalId, description, paymentInstrumentGroupId);
}
public static PaymentInstrument CreateBankAccount(string cardNumber, string accountHolderName, string accountNumber,
string iBan, bool isAuth, long paymentInstrumentGroupId)
{
return new PaymentInstrument(cardNumber, accountHolderName, accountNumber, iBan, isAuth, paymentInstrumentGroupId);
}
public string CardNumber { get; private set; }
public string AccountHolderName { get; private set; }
public string AccountNumber { get; private set; }
public string IBan { get; private set; }
public string PosTerminalId { get; private set; }
public string Description { get; set; }
public PaymentInstrumentType Type { get; private set; }
public bool IsAuth { get; private set; }
public long PaymentInstrumentGroupId { get; private set; }
public PaymentInstrumentGroup PaymentInstrumentGroup { get; private set; }
}

View File

@@ -0,0 +1,28 @@
using System.Collections.Generic;
using _0_Framework.Application;
using _0_Framework.Domain;
namespace Company.Domain.PaymentInstrumentAgg;
public class PaymentInstrumentGroup:EntityBase
{
public PaymentInstrumentGroup(string name)
{
Name = name;
IsActive = IsActive.True;
}
public string Name { get; private set; }
public IsActive IsActive { get; private set; }
public List<PaymentInstrument> PaymentInstruments { get; set; }
public void Edit(string name)
{
Name = name;
}
public void DeActive()
{
IsActive = IsActive.False;
}
}

View File

@@ -0,0 +1,14 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.PaymentTransaction;
namespace Company.Domain.PaymentTransactionAgg;
public interface IPaymentTransactionRepository:IRepository<long,PaymentTransaction>
{
Task<List<GetPaymentTransactionListViewModel>> GetPaymentTransactionList(
GetPaymentTransactionListSearchModel searchModel);
Task<PaymentTransactionDetailsViewModel> GetDetails(long id);
}

View File

@@ -0,0 +1,88 @@
using System;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.PaymentTransaction;
namespace Company.Domain.PaymentTransactionAgg;
/// <summary>
/// نمایانگر یک تراکنش پرداخت شامل جزئیات طرف قرارداد، اطلاعات بانکی، وضعیت تراکنش و مبلغ.
/// </summary>
public class PaymentTransaction:EntityBase
{
/// <summary>
/// سازنده کلاس PaymentTransaction با دریافت اطلاعات تراکنش.
/// </summary>
/// <param name="contractingPartyId">شناسه طرف قرارداد</param>
/// <param name="amount">مبلغ تراکنش</param>
/// <param name="contractingPartyName"></param>
/// <param name="callBackUrl"></param>
public PaymentTransaction(long contractingPartyId,
double amount,
string contractingPartyName,string callBackUrl)
{
ContractingPartyId = contractingPartyId;
Status = PaymentTransactionStatus.Pending;
Amount = amount;
ContractingPartyName = contractingPartyName;
CallBackUrl = callBackUrl;
}
/// <summary>
/// تاریخ و زمان انجام پرداخت
/// </summary>
public DateTime TransactionDate { get; private set; }
/// <summary>
/// شناسه طرف حساب
/// </summary>
public long ContractingPartyId { get; private set; }
/// <summary>
/// نام طرف حساب
/// </summary>
public string ContractingPartyName { get; private set; }
/// <summary>
/// نام بانک
/// </summary>
public string BankName { get; private set; }
/// <summary>
/// شماره کارت
/// </summary>
public string CardNumber { get; private set; }
/// <summary>
/// وضعیت تراکنش پرداخت
/// </summary>
public PaymentTransactionStatus Status { get; private set; }
/// <summary>
/// مبلغ تراکنش
/// </summary>
public double Amount { get; private set; }
/// <summary>
/// شناسه یکتای تراکنش
/// </summary>
public string TransactionId { get; private set; }
public string CallBackUrl { get; private set; }
public void SetPaid(string cardNumber,string bankName)
{
Status = PaymentTransactionStatus.Success;
TransactionDate = DateTime.Now;
CardNumber = cardNumber;
BankName = bankName;
}
public void SetFailed()
{
Status = PaymentTransactionStatus.Failed;
TransactionDate = DateTime.Now;
}
public void SetTransactionId(string transactionId)
{
TransactionId = transactionId;
}
}

View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.PersonalContractingParty;
@@ -20,4 +21,10 @@ public interface IRepresentativeRepository : IRepository<long, Representative>
#endregion
#region Api
Task<ICollection<RepresentativeGetListViewModel>> GetList(RepresentativeGetListSearchModel searchModel);
bool HasAnyContractingParty(long id);
Task<List<GetSelectListRepresentativeViewModel>> GetSelectList();
#endregion
}

View File

@@ -15,7 +15,7 @@ namespace Company.Domain.RollCallAgg;
public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
{
ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute);
ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout, bool rotatingShiftCompute, bool totalLeaveCompute);
/// <summary>
/// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب

View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.Reward;
using CompanyManagment.App.Contracts.SalaryAid;
@@ -21,4 +22,5 @@ public interface ISalaryAidRepository:IRepository<long,SalaryAid>
SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel);
#endregion
}

View File

@@ -21,6 +21,8 @@ public class ContractingPartyTemp : EntityBase
IdNumberSerial = idNumberSerial;
Gender = gender;
DateOfBirth = dateOfBirth;
PublicId = Guid.NewGuid();
Status = ContractingPartyTempStatus.InComplete;
}
/// <summary>
@@ -91,10 +93,34 @@ public class ContractingPartyTemp : EntityBase
/// </summary>
public string Address { get; private set; }
public ContractingPartyTempStatus Status { get; set; }
public string VerifyCode { get; set; }
public DateTime VerifyCodeSentDateTime { get; set; }
public Guid PublicId { get; set; }
public void UpdateAddress(string state, string city, string address)
{
this.State = state;
this.City = city;
this.Address = address;
}
public void SetCompleted()
{
Status = ContractingPartyTempStatus.Completed;
}
public void SetVerifyCode(string verifyCode)
{
VerifyCode = verifyCode;
VerifyCodeSentDateTime = DateTime.Now;
}
}
public enum ContractingPartyTempStatus
{
InComplete,
Completed
}

View File

@@ -0,0 +1,7 @@
using _0_Framework.Domain;
namespace Company.Domain.TemporaryClientRegistrationAgg;
public interface IInstitutionContractContactInfoTempRepository : IRepository<long, InstitutionContractContactInfoTemp>
{
}

View File

@@ -1,5 +1,7 @@
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework_b.Domain;
using CompanyManagment.App.Contracts.InstitutionContract;
using CompanyManagment.App.Contracts.TemporaryClientRegistration;
namespace Company.Domain.TemporaryClientRegistrationAgg;
@@ -15,4 +17,6 @@ public interface IInstitutionContractTempRepository : IRepository<long, Institut
/// <param name="contractingPartyId"></param>
/// <returns></returns>
Task<InstitutionContractTempViewModel> GetInstitutionContractTemp(long id,long contractingPartyTempId);
}

View File

@@ -14,5 +14,7 @@ public interface IWorkshopTempRepository : IRepository<long, WorkshopTemp>
/// <returns></returns>
Task<List<WorkshopTempViewModel>> GetWorkshopTemp(long contractingPartyTemp);
System.Threading.Tasks.Task RemoveWorkshopTemps(List<long> workshopTempIds);
}

View File

@@ -0,0 +1,25 @@
using _0_Framework.Domain;
namespace Company.Domain.TemporaryClientRegistrationAgg;
public class InstitutionContractContactInfoTemp : EntityBase
{
public InstitutionContractContactInfoTemp(string phoneType, string position, string phoneNumber,
string fullName, long institutionContractTempId, bool sendSms)
{
PhoneType = phoneType;
Position = position;
PhoneNumber = phoneNumber;
FullName = fullName;
InstitutionContractTempId = institutionContractTempId;
SendSms = sendSms;
}
public string PhoneType { get; private set; }
public long InstitutionContractTempId { get; private set; }
public string Position { get; private set; }
public string PhoneNumber { get; private set; }
public string FullName { get; private set; }
public bool SendSms { get; private set; }
public InstitutionContractTemp InstitutionContractTemp { get; set; }
}

View File

@@ -1,13 +1,15 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using _0_Framework.Application.UID;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.TemporaryClientRegistration;
namespace Company.Domain.TemporaryClientRegistrationAgg;
public class InstitutionContractTemp : EntityBase
{
public InstitutionContractTemp(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
public InstitutionContractTemp(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, InstitutionContractTempStatus registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
{
ContractingPartyTempId = contractingPartyTempId;
PaymentModel = paymentModel;
@@ -22,6 +24,7 @@ public class InstitutionContractTemp : EntityBase
MessageId = messageId;
SendVerifyCodeTime = sendVerifyCodeTime;
VerifyCodeEndTime = verifyCodeEndTime;
PublicId = Guid.NewGuid();
}
/// <summary>
@@ -34,12 +37,14 @@ public class InstitutionContractTemp : EntityBase
/// بصورت یکجا
/// -
/// بصئورت ماهیانه
/// OneTime
/// </summary>
public string PaymentModel { get; private set; }
/// <summary>
/// مدت قرارداد
/// چند ماهه؟
/// "12"
/// </summary>
public string PeriodModel { get; private set; }
@@ -85,7 +90,7 @@ public class InstitutionContractTemp : EntityBase
/// -
/// Completed ثبت نام تکمیل شده
/// </summary>
public string RegistrationStatus { get; private set; }
public InstitutionContractTempStatus RegistrationStatus { get; private set; }
/// <summary>
/// آی دی پیامک ارسال شده
@@ -102,8 +107,16 @@ public class InstitutionContractTemp : EntityBase
/// </summary>
public DateTime? VerifyCodeEndTime{ get; private set; }
/// <summary>
/// آیدی عمومی
/// برای نمایش در آدرس
/// </summary>
public Guid PublicId { get; set; }
public void Edit(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
public List<InstitutionContractContactInfoTemp> ContactInfoList { get; set; }
public void Edit(long contractingPartyTempId, string paymentModel, string periodModel, double totalPayment, DateTime contractStartGr, DateTime contractEndGr, string officialCompany, double valueAddedTax, string verifyCode, InstitutionContractTempStatus registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
{
ContractingPartyTempId = contractingPartyTempId;
PaymentModel = paymentModel;
@@ -120,7 +133,7 @@ public class InstitutionContractTemp : EntityBase
VerifyCodeEndTime = verifyCodeEndTime;
}
public void Update(string verifyCode, string registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
public void Update(string verifyCode, InstitutionContractTempStatus registrationStatus, int messageId, DateTime? sendVerifyCodeTime, DateTime? verifyCodeEndTime)
{
VerifyCode = verifyCode;
RegistrationStatus = registrationStatus;
@@ -129,6 +142,10 @@ public class InstitutionContractTemp : EntityBase
VerifyCodeEndTime = verifyCodeEndTime;
}
public void ChangeRegistrationStatus(InstitutionContractTempStatus registrationStatus)
{
RegistrationStatus = registrationStatus;
}
}
}

View File

@@ -69,7 +69,7 @@ public interface IWorkshopRepository : IRepository<long, Workshop>
Task<int> GetWorkshopsForEmployeeStartWorkCount(long accountId);
Task<List<WorkshopWithLeftWorkTempEmployeesDto>> GetWorkshopsForLeftWorkTemp(long accountId);
Task<int> GetWorkshopsForLeftWorkTempCount(long accountId);
Task<List<WorkshopSelectListViewModel>> GetSelectList(string search);
Task<List<WorkshopSelectListViewModel>> GetSelectList(string search, long id);
#endregion

View File

@@ -76,14 +76,13 @@ public class Workshop : EntityBase
ClientEmployeeWorkshopList = new List<ClientEmployeeWorkshop>();
}
public Workshop(string workshopName,string workshopSureName, string insuranceCode, string typeOfOwnership, string archiveCode, string agentName, string agentPhone,
string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide,
bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout, IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout)
bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance, bool createContract, bool signContract, bool createCheckout, bool signCheckout,
IsActive cutContractEndOfYear, bool rotatingShiftCompute, bool isStaticCheckout,long contractingPartyId)
{
WorkshopName = workshopName;
WorkshopSureName = workshopSureName;
@@ -134,6 +133,7 @@ public class Workshop : EntityBase
CutContractEndOfYear = cutContractEndOfYear;
RotatingShiftCompute = rotatingShiftCompute;
IsStaticCheckout = isStaticCheckout;
ContractingPartyId = contractingPartyId;
}
@@ -233,6 +233,8 @@ public class Workshop : EntityBase
/// </summary>
public bool IsStaticCheckout { get; private set; }
public long ContractingPartyId { get; private set; }
public Workshop()
{
RollCallServicesList = new List<RollCallService>();
@@ -344,4 +346,10 @@ public class Workshop : EntityBase
this.IsActiveString = "false";
ArchiveCode = "b-" + archiveCode;
}
}
public enum WorkshopRegistrationStatus
{
NotRegistered = 0,
Registered = 1
}

View File

@@ -21,6 +21,18 @@ public interface IYearlySalaryRepository : IRepository<long, YearlySalary>
double GetLeavePay(DateTime contractStart, DateTime contractEnd, double daylyWage, double consumableItem, double housingAllowance, double familyAllowance , string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM);
double GetOverTimeWorking(double dayliWage, string overTimeWorkH, string overTimeWorkM);
double GetOverNightWorking(double dayliWage, string overNightWorkH, string overNightWorkM, string weeklyWorkingTime, int officialholiday, int friday, DateTime contractStart, DateTime contractEnd, string totalHoursH, string totalHorsM);
/// <summary>
/// متد محاسبه پایه سنوات و لیست پایه سنوات های پرسنل
/// </summary>
/// <param name="contractStart"></param>
/// <param name="contractEnd"></param>
/// <param name="employeeId"></param>
/// <param name="workshopId"></param>
/// <param name="leftWorkList"></param>
/// <returns></returns>
Task<BaseYearDataViewModel> BaseYearCompute(DateTime contractStart, DateTime contractEnd, long employeeId,
long workshopId, List<LeftWorkViewModel> leftWorkList);
DayliFeeViewModel DayliFeeComputing(DateTime startDateW,DateTime contractStart, DateTime endDateW, long employeeId, long workshopId,List<LeftWorkViewModel> leftWorkList);
Task<DayliFeeViewModel> DayliFeeComputingAsync(DateTime startDateW, DateTime contractStart, DateTime endDateW, long employeeId, long workshopId, List<LeftWorkViewModel> leftWorkList);
string ConsumableItems(DateTime endDateW);

View File

@@ -34,7 +34,7 @@ public interface IEmployerRepository : IRepository<long, Employer>
List<EmployerViewModel> GetEmployersHasWorkshop();
Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
Task<List<EmployerSelectListViewModel>> GetSelectList(string search,long id);
#endregion
@@ -56,6 +56,17 @@ public interface IEmployerRepository : IRepository<long, Employer>
#endregion
#region Api
Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel);
Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id);
Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id);
//Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
Task<OperationResult<string>> DeactivateWithSubordinates(long id);
#endregion
}

View File

@@ -0,0 +1,262 @@
using _0_Framework.Application;
using CompanyManagement.Infrastructure.Excel.CWS;
using CompanyManagment.App.Contracts.InstitutionContract;
using OfficeOpenXml;
using OfficeOpenXml.Style;
using System.Drawing;
using System.Text.RegularExpressions;
namespace CompanyManagement.Infrastructure.Excel.InstitutionContract;
public class InstitutionContractExcelGenerator
{
public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
{
ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
using var package = new ExcelPackage();
var allWorksheet = package.Workbook.Worksheets.Add("همه");
var blueWorksheet = package.Workbook.Worksheets.Add("آبی");
blueWorksheet.TabColor = Color.LightBlue;
var grayWorksheet = package.Workbook.Worksheets.Add("خاکستری");
grayWorksheet.TabColor = Color.LightGray;
var redWorksheet = package.Workbook.Worksheets.Add("قرمز");
redWorksheet.TabColor = Color.LightCoral;
var purpleWorksheet = package.Workbook.Worksheets.Add("بنفش");
purpleWorksheet.TabColor = Color.MediumPurple;
var blackWorksheet = package.Workbook.Worksheets.Add("مشکی");
blackWorksheet.TabColor = Color.DimGray;
var yellowWorksheet = package.Workbook.Worksheets.Add("زرد");
yellowWorksheet.TabColor = Color.Yellow;
var whiteWorksheet = package.Workbook.Worksheets.Add("سفید");
whiteWorksheet.TabColor = Color.White;
CreateExcelSheet(institutionContractViewModels, allWorksheet);
var blueContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "blue").ToList();
CreateExcelSheet(blueContracts, blueWorksheet);
institutionContractViewModels = institutionContractViewModels.Except(blueContracts).ToList();
var grayContracts = institutionContractViewModels.Where(x => x.IsContractingPartyBlock == "true").ToList();
CreateExcelSheet(grayContracts, grayWorksheet);
institutionContractViewModels = institutionContractViewModels.Except(grayContracts).ToList();
var redContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "red").ToList();
CreateExcelSheet(redContracts, redWorksheet);
institutionContractViewModels = institutionContractViewModels.Except(redContracts).ToList();
var purpleContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "purple").ToList();
CreateExcelSheet(purpleContracts, purpleWorksheet);
institutionContractViewModels = institutionContractViewModels.Except(purpleContracts).ToList();
var blackContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "black").ToList();
CreateExcelSheet(blackContracts, blackWorksheet);
institutionContractViewModels = institutionContractViewModels.Except(blackContracts).ToList();
var yellowContracts = institutionContractViewModels
.Where(x => string.IsNullOrWhiteSpace(x.ExpireColor) && x.WorkshopCount == "0").ToList();
CreateExcelSheet(yellowContracts, yellowWorksheet);
institutionContractViewModels = institutionContractViewModels.Except(yellowContracts).ToList();
var otherContracts = institutionContractViewModels;
CreateExcelSheet(otherContracts, whiteWorksheet);
return package.GetAsByteArray();
}
private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
{
// Headers
worksheet.Cells[1, 1].Value = "شماره قرارداد";
worksheet.Cells[1, 2].Value = "طرف حساب";
worksheet.Cells[1, 3].Value = "شماره کارفرما";
worksheet.Cells[1, 4].Value = "کارفرما ها";
worksheet.Cells[1, 5].Value = "کارگاه ها";
worksheet.Cells[1, 6].Value = "مجبوع پرسنل";
worksheet.Cells[1, 7].Value = "شروع قرارداد";
worksheet.Cells[1, 8].Value = "پایان قرارداد";
worksheet.Cells[1, 9].Value = "مبلغ قرارداد (بدون کارگاه)";
worksheet.Cells[1, 10].Value = "مبلغ قرارداد";
worksheet.Cells[1, 11].Value = "وضعیت مالی";
using (var range = worksheet.Cells[1, 1, 1, 11])
{
range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
range.Style.Font.Bold = true;
range.Style.Fill.PatternType = ExcelFillStyle.Solid;
range.Style.Fill.BackgroundColor.SetColor(Color.LightGray); // رنگ پس زمینه خاکستری
// اعمال بوردر به همه خطوط
range.Style.Border.Top.Style = ExcelBorderStyle.Thin;
range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
range.Style.Border.Left.Style = ExcelBorderStyle.Thin;
range.Style.Border.Right.Style = ExcelBorderStyle.Thin;
// اعمال رنگ مشکی برای بوردرها
range.Style.Border.Top.Color.SetColor(Color.Black);
range.Style.Border.Bottom.Color.SetColor(Color.Black);
range.Style.Border.Left.Color.SetColor(Color.Black);
range.Style.Border.Right.Color.SetColor(Color.Black);
}
int row = 2;
for (int i = 0; i < institutionContractViewModels.Count; i++)
{
var contract = institutionContractViewModels[i];
var employers = contract.EmployerViewModels?.ToList() ?? new();
var workshops = contract.WorkshopViewModels?.ToList() ?? new();
int maxRows = Math.Max(employers.Count, workshops.Count);
maxRows = Math.Max(1, maxRows);
int startRow = row;
int endRow = row + maxRows - 1;
// 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
string colorName = contract.ExpireColor.ToLower();
var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
for (int j = 0; j < maxRows; j++)
{
int currentRow = row + j;
worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
for (int col = 1; col <= 11; col++)
{
var cell = worksheet.Cells[currentRow, col];
// 📏 بوردرهای داخلی نازک / نقطه‌چین
cell.Style.Border.Top.Style = ExcelBorderStyle.Dotted;
cell.Style.Border.Bottom.Style = ExcelBorderStyle.Dotted;
cell.Style.Border.Left.Style = ExcelBorderStyle.Thin;
cell.Style.Border.Right.Style = ExcelBorderStyle.Thin;
// 🎯 تراز متن
cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
// 🎨 اعمال رنگ پس‌زمینه
cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
cell.Style.Fill.BackgroundColor.SetColor(fillColor);
}
}
// 🧱 مرج و مقداردهی ستون‌های اصلی
worksheet.Cells[startRow, 1, endRow, 1].Merge = true;
worksheet.Cells[startRow, 1].Value = contract.ContractNo;
worksheet.Cells[startRow, 2, endRow, 2].Merge = true;
worksheet.Cells[startRow, 2].Value = contract.ContractingPartyName;
worksheet.Cells[startRow, 3, endRow, 3].Merge = true;
worksheet.Cells[startRow, 3].Value = contract.ArchiveCode;
worksheet.Cells[startRow, 6, endRow, 6].Merge = true;
worksheet.Cells[startRow, 6].Value = contract.EmployeeCount;
worksheet.Cells[startRow, 7, endRow, 7].Merge = true;
worksheet.Cells[startRow, 7].Value = contract.ContractStartFa;
worksheet.Cells[startRow, 8, endRow, 8].Merge = true;
worksheet.Cells[startRow, 8].Value = contract.ContractEndFa;
worksheet.Cells[startRow, 9, endRow, 9].Merge = true;
var contractWithoutWorkshopAmountCell = worksheet.Cells[startRow, 9];
contractWithoutWorkshopAmountCell.Value = contract.WorkshopCount == "0" ? MoneyToDouble(contract.ContractAmount) : "";
contractWithoutWorkshopAmountCell.Style.Numberformat.Format = "#,##0";
worksheet.Cells[startRow, 10, endRow, 10].Merge = true;
var contractAmountCell = worksheet.Cells[startRow, 10];
contractAmountCell.Value = contract.WorkshopCount != "0" ? MoneyToDouble(contract.ContractAmount) : "";
contractAmountCell.Style.Numberformat.Format = "#,##0";
worksheet.Cells[startRow, 11, endRow, 11].Merge = true;
var balance = MoneyToDouble(contract.BalanceStr);
var balanceCell = worksheet.Cells[startRow, 11];
balanceCell.Value = balance;
balanceCell.Style.Numberformat.Format = "#,##0";
if (balance > 0)
balanceCell.Style.Font.Color.SetColor(Color.Red);
else if (balance < 0)
balanceCell.Style.Font.Color.SetColor(Color.Green);
// 📦 بوردر ضخیم خارجی برای هر سطر
var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
boldRange.Style.Border.BorderAround(ExcelBorderStyle.Medium);
row += maxRows;
}
worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
worksheet.PrinterSettings.Orientation = eOrientation.Landscape;
worksheet.PrinterSettings.FitToPage = true;
worksheet.PrinterSettings.FitToWidth = 1;
worksheet.PrinterSettings.FitToHeight = 0;
worksheet.PrinterSettings.Scale = 85;
int contractNoCol = 1;
int contractingPartyNameCol = 2;
int archiveNoCol = 3;
int employersCol = 4;
int workshopsCol = 5;
int employeeCountCol = 6;
int startContractCol = 7;
int endContractCol = 8;
int contractWithoutWorkshopAmountCol = 9;
int contractAmountCol = 10;
int balanceCol = 11;
worksheet.Columns[contractNoCol].Width = 17;
worksheet.Columns[contractingPartyNameCol].Width = 40;
worksheet.Columns[archiveNoCol].Width = 10;
worksheet.Columns[employersCol].Width = 40;
worksheet.Columns[workshopsCol].Width = 45;
worksheet.Columns[employeeCountCol].Width = 12;
worksheet.Columns[startContractCol].Width = 12;
worksheet.Columns[endContractCol].Width = 12;
worksheet.Columns[contractWithoutWorkshopAmountCol].Width = 18;
worksheet.Columns[contractAmountCol].Width = 12;
worksheet.Columns[balanceCol].Width = 12;
worksheet.View.RightToLeft = true; // فارسی
//worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
}
private static double MoneyToDouble(string value)
{
Console.WriteLine(value);
var min = value.Length > 1 ? value.Substring(0, 2) : "";
var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
Console.WriteLine(test);
return test;
}
private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
{
return name switch
{
"blue" => Color.LightBlue,
_ when IsContractingPartyBlock == "true" => Color.LightGray,
"red" => Color.LightCoral,
"purple" => Color.MediumPurple,
"black" => Color.DimGray,
var n when string.IsNullOrWhiteSpace(n) && workshopCount == "0" => Color.Yellow,
_ => Color.White
};
}
}

View File

@@ -0,0 +1,19 @@
namespace CompanyManagment.App.Contracts.AuthorizedPerson;
public class AuthorizedPersonViewModel
{
public long Id { get; set; }
public string NationalCode { get; set; }
public string FirstName { get; set; }
public string LastName { get; set; }
public string FatherName { get; set; }
public string BirthDate { get; set; }
public string Gender { get; set; }
public string DeathStatus { get; set; }
public string ShenasnameSeri { get; set; }
public string ShenasnameSerial { get; set; }
public string ShenasnamehNumber { get; set; }
public bool IsVerified { get; set; }
public string VerificationDate { get; set; }
public string CreationDate { get; set; }
}

View File

@@ -0,0 +1,15 @@
namespace CompanyManagment.App.Contracts.AuthorizedPerson;
public class CreateAuthorizedPerson
{
public string NationalCode { get; set; }
public string FirstName { get; set; }
public string LastName { get; set; }
public string FatherName { get; set; }
public string BirthDate { get; set; }
public string Gender { get; set; }
public string DeathStatus { get; set; }
public string ShenasnameSeri { get; set; }
public string ShenasnameSerial { get; set; }
public string ShenasnamehNumber { get; set; }
}

View File

@@ -0,0 +1,13 @@
using System.Collections.Generic;
using _0_Framework.Application;
namespace CompanyManagment.App.Contracts.AuthorizedPerson;
public interface IAuthorizedPersonApplication
{
OperationResult Create(CreateAuthorizedPerson command);
OperationResult CreateFromUidResponse(CreateAuthorizedPerson command);
AuthorizedPersonViewModel GetByNationalCode(string nationalCode);
List<AuthorizedPersonViewModel> Search(string nationalCode = null, string firstName = null, string lastName = null);
bool ExistsByNationalCode(string nationalCode);
}

View File

@@ -141,7 +141,9 @@ public class CheckoutViewModel
public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
public CheckoutRollCallViewModel CheckoutRollCall { get; set; }
public bool HasAmountConflict { get; set; }
public string EmployeeMandatoryHoursStr { get; set; }
public TimeSpan EmployeeMandatoryHoursTimeSpan { get; set; }
}
public class CheckoutRollCallViewModel

View File

@@ -135,6 +135,11 @@ public class CreateCheckout
/// </summary>
public string TotalDayOfBunosesCompute { get; set; }
/// <summary>
/// ساعت موظفی پرسنل برای این ماه
/// </summary>
public TimeSpan EmployeeMandatoryHours { get; set; }
public bool HolidayWorking { get; set; }
public string ShiftWork { get; set; }

View File

@@ -1,17 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="PersianTools.Core" Version="2.0.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="PersianTools.Core" Version="2.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\0_Framework\0_Framework.csproj" />
<ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\_0_Framework\_0_Framework_b.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\0_Framework\0_Framework.csproj" />
<ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\_0_Framework\_0_Framework_b.csproj" />
</ItemGroup>
<Target Name="CopyDocs" AfterTargets="Build">
<Copy SourceFiles="$(OutputPath)CompanyManagment.App.Contracts.xml" DestinationFolder="../ServiceHost\bin\Debug\net8.0\" />
</Target>
</Project>

View File

@@ -0,0 +1,18 @@
using _0_Framework.Application;
namespace CompanyManagment.App.Contracts.ContactUs;
public interface IContactUsApplication
{
OperationResult Create(CreateContactUs command);
}
public class CreateContactUs
{
public string FirstName { get; set; }
public string LastName { get; set; }
public string Email { get; set; }
public string PhoneNumber { get; set; }
public string Title { get; set; }
public string Message { get; set; }
}

View File

@@ -56,5 +56,14 @@ public class ComputingViewModel
public TimeSpan TotalPaidLeave { get; set; }
public TimeSpan TotalSickLeave { get; set; }
/// <summary>
/// ساعت موظفی پرسنل برای این ماه
/// </summary>
public TimeSpan EmployeeMandatoryHours { get; set; }
/// <summary>
/// مجموع مرخصی های پرسنل در این فیش حقوقی
/// </summary>
//public TimeSpan TotalLeaveOnThisCheckout { get; set; }
//public List<string> holidays;
}

View File

@@ -0,0 +1,37 @@
namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
/// <summary>
/// جستجوی لیست اطلاعات بانکی طرف حساب
/// </summary>
public class ContractingPartyBankAccountSearchModel
{
/// <summary>
/// نام طرف حساب / نام صاحب حساب
/// </summary>
public string ContractingPartyOrAccountHolderName { get; set; }
/// <summary>
/// شناسه دستگاه
/// </summary>
public string PosTerminalId { get; set; }
/// <summary>
/// شماره کارت
/// </summary>
public string CardNumber { get; set; }
/// <summary>
/// شماره حساب
/// </summary>
public string AccountNumber { get; set; }
/// <summary>
/// شماره شبا
/// </summary>
public string IBan { get; set; }
/// <summary>
/// شمارش page
/// </summary>
public int PageIndex { get; set; }
}

View File

@@ -0,0 +1,37 @@
namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
/// <summary>
/// ایجاد اطلاعات بانکی طرف حساب
/// </summary>
public class CreateContractingPartyBankAccounts
{
/// <summary>
/// آیدی طرف حساب
/// </summary>
public long ContractingPartyId { get; set; }
/// <summary>
/// شماره کارت
/// </summary>
public string CardNumber { get; set; }
/// <summary>
/// نام صاحب حساب
/// </summary>
public string AccountHolderName { get; set; }
/// <summary>
/// شماره حساب
/// </summary>
public string AccountNumber { get; set; }
/// <summary>
/// شماره شبا
/// </summary>
public string IBan { get; set; }
/// <summary>
/// آیا احزار هویت شده است یا خیر
/// </summary>
public bool IsAuth { get; set; }
}

View File

@@ -0,0 +1,65 @@
using System.Collections.Generic;
namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
/// <summary>
/// لیست اطلاعات بانکی طرف حساب
/// </summary>
public class GetContractingPartyBankAccountViewModel
{
/// <summary>
/// تعداد
/// </summary>
public int Count { get; set; }
public List<ContractingPartyBankAccountsGroupedViewModel> List { get; set; }
}
public class ContractingPartyBankAccountsGroupedViewModel
{
/// <summary>
/// لیست حساب های بانکی
/// </summary>
public List<ContractingPartyBankAccountsItemViewModel> BankAccountsItems { get; set; }
/// <summary>
/// آیدی طرف حساب
/// </summary>
public long ContractingPartyId { get; set; }
/// <summary>
/// نام طرف حساب
/// </summary>
public string ContractingPartyName { get; set; }
/// <summary>
/// نام کارگاه
/// </summary>
public string WorkshopName { get; set; }
}
/// <summary>
/// حساب بانکی طرف حساب
/// </summary>
public class ContractingPartyBankAccountsItemViewModel
{
/// <summary>
/// نام صاحب حساب
/// </summary>
public string AccountHolderName { get; set; }
/// <summary>
/// شماره کارت
/// </summary>
public string CardNumber { get; set; }
/// <summary>
/// شماره حساب
/// </summary>
public string AccountNumber { get; set; }
/// <summary>
/// شماره شبا
/// </summary>
public string IBan { get; set; }
}

View File

@@ -0,0 +1,78 @@
using System.Collections.Generic;
using System.Security.AccessControl;
using System.Threading.Tasks;
using System.Transactions;
using _0_Framework.Application;
using CompanyManagment.App.Contracts.OriginalTitle;
namespace CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
/// <summary>
/// اپلیکیشن اطلاعات بانکی طرف حساب
/// </summary>
public interface IContractingPartyBankAccountsApplication
{
/// <summary>
/// ایجاد اطلاعات بانکی طرف حساب
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
Task<OperationResult> Create(CreateContractingPartyBankAccounts command);
Task<OperationResult> Create(List<CreateContractingPartyBankAccounts> commands);
/// <summary>
/// لیست اطلاعات طرف حساب بانکی
/// </summary>
/// <param name="searchModel"></param>
/// <returns></returns>
Task<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
/// <summary>
/// سلکت لیست جستجو برای نام طرف حساب / صاحب حساب
/// </summary>
/// <param name="search">نام جستجو</param>
/// <param name="selected">نام سلکت شده</param>
/// <returns></returns>
Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
/// <summary>
/// سلکت لیست شماره کارت
/// </summary>
/// <param name="search">نام جستجو</param>
/// <param name="selected">نام سلکت شده</param>
/// <returns></returns>
Task<List<string>> CardNumberSelectList(string search, string selected);
/// <summary>
/// سلکت لیست شماره شبا
/// </summary>
/// <param name="search">نام جستجو</param>
/// <param name="selected">نام سلکت شده</param>
/// <returns></returns>
Task<List<string>> IBanSelectList(string search, string selected);
/// <summary>
/// سلکت لیست شماره حساب
/// </summary>
/// <param name="search">نام جستجو</param>
/// <param name="selected">نام سلکت شده</param>
/// <returns></returns>
Task<List<string>> AccountNumberSelectList(string search, string selected);
/// <summary>
/// سلکت لیست نام صاحبان حساب
/// </summary>
/// <param name="search">نام جستجو</param>
/// <param name="selected">نام سلکت شده</param>
/// <returns></returns>
Task<List<string>> GetAccountHolderNameSelectList(string search, string selected);
/// <summary>
/// سلکت لیست نام طرف حساب‌ها
/// </summary>
/// <param name="search">نام جستجو</param>
/// <param name="selected">نام سلکت شده</param>
/// <returns></returns>
Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
}

View File

@@ -109,6 +109,8 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout
public List<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
public List<CustomizeSifts> RegularShift { get; set; }
public bool HasAmountConflict { get; set; }
//public bool HasLeft { get; set; }
//public string IsBlockCantracingParty { get; set; }
//public string IsActiveString { get; set; }

View File

@@ -0,0 +1,38 @@
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employee;
/// <summary>
/// مدل جستجو در لیست پرسنل در ادمین
/// </summary>
public class GetEmployeeListSearchModel
{
/// <summary>
/// آیدی کارفرما
/// </summary>
public long EmployerId { get; set; }
/// <summary>
/// آیدی کارگاه
/// </summary>
public long WorkshopId { get; set; }
/// <summary>
/// آیدی پرسنل
/// </summary>
public long EmployeeId { get; set; }
/// <summary>
/// کدملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// شماره بیمه
/// </summary>
public string InsuranceCode { get; set; }
/// <summary>
/// وضعیت پرسنل
/// </summary>
public ActivationStatus EmployeeStatus { get; set; }
/// <summary>
/// ایندکس جستجو
/// </summary>
public int PageIndex { get; set; }
}

View File

@@ -0,0 +1,44 @@
using _0_Framework.Application;
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employee;
/// <summary>
/// ویو مدل لیست پرسنل ادمین
/// </summary>
public class GetEmployeeListViewModel
{
/// <summary>
/// آیدی پرسنل
/// </summary>
public long Id { get; set; }
/// <summary>
/// نام و نام خانوادگی پرسنل
/// </summary>
public string EmployeeFullName { get; set; }
/// <summary>
/// کدملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// تعداد فرزندان
/// </summary>
public string ChildrenCount { get; set; }
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; set; }
/// <summary>
/// تاریخ تولد
/// </summary>
public string BirthDate { get; set; }
/// <summary>
/// شماره بیمه
/// </summary>
public string InsuranceCode { get; set; }
/// <summary>
/// وضعیت پرسنل
/// </summary>
public ActivationStatus EmployeeStatus { get; set; }
}

View File

@@ -77,6 +77,24 @@ public interface IEmployeeApplication
Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode, string birthDate);
#endregion
#endregion
#region Api
/// <summary>
/// لیست پرسنل برای جستجو
/// </summary>
/// <param name="searchText"></param>
/// <param name="id"></param>
/// <returns></returns>
Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText, long id);
/// <summary>
/// لیست کل پرسنل
/// </summary>
/// <returns></returns>
Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
#endregion
}

View File

@@ -0,0 +1,84 @@
using System.ComponentModel.DataAnnotations;
using _0_Framework.Application;
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// ایجاد کارفرمای حقیقی
/// </summary>
public class CreateLegalEmployer
{
/// <summary>
/// آیدی طرف حساب
/// </summary>
[Required]
public long ContractingPartyId { get; set; }
/// <summary>
/// نام شرکت
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// شناسه ملی
/// </summary>
public string NationalId { get; set; }
/// <summary>
/// شماره ثبت
/// </summary>
public string RegisterId { get; set; }
/// <summary>
/// شماره تلفن همراه
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// شماره تلفن ثابت
/// </summary>
public string TelephoneNumber { get; set; }
/// <summary>
/// نام مدیر عامل
/// </summary>
public string EmployerFName { get; set; }
/// <summary>
/// نام خانوادگی مدیر عامل
/// </summary>
public string EmployerLName { get; set; }
/// <summary>
/// جنسیت مدیر عامل
/// </summary>
public Gender EmployerGender { get; set; }
/// <summary>
/// کد ملی مدیر عامل
/// </summary>
public string EmployerNationalCode { get; set; }
/// <summary>
/// شماره شناسنامه مدیر عامل
/// </summary>
public string EmployerIdNumber { get; set; }
/// <summary>
/// نام پدر مدیر عامل
/// </summary>
public string EmployerFatherName { get; set; }
/// <summary>
/// تاریخ تولد مدیر عامل
/// </summary>
public string EmployerDateOfBirth { get; set; }
/// <summary>
/// تاریخ صدور شناسنامه مدیر عامل
/// </summary>
public string EmployerDateOfIssue { get; set; }
/// <summary>
/// محل صدور شناسنامه مدیر عامل
/// </summary>
public string EmployerPlaceOfIssue { get; set; }
/// <summary>
/// اطلاعات سامانه ای
/// </summary>
public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
}

View File

@@ -0,0 +1,80 @@
using System.ComponentModel.DataAnnotations;
using _0_Framework.Application;
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// ایجاد کارفرما حقیقی
/// </summary>
public class CreateRealEmployer
{
/// <summary>
/// آیدی طرف حساب
/// </summary>
[Required]
public long ContractingPartyId { get; set; }
/// <summary>
/// جنسیت
/// </summary>
[Required]
public Gender Gender { get; set; }
/// <summary>
/// نام
/// </summary>
[Required]
public string FName { get; set; }
/// <summary>
///نام خانوادگی
/// </summary>
[Required]
public string LName { get; set; }
/// <summary>
/// کد ملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// شماره شناسنامه
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// شماره تلفن همراه
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// شماره تلفن ثابت
/// </summary>
public string Telephone { get; set; }
/// <summary>
/// تاریخ صدور شناسنامه
/// </summary>
public string DateOfIssue { get; set; }
/// <summary>
/// محل صدور شناسنامه
/// </summary>
public string PlaceOfIssue { get; set; }
/// <summary>
/// تاریخ تولد
/// </summary>
public string DateOfBirth { get; set; }
/// <summary>
/// نام پدر
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// اطلاعات سامانه ای
/// </summary>
public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
}

View File

@@ -0,0 +1,9 @@
namespace CompanyManagment.App.Contracts.Employer;
public class EditLegalEmployer: CreateLegalEmployer
{
/// <summary>
/// آیدی کارفرما
/// </summary>
public long Id { get; set; }
}

View File

@@ -0,0 +1,12 @@
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// ویرایش کارفرما حقیقی
/// </summary>
public class EditRealEmployer:CreateRealEmployer
{
/// <summary>
/// آیدی کارفرما
/// </summary>
public long Id { get; set; }
}

View File

@@ -0,0 +1,50 @@
using System.Collections.Generic;
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// مدل برای گرفتن لیست کارفرما
/// </summary>
public class GetEmployerListViewModel
{
/// <summary>
/// آیدی کارفرما
/// </summary>
public long Id { get; set; }
/// <summary>
/// کدملی / شناسه ملی
/// </summary>
public string NationalCodeOrNationalId { get; set; }
/// <summary>
/// نام کارفرما
/// </summary>
public string FullName { get; set; }
/// <summary>
/// نام های کارگاه
/// </summary>
public ICollection<string> WorkshopNames { get; set; }
/// <summary>
/// دارای طرف حساب
/// </summary>
public bool HasContractingParty { get; set; }
/// <summary>
/// طرف حساب بلاک شده یا نه
/// </summary>
public bool HasBlockContractingParty { get; set; }
/// <summary>
/// نوع کارفرما
/// </summary>
public LegalType LegalType { get; set; }
/// <summary>
/// وضعیت کارفرما
/// </summary>
public ActivationStatus EmployerStatus { get; set; }
}

View File

@@ -0,0 +1,44 @@
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// مدل جستجوی لیست کارفرما
/// </summary>
public class GetEmployerSearchModel
{
/// <summary>
/// نام شرکت / نام و نام خانوادگی
/// </summary>
public string FullNameOrCompanyName { get; set; }
/// <summary>
/// کدملی/ شناسه ملی
/// </summary>
public string NationalCodeOrNationalId { get; set; }
/// <summary>
/// شماره شناسنامه یا شماره ثبت
/// </summary>
public string IdNumberOrRegisterId { get; set; }
/// <summary>
/// نام طرف حساب
/// </summary>
public string ContractingPartyName { get; set; }
/// <summary>
/// وضعیت کارفرما
/// </summary>
public ActivationStatus EmployerStatus { get; set; }
/// <summary>
/// نوع کارفرما
/// </summary>
public LegalType EmployerType { get; set; }
/// <summary>
/// پیج ایندکس برای دسته بندی سی تایی
/// </summary>
public int PageIndex { get; set; }
}

View File

@@ -0,0 +1,120 @@
using _0_Framework.Application;
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// اطلاعات کارفرمای حقوقی
/// </summary>
public class GetLegalEmployerDetailViewModel
{
/// <summary>
/// آیدی کارفرما
/// </summary>
public long Id { get; set; }
/// <summary>
/// نام شرکت
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// شناسه ملی
/// </summary>
public string NationalId { get; set; }
/// <summary>
/// شماره ثبت
/// </summary>
public string RegisterId { get; set; }
/// <summary>
/// شماره تلفن همراه
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// شماره تلفن ثابت
/// </summary>
public string TelephoneNumber { get; set; }
/// <summary>
/// کد کارفرما
/// </summary>
public string EmployerNo { get; set; }
/// <summary>
/// نام کارفرما
/// </summary>
public string ContractingPartyName { get; set; }
/// <summary>
/// نام کارفرما
/// </summary>
public long ContractingPartyId { get; set; }
/// <summary>
/// نام و خانوادگی مدیر عامل
/// </summary>
public string CeoFullName { get; set; }
/// <summary>
/// نام و خانوادگی مدیر عامل
/// </summary>
public string CeoFName { get; set; }
/// <summary>
/// نام و خانوادگی مدیر عامل
/// </summary>
public string CeoLName { get; set; }
/// <summary>
/// جنسیت مدیر عامل
/// </summary>
public Gender Gender { get; set; }
/// <summary>
/// جنیست
/// </summary>
public string GenderStr { get; set; }
/// <summary>
/// ملیت
/// </summary>
public string Nationality { get; set; }
/// <summary>
/// نام پدر
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// کد ملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// شماره شناسنامه
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// تاریخ تولد
/// </summary>
public string DateOfBirth { get; set; }
/// <summary>
/// تاریخ صدور شناسنامه
/// </summary>
public string DateOfIssue { get; set; }
/// <summary>
/// محل صدور شناسنامه
/// </summary>
public string PlaceOfIssue { get; set; }
/// <summary>
/// اطلاعات سامانه های دولتی
/// </summary>
public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
}

View File

@@ -0,0 +1,107 @@
using _0_Framework.Application;
using _0_Framework.Application.Enums;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// اطلاعات کارفرمای حقوقی
/// </summary>
public class GetRealEmployerDetailViewModel
{
/// <summary>
/// آیدی کارفرما
/// </summary>
public long Id { get; set; }
/// <summary>
/// نام و نام خانوادگی
/// </summary>
public string FullName { get; set; }
/// <summary>
/// نام
/// </summary>
public string FName{ get; set; }
/// <summary>
/// نام خانوادگی
/// </summary>
public string LName { get; set; }
/// <summary>
/// کدملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// جنسیت فارسی
/// </summary>
public string GenderStr { get; set; }
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; set; }
/// <summary>
/// ملیت
/// </summary>
public string Nationality { get; set; }
/// <summary>
/// شماره تلفن همراه
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// نام پدر
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// شماره شناسنامه
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// تاریخ تولد
/// </summary>
public string DateOfBirth { get; set; }
/// <summary>
/// نام طرف حساب
/// </summary>
public string ContractingPartyName { get; set; }
/// <summary>
/// آیدی طرف حساب
/// </summary>
public long ContractingPartyId { get; set; }
/// <summary>
/// کد کارفرما
/// </summary>
public string EmployerNo { get; set; }
/// <summary>
/// شماره تلفن ثابت
/// </summary>
public string TelephoneNumber { get; set; }
/// <summary>
/// تاریخ صدور شناسنامه
/// </summary>
public string DateOfIssue { get; set; }
/// <summary>
/// محل صدور شناسنامه
/// </summary>
public string PlaceOfIssue { get; set; }
/// <summary>
/// اطلاعات سامانه های دولتی
/// </summary>
public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
}

View File

@@ -0,0 +1,54 @@
using System;
namespace CompanyManagment.App.Contracts.Employer;
/// <summary>
/// اطلاعات سامانه های دولتی
/// </summary>
public class GovernmentSystemInfo
{
#region MCL
/// <summary>
/// نام کاربری اداره کار
/// </summary>
public string MclUsername { get; set; }
/// <summary>
/// رمز عبور اداره کار
/// </summary>
public string MclPassword { get; set; }
#endregion
#region E-Service تامین اجتماعی
/// <summary>
/// نام کاربری سازمان تامین اجتماعی
/// </summary>
public string EServiceUsername { get; set; }
/// <summary>
/// رمز عبور سازمان تامین اجتماعی
/// </summary>
public string EServicePassword { get; set; }
#endregion
#region Tax سامانه مالیاتی
/// <summary>
/// نام کاربری سامانه مالیاتی
/// </summary>
public string TaxUsername { get; set; }
/// <summary>
/// رمز عبور سامانه مالیاتی
/// </summary>
public string TaxPassword { get; set; }
#endregion
#region Sana سامانه ثنا
/// <summary>
/// نام کاربری ثنا
/// </summary>
public string SanaUsername { get; set; }
/// <summary>
/// رمز عبور ثنا
/// </summary>
public string SanaPassword { get; set; }
#endregion
}

View File

@@ -1,7 +1,11 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using System.Transactions;
using _0_Framework.Application;
using _0_Framework.Application.Enums;
using CompanyManagment.App.Contracts.Checkout;
using CompanyManagment.App.Contracts.Employee;
namespace CompanyManagment.App.Contracts.Employer;
@@ -19,7 +23,7 @@ public interface IEmployerApplication
OperationResult Active(long id);
OperationResult DeActive(long id);
OperationResult Remove(long id);
OperationResult Remove_Old(long id);
List<EmployerViewModel> GetEmployers();
List<EmployerViewModel> Search(EmployerSearchModel searchModel);
@@ -36,7 +40,14 @@ public interface IEmployerApplication
#region Mahan
List<EmployerViewModel> GetEmployersHasWorkshop();
Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
/// <summary>
/// لیست نام کارفرما ها برای جستجو
/// </summary>
/// <param name="search"></param>
/// <param name="id"></param>
/// <returns></returns>
Task<List<EmployerSelectListViewModel>> GetSelectList(string search, long id);
#endregion
#region NewByHeydari
@@ -53,6 +64,346 @@ public interface IEmployerApplication
(string employerName, bool isLegal) InsuranceEmployerByWorkshopId(long workshopId);
#endregion
#region Api
/// <summary>
/// لیست کارفرما ها
/// </summary>
/// <returns></returns>
Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel);
/// <summary>
/// جزئیات کارفرما حقوقی
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id);
/// <summary>
/// جزئیات کارفرما حقیقی
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id);
/// <summary>
/// ایجاد کارفرمای حقیقی
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
Task<OperationResult> CreateReal(CreateRealEmployer command);
/// <summary>
/// ایجاد کارفرمای حقوقی
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
Task<OperationResult> CreateLegal(CreateLegalEmployer command);
/// <summary>
/// ویرایش کارفرمای حقیقی
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
Task<OperationResult> EditReal(EditRealEmployer command);
/// <summary>
/// ویرایش کارفرمای حقوقی
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
Task<OperationResult> EditLegal(EditLegalEmployer command);
/// <summary>
/// حذف کارفرما - درصورت داشتن کارگاه کارفرما غیرفعال میشود
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public Task<OperationResult<string>> Remove(long id);
#endregion
}
Task<OperationResult> CreateWorkflowRegistration(CreateEmployerWorkflowRegistration command);
/// <summary>
/// ویرایش کارفرما در گردش کار ثبت نام
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
Task<OperationResult> EditWorkflowRegistration(EditEmployerWorkflowRegistration command);
/// <summary>
/// حذف کارفرما از گردش کار ثبت نام
/// </summary>
/// <param name="employerId">شناسه کارفرما</param>
/// <param name="institutionWorkshopDetailsId">شناسه جزئیات کارگاه موسسه</param>
/// <returns></returns>
Task<OperationResult> DeleteWorkflowRegistration(long employerId, long institutionWorkshopDetailsId);
Task<OperationResult<AuthenticateUserViewModel>> AuthenticateEmployer(string nationalCode, string dateOfBirth, string mobile);
}
public class AuthenticateUserViewModel
{
/// <summary>
/// نام
/// </summary>
public string FName { get; set; }
/// <summary>
/// نام خانوادگی
/// </summary>
public string LName { get; set; }
/// <summary>
/// نام پدر
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; set; }
/// <summary>
/// کد ملی
/// </summary>
public string NationalCode { get; set; }
public string DateOfBirth { get; set; }
/// <summary>
/// سری شناسنامه
/// </summary>
public string IdNumberSeri { get; set; }
/// <summary>
/// سریال شناسنامه
/// </summary>
public string IdNumberSerial { get; set; }
/// <summary>
/// شماره شناسنامه
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// شماره همراه
/// </summary>
public string Phone { get; set; }
}
/// <summary>
/// کلاس ثبت کارفرما در گردش کار - شامل اطلاعات کارفرمای حقیقی و حقوقی
/// </summary>
public class CreateEmployerWorkflowRegistration
{
/// <summary>
/// اطلاعات کارفرمای حقیقی
/// </summary>
public CreateRealEmployerWorkflowRegistration RealEmployer { get; set; }
/// <summary>
/// اطلاعات کارفرمای حقوقی
/// </summary>
public CreateLegalEmployerWorkflowRegistration LegalEmployer { get; set; }
/// <summary>
/// نوع حقوقی
/// </summary>
public LegalType LegalType { get; set; }
/// <summary>
/// شناسه جزئیات کارگاه موسسه
/// </summary>
public long InstitutionWorkshopDetailsId { get; set; }
/// <summary>
/// شناسه قرارداد موسسه
/// </summary>
public long InstitutionContractId { get; set; }
/// <summary>
/// شناسه طرف قرارداد
/// </summary>
public long ContractingPartyId { get; set; }
}
/// <summary>
/// کلاس ثبت کارفرمای حقوقی در گردش کار - شامل اطلاعات شرکت و مدیرعامل
/// </summary>
public class CreateLegalEmployerWorkflowRegistration
{
/// <summary>
/// نام شرکت
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// شماره ثبت
/// </summary>
public string RegisterId { get; set; }
/// <summary>
/// شناسه ملی شرکت
/// </summary>
public string NationalId { get; set; }
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; set; }
/// <summary>
/// وضعیت احراز هویت
/// </summary>
public bool IsAuth { get; set; }
/// <summary>
/// کد ملی مدیرعامل
/// </summary>
public string CeoNationalCode { get; set; }
/// <summary>
/// شماره شناسنامه مدیرعامل
/// </summary>
public string CeoIdNumber { get; set; }
/// <summary>
/// نام مدیرعامل
/// </summary>
public string CeoFName { get; set; }
/// <summary>
/// نام خانوادگی مدیرعامل
/// </summary>
public string CeoLName { get; set; }
/// <summary>
/// نام پدر مدیرعامل
/// </summary>
public string CeoFatherName { get; set; }
/// <summary>
/// تاریخ تولد مدیرعامل
/// </summary>
public string CeoDateOfBirth { get; set; }
/// <summary>
/// محل صدور شناسنامه مدیرعامل
/// </summary>
public string CeoPlaceOfIssue { get; set; }
/// <summary>
/// تاریخ صدور شناسنامه مدیرعامل
/// </summary>
public string CeoDateOfIssue { get; set; }
/// <summary>
/// شماره موبایل
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// شماره تلفن ثابت
/// </summary>
public string TelephoneNumber { get; set; }
/// <summary>
/// اطلاعات سیستم دولتی
/// </summary>
public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
}
/// <summary>
/// کلاس ثبت کارفرمای حقیقی در گردش کار - شامل اطلاعات شخصی کارفرما
/// </summary>
public class CreateRealEmployerWorkflowRegistration
{
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; set; }
/// <summary>
/// وضعیت احراز هویت
/// </summary>
public bool IsAuth { get; set; }
/// <summary>
/// کد ملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// شماره شناسنامه
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// نام
/// </summary>
public string FName { get; set; }
/// <summary>
/// نام خانوادگی
/// </summary>
public string LName { get; set; }
/// <summary>
/// نام پدر
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// تاریخ تولد
/// </summary>
public string DateOfBirth { get; set; }
/// <summary>
/// شماره موبایل
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// محل صدور شناسنامه
/// </summary>
public string PlaceOfIssue { get; set; }
/// <summary>
/// تاریخ صدور شناسنامه
/// </summary>
public string DateOfIssue { get; set; }
/// <summary>
/// اطلاعات سیستم دولتی
/// </summary>
public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
/// <summary>
/// شماره تلفن
/// </summary>
public string Telephone { get; set; }
}
/// <summary>
/// کلاس ویرایش کارفرما در گردش کار - شامل اطلاعات کارفرمای حقیقی و حقوقی
/// </summary>
public class EditEmployerWorkflowRegistration : CreateEmployerWorkflowRegistration
{
/// <summary>
/// شناسه کارفرما
/// </summary>
public long EmployerId { get; set; }
}

View File

@@ -0,0 +1,34 @@
using System.Collections.Generic;
namespace CompanyManagment.App.Contracts.FinancialStatment;
public class ClientFinancialStatementViewModel
{
/// <summary>
/// آیدی FinancialStatement
/// </summary>
public long Id { get; set; }
/// <summary>
/// نام طرف حساب
/// </summary>
public string ContractingPartyName { get; set; }
/// <summary>
/// جمع بدهکاری
/// </summary>
public double TotalDebt { get; set; }
/// <summary>
/// جمع بستانکاری
/// </summary>
public double TotalCredit { get; set; }
/// <summary>
/// مبلغ قابل پرداخت
/// </summary>
public double TotalAmountPayable { get; set; }
/// <summary>
/// تراکنش ها
/// </summary>
public List<FinancialTransactionDetailViewModel> Transactions { get; set; }
}

View File

@@ -0,0 +1,27 @@
namespace CompanyManagment.App.Contracts.FinancialStatment;
public class FinancialStatementSearchModel
{
/// <summary>
/// از تاریخ
/// </summary>
public string FromDate { get; set; }
/// <summary>
/// تا تاریخ
/// </summary>
public string ToDate { get; set; }
/// <summary>
/// از مبلغ
/// </summary>
public double FromAmount { get; set; }
/// <summary>
/// تا مبلغ
/// </summary>
public double ToAmount { get; set; }
/// <summary>
/// نوع عملیات تراکنش
/// </summary>
public FinancialTransactionType? Type { get; set; }
}

View File

@@ -0,0 +1,45 @@
using System;
namespace CompanyManagment.App.Contracts.FinancialStatment;
public class FinancialTransactionDetailViewModel
{
public long Id { get; set; }
/// <summary>
/// زمان و تاریخ میلادی
/// </summary>
public DateTime DateTimeGr { get; set; }
/// <summary>
/// تاریخ
/// </summary>
public string DateFa { get; set; }
/// <summary>
/// زمان
/// </summary>
public string TimeFa { get; set; }
/// <summary>
/// شرح
/// </summary>
public string Description { get; set; }
/// <summary>
/// نوع عملیات پرداخت
/// </summary>
public FinancialTransactionType Type { get; set; }
/// <summary>
/// نوع عملیات پرداخت به صورت استرینگ
/// </summary>
public string TypeStr { get; set; }
/// <summary>
/// بدهکار
/// </summary>
public double Debtor { get; set; }
/// <summary>
/// بستانکار
/// </summary>
public double Creditor { get; set; }
/// <summary>
/// باقی مانده
/// </summary>
public double Balance { get; set; }
}

View File

@@ -0,0 +1,13 @@
namespace CompanyManagment.App.Contracts.FinancialStatment;
public enum FinancialTransactionType
{
/// <summary>
/// ایجاد درآمد
/// </summary>
Debt,
/// <summary>
/// دریافت درآمد
/// </summary>
Credit
}

View File

@@ -1,16 +1,105 @@
using System;
using _0_Framework.Application;
using CompanyManagment.App.Contracts.FinancilTransaction;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using _0_Framework.Application;
namespace CompanyManagment.App.Contracts.FinancialStatment;
public interface IFinancialStatmentApplication
{
/// <summary>
/// ایجاد سند مالی از طریق درگاه بانکی
/// </summary>
/// <param name="command"></param>
/// <returns></returns>
OperationResult CreateFromBankGateway(CreateFinancialStatment command);
OperationResult Create(CreateFinancialStatment command);
List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
[Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
}
/// <summary>
/// نمایش اطلاعات صورت حساب مالی کلاینت
/// </summary>
/// <param name="searchModel"></param>
/// <param name="accountId"></param>
/// <returns>مدل صورت حساب مالی کلاینت</returns>
Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(FinancialStatementSearchModel searchModel,
long accountId);
/// <summary>
/// نمایش اطلاعات صورت حساب مالی کلاینت بر اساس کد هش
/// </summary>
/// <param name="hashCode"></param>
/// <returns></returns>
Task<OperationResult<ClientFinancialStatementViewModel>> GetDetailsByPublicId(string publicId);
/// <summary>
/// مقدار مانده صورت حساب مالی را برمی گرداند
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<GetFinancialStatementBalanceAmount> GetBalanceAmount(long id);
/// <summary>
/// مقدار بدهی کلاینت را برمی گرداند
/// </summary>
/// <param name="accountId"></param>
/// <returns></returns>
Task<double> GetClientDebtAmount(long accountId);
/// <summary>
/// جزئیات بر اساس
/// </summary>
/// <param name="contractingPartyId"></param>
/// <param name="searchModel"></param>
/// <returns></returns>
Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,
FinancialStatementSearchModel searchModel);
}
public class FinancialStatmentDetailsByContractingPartyViewModel
{
/// <summary>
/// آیدی FinancialStatement
/// </summary>
public long Id { get; set; }
/// <summary>
/// نام طرف حساب
/// </summary>
public string ContractingPartyName { get; set; }
/// <summary>
/// جمع بدهکاری
/// </summary>
public double TotalDebt { get; set; }
/// <summary>
/// جمع بستانکاری
/// </summary>
public double TotalCredit { get; set; }
/// <summary>
/// مبلغ قابل پرداخت
/// </summary>
public double TotalAmountPayable { get; set; }
/// <summary>
/// تراکنش ها
/// </summary>
public List<FinancialTransactionDetailViewModel> List { get; set; }
}
public class GetFinancialStatementBalanceAmount
{
/// <summary>
/// مبلغ
/// </summary>
public double Amount { get; set; }
public long ContractingPartyId { get; set; }
}

View File

@@ -0,0 +1,316 @@
using System.Collections.Generic;
using System.Security.AccessControl;
using _0_Framework.Application;
using _0_Framework.Application.Enums;
using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
using CompanyManagment.App.Contracts.Workshop;
namespace CompanyManagment.App.Contracts.InstitutionContract;
/// <summary>
/// درخواست ایجاد قرارداد نهاد
/// </summary>
public class CreateInstitutionContractRequest
{
/// <summary>
/// نوع حقوقی طرف قرارداد (حقیقی یا حقوقی)
/// </summary>
public LegalType ContractingPartyLegalType { get; set; }
/// <summary>
/// اطلاعات شخص حقیقی
/// </summary>
public CreateInstitutionContractRealPartyRequest RealParty { get; set; }
/// <summary>
/// اطلاعات شخص حقوقی
/// </summary>
public CreateInstitutionContractLegalPartyRequest LegalParty { get; set; }
/// <summary>
/// آیدی معرف
/// </summary>
public long RepresentativeId { get; set; }
/// <summary>
/// مدت زمان قرارداد
/// </summary>
public InstitutionContractDuration Duration { get; set; }
/// <summary>
/// استان
/// </summary>
public string Province { get; set; }
/// <summary>
/// شهر
/// </summary>
public string City { get; set; }
/// <summary>
/// آدرس
/// </summary>
public string Address { get; set; }
/// <summary>
/// اطلاعات تماس
/// </summary>
public List<CreateContactInfo> ContactInfos { get; set; }
/// <summary>
/// لیست کارگاه‌های مورد نظر برای قرارداد
/// </summary>
public List<CreateInstitutionContractWorkshopDetail> Workshops { get; set; }
/// <summary>
/// تاریخ شروع قرارداد (فارسی)
/// </summary>
public string ContractStartFa { get; set; }
/// <summary>
/// مبلغ خسارت روزانه
/// </summary>
public double DailyCompensation { get; set; }
/// <summary>
/// وجه التزام
/// </summary>
public double Obligation { get; set; }
/// <summary>
/// توضیحات
/// </summary>
public string Description { get; set; }
/// <summary>
/// مبلغ کل قرارداد
/// </summary>
public double TotalAmount { get; set; }
/// <summary>
/// آیا قرارداد اقساطی است؟
/// </summary>
public bool IsInstallment { get; set; }
/// <summary>
/// مالیات ارزش افزوده
/// </summary>
public double TaxAmount { get; set; }
}
/// <summary>
/// مدت زمان قرارداد نهاد
/// </summary>
public enum InstitutionContractDuration
{
/// <summary>
/// یک ماهه
/// </summary>
OneMonth = 1,
/// <summary>
/// سه ماهه
/// </summary>
ThreeMonths = 3,
/// <summary>
/// شش ماهه
/// </summary>
SixMonths = 6,
/// <summary>
/// دوازده ماهه
/// </summary>
TwelveMonths = 12
}
/// <summary>
/// جزئیات کارگاه در درخواست ایجاد قرارداد نهاد
/// </summary>
public class CreateInstitutionContractWorkshopDetail
{
/// <summary>
/// شناسه کارگاه (اختیاری - در صورت وجود کارگاه از قبل)
/// </summary>
public long? WorkshopId { get; set; }
/// <summary>
/// نام کارگاه
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// پلن حضور و غیاب
/// </summary>
public bool HasRollCallPlan { get; set; }
/// <summary>
/// پلن فیش غیر رسمی
/// </summary>
public bool HasCustomizeCheckoutPlan { get; set; }
/// <summary>
/// پلن قرارداد و تصفیه
/// </summary>
public bool HasContractPlan { get; set; }
/// <summary>
/// پلن قرارداد و تصفیه حضوری
/// </summary>
public bool HasContractPlanInPerson { get; set; }
/// <summary>
/// پلن بیمه
/// </summary>
public bool HasInsurancePlan { get; set; }
/// <summary>
/// پلن بیمه حضوری
/// </summary>
public bool HasInsurancePlanInPerson { get; set; }
/// <summary>
/// تعداد پرسنل کارگاه
/// </summary>
public int PersonnelCount { get; set; }
/// <summary>
/// مبلغ
/// </summary>
public double Price { get; set; }
}
/// <summary>
/// درخواست ایجاد طرف حقیقی در قرارداد نهاد
/// </summary>
public class CreateInstitutionContractRealPartyRequest
{
/// <summary>
/// کد ملی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// تاریخ تولد فارسی
/// </summary>
public string BirthDateFa { get; set; }
/// <summary>
/// شماره تلفن
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// وضعیت احراز هویت
/// </summary>
public bool IsAuth { get; set; }
/// <summary>
/// نام
/// </summary>
public string FName { get; set; }
/// <summary>
/// نام خانوادگی
/// </summary>
public string LName { get; set; }
/// <summary>
/// نام پدر
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// شماره شناسنامه
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// شناسه موقت طرف قرارداد
/// </summary>
public long ContractingPartyTempId { get; set; }
/// <summary>
/// جنسیت
/// </summary>
public Gender Gender { get; set; }
}
/// <summary>
/// درخواست ایجاد طرف حقوقی در قرارداد نهاد
/// </summary>
public class CreateInstitutionContractLegalPartyRequest
{
/// <summary>
/// نام شرکت
/// </summary>
public string CompanyName { get; set; }
/// <summary>
/// شماره ثبت
/// </summary>
public string RegisterId { get; set; }
/// <summary>
/// شناسه ملی شرکت
/// </summary>
public string NationalId { get; set; }
/// <summary>
/// شماره تلفن شرکت
/// </summary>
public string PhoneNumber { get; set; }
/// <summary>
/// شناسه موقت طرف قرارداد
/// </summary>
public long ContractingPartyTempId { get; set; }
/// <summary>
/// کد ملی نماینده قانونی
/// </summary>
public string NationalCode { get; set; }
/// <summary>
/// تاریخ تولد نماینده قانونی فارسی
/// </summary>
public string BirthDateFa { get; set; }
/// <summary>
/// نام نماینده قانونی
/// </summary>
public string FName { get; set; }
/// <summary>
/// نام خانوادگی نماینده قانونی
/// </summary>
public string LName { get; set; }
/// <summary>
/// نام پدر نماینده قانونی
/// </summary>
public string FatherName { get; set; }
/// <summary>
/// شماره شناسنامه نماینده قانونی
/// </summary>
public string IdNumber { get; set; }
/// <summary>
/// وضعیت احراز هویت نماینده قانونی
/// </summary>
public bool IsAuth { get; set; }
/// <summary>
/// سمت نماینده قانونی در شرکت
/// </summary>
public string Position { get; set; }
/// <summary>
/// جنسیت نماینده قانونی
/// </summary>
public Gender Gender { get; set; }
}

View File

@@ -0,0 +1,7 @@
namespace CompanyManagment.App.Contracts.InstitutionContract;
public class EditInstitutionContractRequest:CreateInstitutionContractRequest
{
public long Id { get; set; }
public long ContractingPartyId { get; set; }
}

Some files were not shown because too many files have changed in this diff Show More