Dev

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/PaymentInfoViewComponent.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.GrantApplications;
+using Unity.Payments.Codes;
 using Unity.Payments.Enums;
 using Unity.Payments.PaymentRequests;
 using Volo.Abp.AspNetCore.Mvc;
@@ -101,7 +102,7 @@ private static (decimal paidAmount, decimal pendingAmount) CalculatePaymentAmoun
 
             var paidAmount = requestsList
                 .Where(e => !string.IsNullOrWhiteSpace(e.PaymentStatus)
-                         && e.PaymentStatus.Trim().Equals("Fully Paid", StringComparison.OrdinalIgnoreCase))
+                         && e.PaymentStatus.Trim().Equals(CasPaymentRequestStatus.FullyPaid, StringComparison.OrdinalIgnoreCase))
                 .Sum(e => e.Amount);
 
             var pendingAmount = requestsList

applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/layout.css

@@ -518,20 +518,28 @@ input.form-control-currency {
 
     input.form-control:disabled, textarea.form-control:disabled, .form-select:disabled, input.form-control-currency:disabled {
         color: var(--bc-colors-grey-text-200);
-        pointer-events: none;
         background-color: var(--bc-colors-grey-hover) !important;
         opacity: var(--bs-btn-disabled-opacity);
         background-blend-mode: difference;
         border: var(--bs-border-width) solid var(--bs-border-color);
+
+        pointer-events: auto;
+        user-select: text;
+        -webkit-user-select: text;
+        cursor: text;
     }
 
     input.form-control-currency:disabled {
         color: var(--bc-colors-grey-text-200);
-        pointer-events: none;
         background-color: var(--bc-colors-grey-hover) !important;
         opacity: var(--bs-btn-disabled-opacity);
         background-blend-mode: difference;
         border: var(--bs-border-width) solid var(--bs-border-color);
+
+        pointer-events: auto;
+        user-select: text;
+        -webkit-user-select: text;
+        cursor: text;
     }
 
     textarea.form-control:disabled {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantProfileDto.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ApplicantProfileDto.cs

@@ -1,7 +1,7 @@
 using System;
-using Unity.GrantManager.Applicants.ProfileData;
+using Unity.GrantManager.ApplicantProfile.ProfileData;
 
-namespace Unity.GrantManager.Applicants
+namespace Unity.GrantManager.ApplicantProfile
 {
     public class ApplicantProfileDto
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ApplicantProfileRequest.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ApplicantProfileRequest.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.GrantManager.Applicants
+namespace Unity.GrantManager.ApplicantProfile
 {
     public class ApplicantProfileRequest
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/IApplicantProfileAppService.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/IApplicantProfileAppService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Unity.GrantManager.Applicants;
 
-namespace Unity.GrantManager.Applicants
+namespace Unity.GrantManager.ApplicantProfile
 {
     public interface IApplicantProfileAppService
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/IApplicantProfileContactService.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Unity.GrantManager.ApplicantProfile.ProfileData;
+
+namespace Unity.GrantManager.ApplicantProfile;
+
+/// <summary>
+/// Provides applicant-profile-specific contact retrieval operations.
+/// This service aggregates contacts from two sources: profile-linked contacts
+/// and application-level contacts matched by OIDC subject.
+/// </summary>
+public interface IApplicantProfileContactService
+{
+    /// <summary>
+    /// Retrieves contacts linked to the specified applicant profile.
+    /// </summary>
+    /// <param name="profileId">The unique identifier of the applicant profile.</param>
+    /// <returns>A list of <see cref="ContactInfoItemDto"/> with <c>IsEditable</c> set to <c>true</c>.</returns>
+    Task<List<ContactInfoItemDto>> GetProfileContactsAsync(Guid profileId);
+
+    /// <summary>
+    /// Retrieves application contacts associated with submissions matching the given OIDC subject.
+    /// The subject is normalized by stripping the domain portion (after <c>@</c>) and converting to upper case.
+    /// </summary>
+    /// <param name="subject">The OIDC subject identifier (e.g. "user@idir").</param>
+    /// <returns>A list of <see cref="ContactInfoItemDto"/> with <c>IsEditable</c> set to <c>false</c>.</returns>
+    Task<List<ContactInfoItemDto>> GetApplicationContactsBySubjectAsync(string subject);
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantProfile/IApplicantProfileDataProvider.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/IApplicantProfileDataProvider.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using Unity.GrantManager.Applicants.ProfileData;
+using Unity.GrantManager.ApplicantProfile.ProfileData;
 
-namespace Unity.GrantManager.Applicants.ApplicantProfile
+namespace Unity.GrantManager.ApplicantProfile
 {
     /// <summary>
     /// Defines a contract for components that can provide applicant profile data

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ProfileData/ApplicantAddressInfoDto.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantAddressInfoDto.cs

@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.Applicants.ProfileData
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
 {
     public class ApplicantAddressInfoDto : ApplicantProfileDataDto
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantContactInfoDto.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
+{
+    public class ApplicantContactInfoDto : ApplicantProfileDataDto
+    {
+        public override string DataType => "CONTACTINFO";
+
+        public List<ContactInfoItemDto> Contacts { get; set; } = [];
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ProfileData/ApplicantOrgInfoDto.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantOrgInfoDto.cs

@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.Applicants.ProfileData
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
 {
     public class ApplicantOrgInfoDto : ApplicantProfileDataDto
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ProfileData/ApplicantPaymentInfoDto.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantPaymentInfoDto.cs

@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.Applicants.ProfileData
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
 {
     public class ApplicantPaymentInfoDto : ApplicantProfileDataDto
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantProfileDataDto.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
+{
+    [JsonPolymorphic(TypeDiscriminatorPropertyName = "dataType")]
+    [JsonDerivedType(typeof(ApplicantContactInfoDto), "CONTACTINFO")]
+    [JsonDerivedType(typeof(ApplicantOrgInfoDto), "ORGINFO")]
+    [JsonDerivedType(typeof(ApplicantAddressInfoDto), "ADDRESSINFO")]
+    [JsonDerivedType(typeof(ApplicantSubmissionInfoDto), "SUBMISSIONINFO")]
+    [JsonDerivedType(typeof(ApplicantPaymentInfoDto), "PAYMENTINFO")]
+    public class ApplicantProfileDataDto
+    {
+        public virtual string DataType { get; } = "";
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Applicants/ProfileData/ApplicantSubmissionInfoDto.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ApplicantSubmissionInfoDto.cs

@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.Applicants.ProfileData
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
 {
     public class ApplicantSubmissionInfoDto : ApplicantProfileDataDto
     {

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/ProfileData/ContactInfoItemDto.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace Unity.GrantManager.ApplicantProfile.ProfileData
+{
+    public class ContactInfoItemDto
+    {
+        public Guid ContactId { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string? Title { get; set; }
+        public string? Email { get; set; }
+        public string? HomePhoneNumber { get; set; }
+        public string? MobilePhoneNumber { get; set; }
+        public string? WorkPhoneNumber { get; set; }
+        public string? WorkPhoneExtension { get; set; }
+        public string? ContactType { get; set; }
+        public string? Role { get; set; }
+        public bool IsPrimary { get; set; }
+        public bool IsEditable { get; set; }
+        public Guid? ApplicationId { get; set; }
+    }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Contacts/ContactDto.cs

@@ -0,0 +1,39 @@
+using System;
+
+namespace Unity.GrantManager.Contacts;
+
+/// <summary>
+/// Represents a contact linked to an entity, returned by the generic contacts service.
+/// </summary>
+public class ContactDto
+{
+    /// <summary>The unique identifier of the contact.</summary>
+    public Guid ContactId { get; set; }
+
+    /// <summary>The full name of the contact.</summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>The job title of the contact.</summary>
+    public string? Title { get; set; }
+
+    /// <summary>The email address of the contact.</summary>
+    public string? Email { get; set; }
+
+    /// <summary>The home phone number of the contact.</summary>
+    public string? HomePhoneNumber { get; set; }
+
+    /// <summary>The mobile phone number of the contact.</summary>
+    public string? MobilePhoneNumber { get; set; }
+
+    /// <summary>The work phone number of the contact.</summary>
+    public string? WorkPhoneNumber { get; set; }
+
+    /// <summary>The work phone extension of the contact.</summary>
+    public string? WorkPhoneExtension { get; set; }
+
+    /// <summary>The role of the contact within the linked entity context.</summary>
+    public string? Role { get; set; }
+
+    /// <summary>Whether this contact is the primary contact for the linked entity.</summary>
+    public bool IsPrimary { get; set; }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Contacts/CreateContactLinkDto.cs

@@ -0,0 +1,42 @@
+using System;
+
+namespace Unity.GrantManager.Contacts;
+
+/// <summary>
+/// Input DTO for creating a new contact and linking it to a related entity.
+/// </summary>
+public class CreateContactLinkDto
+{
+    /// <summary>The full name of the contact.</summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>The job title of the contact.</summary>
+    public string? Title { get; set; }
+
+    /// <summary>The email address of the contact.</summary>
+    public string? Email { get; set; }
+
+    /// <summary>The home phone number of the contact.</summary>
+    public string? HomePhoneNumber { get; set; }
+
+    /// <summary>The mobile phone number of the contact.</summary>
+    public string? MobilePhoneNumber { get; set; }
+
+    /// <summary>The work phone number of the contact.</summary>
+    public string? WorkPhoneNumber { get; set; }
+
+    /// <summary>The work phone extension of the contact.</summary>
+    public string? WorkPhoneExtension { get; set; }
+
+    /// <summary>The role of the contact within the linked entity context.</summary>
+    public string? Role { get; set; }
+
+    /// <summary>Whether this contact should be set as the primary contact. Only one primary is allowed per entity type and entity ID.</summary>
+    public bool IsPrimary { get; set; }
+
+    /// <summary>The type of the entity to link the contact to (e.g. "ApplicantProfile").</summary>
+    public string RelatedEntityType { get; set; } = string.Empty;
+
+    /// <summary>The unique identifier of the related entity.</summary>
+    public Guid RelatedEntityId { get; set; }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Contacts/IContactAppService.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Unity.GrantManager.Contacts;
+
+/// <summary>
+/// Generic contact management service. Provides operations for creating, retrieving,
+/// and managing contacts linked to any entity type via <see cref="ContactLink"/>.
+/// </summary>
+public interface IContactAppService
+{
+    /// <summary>
+    /// Retrieves all active contacts linked to the specified entity.
+    /// </summary>
+    /// <param name="entityType">The type of the related entity (e.g. "ApplicantProfile").</param>
+    /// <param name="entityId">The unique identifier of the related entity.</param>
+    /// <returns>A list of <see cref="ContactDto"/> for the matching entity.</returns>
+    Task<List<ContactDto>> GetContactsByEntityAsync(string entityType, Guid entityId);
+
+    /// <summary>
+    /// Creates a new contact and links it to the specified entity.
+    /// If <see cref="CreateContactLinkDto.IsPrimary"/> is <c>true</c>, any existing primary
+    /// contact for the same entity type and ID will be cleared first.
+    /// </summary>
+    /// <param name="input">The contact and link details.</param>
+    /// <returns>The created <see cref="ContactDto"/>.</returns>
+    Task<ContactDto> CreateContactAsync(CreateContactLinkDto input);
+
+    /// <summary>
+    /// Sets the specified contact as the primary contact for the given entity.
+    /// Only one primary contact is allowed per entity type and entity ID;
+    /// any existing primary will be cleared before setting the new one.
+    /// </summary>
+    /// <param name="entityType">The type of the related entity.</param>
+    /// <param name="entityId">The unique identifier of the related entity.</param>
+    /// <param name="contactId">The unique identifier of the contact to set as primary.</param>
+    /// <exception cref="Volo.Abp.BusinessException">Thrown when no active contact link is found for the given parameters.</exception>
+    Task SetPrimaryContactAsync(string entityType, Guid entityId, Guid contactId);
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantProfile/AddressInfoDataProvider.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using Unity.GrantManager.Applicants.ProfileData;
+using Unity.GrantManager.ApplicantProfile.ProfileData;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.Applicants.ApplicantProfile
+namespace Unity.GrantManager.ApplicantProfile
 {
     [ExposeServices(typeof(IApplicantProfileDataProvider))]
     public class AddressInfoDataProvider : IApplicantProfileDataProvider, ITransientDependency

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantProfileAppService.cs → applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/ApplicantProfileAppService.cs

@@ -4,15 +4,15 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Unity.GrantManager.Applicants.ApplicantProfile;
+using Unity.GrantManager.Applicants;
 using Unity.GrantManager.Applications;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.TenantManagement;
 
-namespace Unity.GrantManager.Applicants
+namespace Unity.GrantManager.ApplicantProfile
 {
     [RemoteService(false)]
     public class ApplicantProfileAppService(