1166 Commits

Author SHA1 Message Date
gozareshgir
59d73d5ca8 Merge branch 'Main' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Main 2026-02-05 14:25:05 +03:30
gozareshgir
ce146d9733 merge from AdminCheckoutapi 2026-02-05 14:25:00 +03:30
gozareshgir
ec8dfe4799 change create checkout api 2026-02-05 14:18:11 +03:30
0ba0043751 Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 11:32:44 +03:30
79a9d72b86 rename SalaryAidViewModels property to Items in grouped view models 2026-02-05 11:32:16 +03:30
127d9f7a46 Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 11:06:24 +03:30
a8cb226d20 change list key for salary aid 2026-02-05 11:05:54 +03:30
793b10c6cc Merge branch 'Feature/salary-aid/client-api' into Main 2026-02-05 10:33:39 +03:30
a0d2023a6c add Excel validation for salary aid import and update pagination in salary aid list 2026-02-05 10:32:08 +03:30
gozareshgir
7d35a65f35 save to db Checkout new Method 2026-02-03 17:00:36 +03:30
gozareshgir
734d0ca692 Merge branch 'Main' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Main 2026-02-03 15:16:55 +03:30
gozareshgir
d07a78a637 Merge branch 'Feature/SmsRepoetApi' into Main 2026-02-03 15:16:48 +03:30
gozareshgir
1ac73f9689 change showStatus signalR 2026-02-03 15:09:50 +03:30
c28bb46aaf Merge remote-tracking branch 'origin/Main' into Main 2026-02-03 14:24:58 +03:30
gozareshgir
f067d5a7b4 merge from smsReport 2026-02-03 14:21:34 +03:30
gozareshgir
fe8e94f121 merge from master 2026-02-03 14:10:48 +03:30
gozareshgir
c493718452 InstantSms change signalR 2026-02-03 14:08:16 +03:30
dc56df5e0f Merge remote-tracking branch 'origin/Main' into Main 2026-02-03 14:03:05 +03:30
d6e60e2cab Merge branch 'Feature/loan/client-api' into Main 2026-02-03 13:46:00 +03:30
fa4c39904a chnage loan list to new type 2026-02-03 13:44:47 +03:30
gozareshgir
6e74447ccb Merge branch 'Main' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Main 2026-02-02 19:16:55 +03:30
gozareshgir
b65c33c43a test change 2026-02-02 19:16:47 +03:30
0705823157 Merge branch 'Feature/roll-call/client-api' into Main 2026-02-02 17:32:41 +03:30
gozareshgir
734fd9ebca change 2026-02-02 16:37:23 +03:30
gozareshgir
add04f854e merge from master 2026-02-02 15:37:16 +03:30
gozareshgir
debb54bafc test For Instant Sms 2026-02-02 14:28:07 +03:30
gozareshgir
7a065e9d16 Checkout Except EmployeeId = 7175 2026-02-02 13:57:15 +03:30
33a2c0be95 Merge branch 'Feature/EmployeesBankInfo/client-api' into Main 2026-02-02 10:23:17 +03:30
fedfc372d0 add BankController and methods for retrieving bank list; update EmployeeBankInfoController with Excel download functionality 2026-02-02 10:22:34 +03:30
gozareshgir
a2c1fd30bf Mandatory Compute Added to CreateCheckoutApi 2026-02-01 19:36:09 +03:30
170f30f162 Merge branch 'Feature/loan/client-api' into Main 2026-02-01 18:16:44 +03:30
db26c29057 Merge branch 'Feature/EmployeesBankInfo/client-api' into Main 2026-02-01 18:16:33 +03:30
0e7787dd56 add page size for search model 2026-02-01 18:14:28 +03:30
gozareshgir
1e9f864c1e Merge branch 'master' into AdminCheckoutApi 2026-02-01 13:23:27 +03:30
gozareshgir
e2bab8c1ce HasRollCall Method Changeed 2026-02-01 13:20:22 +03:30
gozareshgir
3f23d1dac0 saparation creatcheckout on api mehod changes 2026-01-31 17:08:24 +03:30
gozareshgir
6f0a579c33 chage 2026-01-31 15:38:47 +03:30
gozareshgir
b088d3089d merge from smsReportApi 2026-01-29 15:29:19 +03:30
gozareshgir
45b4690066 Test singnalR instandSms 2026-01-29 15:26:04 +03:30
gozareshgir
26517c20d8 some change 2026-01-29 13:35:22 +03:30
411363555f Merge branch 'master' into Main
# Conflicts:
#	ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Services/FileManagement/FileUploadService.cs
2026-01-27 17:44:02 +03:30
a55492b16a add CancelSendVerificationSms flag to InstitutionContractExtensionCompleteRequest and update SMS sending logic 2026-01-27 17:43:05 +03:30
gozareshgir
187b7406d2 fix conflict 2026-01-27 14:14:51 +03:30
gozareshgir
c51bb90a2b merge from master 2026-01-27 14:14:40 +03:30
gozareshgir
bef21edf22 chnage GetContractAndIncluded 2026-01-26 14:44:30 +03:30
gozareshgir
c151e2d3f7 some changes 2026-01-25 19:40:28 +03:30
gozareshgir
1e36966767 merge from master 2026-01-25 19:39:51 +03:30
c1c9fe51cb fix creation for institutioncontract on Not Authorized contracting party 2026-01-25 19:08:13 +03:30
43ccb3a1dd Merge remote-tracking branch 'origin/master' 2026-01-24 19:10:59 +03:30
0134111aba fix bug for extensions 2026-01-24 19:10:24 +03:30