339cea998a
Merge branch 'Feature/roll-call/camera-bug-report'
...
# Conflicts:
# PersonalContractingParty.Config/PersonalBootstrapper.cs
2025-12-13 17:30:31 +03:30
b3f42af77c
Refactor bug report system to use Guid for identifiers instead of long
2025-12-13 11:19:17 +03:30
f42db3d21c
fix: change token expiration time to local time in JWT settings
2025-12-13 10:28:19 +03:30
eb49bf771d
changes mongo camera report
2025-12-12 19:42:08 +03:30
f829b8ddd1
Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir
2025-12-08 16:36:42 +03:30
5e6033db95
change ssologin url
2025-12-08 16:36:35 +03:30
SamSys
0a2815946c
change leavComput for staticWorkshop set
2025-12-08 14:37:04 +03:30
SamSys
7776dedd2a
update SmsSettings js
2025-12-08 13:29:09 +03:30
SamSys
5da523e9a8
spreating js and css on SmsSettings
2025-12-08 13:24:18 +03:30
b7a7fb01d7
Merge remote-tracking branch 'origin/master'
2025-12-08 13:04:30 +03:30
8d49220532
Implement SSO token generation for Program Manager and update domain configuration
2025-12-08 13:04:19 +03:30
SamSys
def27929d9
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
2025-12-07 19:54:23 +03:30
SamSys
ea6fcbc773
add new permissions
2025-12-07 19:53:41 +03:30
788d58b413
change Id to ENtityId in getting institution by installment Id from FInancial invoice Item for Verify gateway payment controller
2025-12-07 19:39:01 +03:30
de8181770d
Merge branch 'Feature/authorize/program-manager'
...
# Conflicts:
# ServiceHost/appsettings.Development.json
# ServiceHost/appsettings.json
2025-12-07 18:25:18 +03:30
3a32d1ca9d
Merge branch 'master' into Feature/authorize/program-manager
2025-12-07 18:22:56 +03:30
951a194961
Add Program Manager menu item and update SSO login URL
2025-12-07 18:22:44 +03:30
ea896c4c11
Add migration for camera bug report system with related logs and screenshots
2025-12-07 17:56:56 +03:30
167b2bce09
Implement camera bug report system with CRUD operations and logging
2025-12-07 17:54:55 +03:30
SamSys
32a05398de
add ProgramManager ConnectionString on AppSettings
2025-12-07 16:41:47 +03:30
SamSys
57853e2d1f
Merge branch 'master' into ProgramManagerUserAccount
2025-12-07 15:33:46 +03:30
SamSys
acd96bcdc7
Add ProgramManager Context
2025-12-07 15:21:53 +03:30
3c0ec01f77
Fix date comparison logic in roll call validation
2025-12-06 18:57:52 +03:30
SamSys
fb97d3453d
Merge branch 'master' into ProgramManagerUserAccount
2025-12-06 17:06:58 +03:30
SamSys
2320185ade
Change
2025-12-06 16:58:34 +03:30
SamSys
80fdd1fece
add programManager Domains and context
2025-12-06 16:58:14 +03:30
343f830d0d
Fix calculation of discounted payment amount in institution contract repository
2025-12-06 16:46:02 +03:30
323a46a623
Add Program Manager menu item and implement JWT token generation for SSO login
2025-12-06 16:24:11 +03:30
87ff7976fb
Add menu item for bank account information
...
Added a new menu item with `permission="307"` to `_Menu.cshtml`
for accessing the `account-number-database` page. The link
is dynamically constructed using `AppSetting.Value.Domain`
and styled with `class="clik10"` and inline styles. Included
an SVG icon and the text "اطلاعات بانکی طرف حساب"
("Bank account information of the counterparty"). Maintained
the hierarchical structure of the menu.
2025-12-06 10:41:03 +03:30
a533850f24
Enhance contract removal logic and handle financial statement updates
2025-12-04 10:36:59 +03:30
b5c1a4c29d
Refactor legal party handling logic
...
Replaced `realPersonalContractingParty` with `legalPersonalContractingParty` to ensure correct variable usage in legal party operations. Updated the authentication logic to handle both authenticated and unauthenticated states, introducing a new `else` block for `LegalAuthentication`. Adjusted method calls (`UnAuthenticateLegalEdit` and `EditLegalPartyFromInstitution`) to use the updated variable and ensure consistent updates to legal party details.
2025-12-03 20:21:08 +03:30
28607dec66
Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir
2025-12-03 12:10:52 +03:30
4a041ca8e2
add condition for null rollcall employee in IfEmloyeeHasNewLeftWorkDateAddEndDateToRollCallStatus
2025-12-03 12:10:48 +03:30
SamSys
de0de6fde8
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
2025-12-02 15:01:41 +03:30
SamSys
70447a74ef
change lunchSettings
2025-12-02 15:01:25 +03:30
90aa6058f0
Handle "*" in NationalCode assignment gracefully
...
Updated the `NationalCode` assignment in the `CreateInstitutionContractLegalPartyRequest` object to replace `"*"` with an empty string (`string.Empty`). This ensures compliance with business rules where `"*"` is not considered a valid value for `NationalCode`. Retains the original value otherwise.
2025-12-02 14:40:54 +03:30
3df296f205
Merge branch 'master' of https://github.com/syntax24/OriginalGozareshgir
2025-12-02 14:23:39 +03:30
6a2e4405de
add check for gender if is empty
2025-12-02 14:00:01 +03:30
88c10ac141
Add phone and ID number series fields to temporary client registration result
2025-12-02 13:44:25 +03:30
SamSys
8de3939675
change lunch setting adddress
2025-12-02 13:06:22 +03:30
e78c838cab
Add method to edit legal party details from institution in contracting party
2025-12-02 13:00:34 +03:30
SamSys
5e4b8a3a80
change static file permiission
2025-12-02 11:51:13 +03:30
SamSys
a18984fec1
add account to static list
2025-12-02 11:37:29 +03:30
a178fcd202
Add logic to count absences on Fridays and Thursdays without leave
2025-12-01 19:37:17 +03:30
9e92d2215f
Add institution contract workflow count functionality to admin workflow
2025-12-01 10:53:26 +03:30
c63eb23b22
Handle null API response in employee authorization checks
2025-12-01 10:07:09 +03:30
238926118f
Handle additional status code 3 in UID service response for employee authorization checks
2025-11-30 11:09:25 +03:30
c874164ca2
Merge branch 'Feature/InstitutionContract/set-discount'
2025-11-29 20:08:00 +03:30
d2f0ed46ae
Refactor discount calculation and response models for institution contracts
...
- Replace InstitutionContractExtensionPaymentResponse with InstitutionContractDiscountResponse in discount-related methods and endpoints
- Update request and response models to include OneMonthAmount, Obligation, and improved discount fields
- Adjust method signatures and controller actions to use new response types
- Refactor discount calculation logic to support new structure and ensure correct plan updates for both installment and one-time payments
- Improve naming consistency for discount percentage fields
2025-11-29 20:07:29 +03:30
40dd90074b
Add discount amount and percentage fields to InstitutionContract entity and database schema
2025-11-29 14:56:45 +03:30
