Commit Graph

620 Commits

Author SHA1 Message Date
gozareshgir
3bb16c02b4 merge from AdminCheckoutApi 2026-01-21 19:57:48 +03:30
gozareshgir
5b6f967fca workshopSelectList api and employeeSelectlist 2026-01-20 18:17:32 +03:30
gozareshgir
5cd30e5910 Checkout Print Api init 2026-01-19 19:12:48 +03:30
gozareshgir
7bb507c841 merge from adminCheckoutApi 2026-01-18 18:07:10 +03:30
e9d0efc52f Merge branch 'Feature/roll-call/client-api' into Main
# Conflicts:
#	CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs
#	CompanyManagment.EFCore/Repository/RollCallRepository.cs
2026-01-18 13:18:27 +03:30
301a8f06f4 Merge branch 'Feature/Checkout/client-api' into Main 2026-01-18 13:15:37 +03:30
63a3027a17 add client checkout list controller 2026-01-18 12:51:58 +03:30
gozareshgir
12af5dcb56 get checkout list init 2026-01-14 16:39:05 +03:30
d179c90c48 change paginated to list 2026-01-13 18:31:10 +03:30
gozareshgir
377f95561c Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 16:43:29 +03:30
gozareshgir
b5c5be2cb6 change smsResult grouping 2026-01-13 16:26:04 +03:30
gozareshgir
2e95846336 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 11:40:46 +03:30
b286923dfe Merge branch 'Feature/fine/client-api' into Main
# Conflicts:
#	.gitignore
#	ServiceHost/Program.cs
2026-01-13 11:30:45 +03:30
gozareshgir
f7bfa37a77 SmsSettings List , create, edit, delete 2026-01-13 11:17:25 +03:30
gozareshgir
77dbb50512 BlueDeActiveAfterZeroDebt hangfire completed 2026-01-12 14:32:50 +03:30
gozareshgir
1c7e8824c7 DeActiveInstitutionEndOfContract hangfire completed 2026-01-12 13:10:58 +03:30
gozareshgir
e4355faffc block and unblock 2026-01-11 21:10:29 +03:30
05d860795e add rollcall title case history query 2026-01-11 15:12:08 +03:30
gozareshgir
577fe5db76 Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Feature/SmsRepoetApi 2026-01-11 12:58:36 +03:30
SamSys
0ab3052251 Send Warning and leagal action Message 2026-01-08 14:04:34 +03:30
SamSys
35e6355069 get Warning sms List on new repo 2026-01-08 11:19:25 +03:30
SamSys
07a4ce1f64 merge from SmsReportApi 2026-01-07 18:40:15 +03:30
SamSys
4de2e12ac5 AmaApiReport 2026-01-07 18:38:12 +03:30
SamSys
7207172ce0 Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main 2026-01-07 16:29:51 +03:30
SamSys
48b75d2baa Sms Report get list init 2026-01-07 16:29:03 +03:30
7ba85fe1aa Merge branch 'Feature/institution-contract/sent-to-customer-flag' into Main 2026-01-07 15:03:51 +03:30
4ade9e12a6 feat: add InstitutionContractIsSentFlag to track contract send status 2026-01-07 15:03:21 +03:30
SamSys
63edb33bf5 Sms Report Init 2026-01-07 14:49:44 +03:30
dd7e816767 feat: add SetContractSendFlag method and related request for contract send tracking 2026-01-07 14:46:34 +03:30
1deeff996f feat: implement InstitutionContractSendFlag repository and model for contract send tracking 2026-01-07 14:35:17 +03:30
SamSys
ebcb7530e0 Merge branch 'WorskhopClassifiedPlan' into Main 2026-01-06 17:36:05 +03:30
SamSys
9ff9b0be18 add salary list 2026-01-06 17:33:40 +03:30
SamSys
ceb328cfa7 Save AddOrEdit Jobs to group 2026-01-06 15:28:12 +03:30
SamSys
ba88a012ff Merge branch 'WorskhopClassifiedPlan' into Main 2026-01-05 16:48:11 +03:30
SamSys
e4c41bb704 JobSelectList api 2026-01-05 16:41:58 +03:30
SamSys
94466bbb27 merge from ClassificationScheme 2026-01-05 15:41:22 +03:30
SamSys
be4bc2c900 GroupAndJobList 2026-01-04 19:13:46 +03:30
SamSys
ef86c6d07d Merge from ClassificationScheme 2026-01-04 16:06:15 +03:30
SamSys
5b15596696 SchemeList, Edit, Create, delete 2026-01-04 15:35:06 +03:30
d7dd91eaba Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir into Main
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-01-01 12:30:38 +03:30
SamSys
946024d81e Merg from Master 2026-01-01 12:29:39 +03:30
a6e1251445 Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir into Feature/gateway/add-debt-payment
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-12-31 18:13:06 +03:30
490a1a69d5 add: implement Sepehr payment gateway integration and enhance financial invoice handling 2025-12-31 18:12:27 +03:30
66a6c411d6 add: implement payment callback handling and enhance financial invoice structure 2025-12-31 15:49:44 +03:30
SamSys
b03a806dfb BackgroundTask change for new institutionContract sms 2025-12-31 14:11:10 +03:30
58f695fe95 Merge branch 'Feature/institution-contract/change-account-with-data' 2025-12-30 20:58:12 +03:30
eb9a3e52fe feat: implement async methods for activating and deactivating personal contracting parties 2025-12-30 13:50:09 +03:30
5f21b59cb3 Merge branch 'Feature/institution-contract/refactor-creation' into Main
# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs
2025-12-30 10:42:48 +03:30
836e721b6f feat: refactor institution contract creation classes and endpoints 2025-12-30 10:38:07 +03:30
8fca1f3a91 feat: add institution contract creation inquiry functionality 2025-12-29 22:19:16 +03:30