Dev

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Permissions/PaymentsPermissionDefinitionProvider.cs

@@ -20,7 +20,6 @@ public override void Define(IPermissionDefinitionContext context)
 
         //-- PAYMENT INFO PERMISSIONS
         grantApplicationPermissionsGroup.Add_PaymentInfo_Permissions();
-        paymentsPermissions.AddChild(PaymentsPermissions.Payments.EditSupplierInfo, L("Permission:Payments.EditSupplierInfo"));
         paymentsPermissions.AddChild(PaymentsPermissions.Payments.EditFormPaymentConfiguration, L("Permission:Payments.EditFormPaymentConfiguration"));        
     }
 

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

@@ -476,7 +476,15 @@ input.form-control, textarea.form-control, .form-select {
     text-overflow: ellipsis;
 }
 
-    input.form-control:hover, textarea.form-control:hover, .form-select:hover {
+input.form-control-currency {
+    font-size: var(--bc-font-size);
+    color: var(--bc-colors-grey-text-500);
+    border: 2px solid var(--bc-colors-blue-primary);
+    text-overflow: ellipsis;
+    padding-right: 0.75em;
+}
+
+    input.form-control:hover, textarea.form-control:hover, .form-select:hover, input.form-control-currency:hover {
         box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18);
     }
 
@@ -487,7 +495,7 @@ input.form-control, textarea.form-control, .form-select {
         font-weight: 700;
     }
 
-    input.form-control:disabled, textarea.form-control:disabled, .form-select:disabled {
+    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;
@@ -496,6 +504,15 @@ input.form-control, textarea.form-control, .form-select {
         border: none !important;
     }
 
+    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) !important;
+    }
+
     textarea.form-control:disabled {
         pointer-events: auto;
     }

applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css

@@ -41,7 +41,6 @@
     --bc-layout-margin-large: 24px;
 }
 
-
 .unity-app-container {
     background: var(--bc-colors-white-background);
     height: 100%; /* confirm this */
@@ -619,6 +618,16 @@ div.dataTables_filter > label > input {
 .checkbox-select:checked {
     outline: 1px solid var(--bc-colors-blue-primary);
     outline-style: auto;
+    accent-color: var(--bc-colors-blue-primary) !important;
+}
+
+input[type="radio"] {
+    accent-color: var(--bc-colors-blue-primary) !important;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+    color: var(--bs-nav-pills-link-active-color) !important;
+    background-color: var(--bs-nav-pills-link-active-bg) !important;
 }
 
 div.dataTables_wrapper div.dataTables_filter {

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs

@@ -35,7 +35,7 @@ public class ApplicantAppService(IApplicantRepository applicantRepository,
     protected new ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
 
     [RemoteService(false)]
-    public async Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intakeMap)
+    public async Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intakeMap, Guid applicationId)
     {
         ArgumentNullException.ThrowIfNull(intakeMap);
 
@@ -60,7 +60,7 @@ public async Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intake
             applicant.FiscalMonth = intakeMap.FiscalMonth ?? applicant.FiscalMonth;
         }
 
-        await CreateApplicantAddressesAsync(intakeMap, applicant);
+        await CreateApplicantAddressesAsync(intakeMap, applicant, applicationId);
         return applicant;
     }
 
@@ -301,7 +301,7 @@ private async Task<Applicant> CreateNewApplicantAsync(IntakeMapping intakeMap)
         return await applicantRepository.InsertAsync(applicant);
     }
 
-    private async Task CreateApplicantAddressesAsync(IntakeMapping intakeMap, Applicant applicant)
+    private async Task CreateApplicantAddressesAsync(IntakeMapping intakeMap, Applicant applicant, Guid applicationId)
     {
         ArgumentNullException.ThrowIfNull(intakeMap);
 
@@ -318,7 +318,8 @@ await addressRepository.InsertAsync(new ApplicantAddress
                 Street = intakeMap.PhysicalStreet,
                 Street2 = intakeMap.PhysicalStreet2,
                 Unit = intakeMap.PhysicalUnit,
-                AddressType = AddressType.PhysicalAddress
+                AddressType = AddressType.PhysicalAddress,
+                ApplicationId = applicationId
             });
         }
 
@@ -335,7 +336,8 @@ await addressRepository.InsertAsync(new ApplicantAddress
                 Street = intakeMap.MailingStreet,
                 Street2 = intakeMap.MailingStreet2,
                 Unit = intakeMap.MailingUnit,
-                AddressType = AddressType.MailingAddress
+                AddressType = AddressType.MailingAddress,
+                ApplicationId = applicationId
             });
         }
     }
@@ -385,8 +387,38 @@ public async Task UpdateApplicantIdAsync(UpdateApplicantIdDto dto)
 
         //Update ApplicantAgent records
         await UpdateApplicantAgentRecordsAsync(oldApplicantId, dto.ApplicantId, dto.ApplicationId);
+
+        //Update ApplicantAddresses records
+        await UpdateApplicantAddressRecords(oldApplicantId, dto.ApplicantId, dto.ApplicationId);
     }
 
+    private async Task UpdateApplicantAddressRecords(Guid oldApplicantId, Guid newApplicantId, Guid applicationId)
+    {
+        try
+        {
+            List<ApplicantAddress> applicantAddresses = await addressRepository.FindByApplicantIdAndApplicationIdAsync(oldApplicantId, applicationId);
+            await UpdateAddress(applicantAddresses, AddressType.MailingAddress, newApplicantId, applicationId);
+            await UpdateAddress(applicantAddresses, AddressType.PhysicalAddress, newApplicantId, applicationId);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error updating ApplicantAddress records for ApplicationId: {ApplicationId}", applicationId);
+            throw new UserFriendlyException("An error occurred while updating applicant address records.");
+        }
+    }
+
+    private async Task UpdateAddress(List<ApplicantAddress> applicantAddresses, AddressType applicantAddressType, Guid newApplicantId, Guid applicationId)
+    {
+        ApplicantAddress? dbAddress = applicantAddresses.Find(address => address.AddressType == applicantAddressType && address.ApplicationId == applicationId);
+
+        if (dbAddress != null)
+        {
+            dbAddress.ApplicantId = newApplicantId;
+            await addressRepository.UpdateAsync(dbAddress);
+        }
+    }
+
+
     [RemoteService(true)]
     public async Task SetDuplicatedAsync(SetApplicantDuplicateDto dto)
     {
@@ -435,24 +467,13 @@ private async Task UpdateApplicantAgentRecordsAsync(Guid oldApplicantId, Guid ne
         {
             var agentQueryable = await applicantAgentRepository.GetQueryableAsync();
 
-            // Detach old agent from application
-            var oldAgent = await agentQueryable
+            var agent = await agentQueryable
                 .FirstOrDefaultAsync(a => a.ApplicantId == oldApplicantId && a.ApplicationId == applicationId);
 
-            if (oldAgent != null)
-            {
-                oldAgent.ApplicationId = null;
-                await applicantAgentRepository.UpdateAsync(oldAgent);
-            }
-
-            // Attach new agent to application
-            var newAgent = await agentQueryable
-                .FirstOrDefaultAsync(a => a.ApplicantId == newApplicantId);
-
-            if (newAgent != null)
+            if (agent != null)
             {
-                newAgent.ApplicationId = applicationId;
-                await applicantAgentRepository.UpdateAsync(newAgent);
+                agent.ApplicantId = newApplicantId;
+                await applicantAgentRepository.UpdateAsync(agent);
             }
         }
         catch (Exception ex)

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs

@@ -11,7 +11,7 @@ namespace Unity.GrantManager.Applicants;
 
 public interface IApplicantAppService : IApplicationService
 {
-    Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intakeMap);
+    Task<Applicant> CreateOrRetrieveApplicantAsync(IntakeMapping intakeMap, Guid applicationId);
     Task<ApplicantAgent> CreateApplicantAgentAsync(ApplicantAgentDto applicantAgentDto);
     Task<Applicant> RelateSupplierToApplicant(ApplicantSupplierEto applicantSupplierEto);
     Task RelateDefaultSupplierAsync(ApplicantAgentDto applicantAgentDto);

applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormAppService.cs

@@ -9,6 +9,7 @@
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.Integration.Chefs;
 using Unity.GrantManager.Permissions;
+using Unity.Payments.Permissions;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
@@ -160,6 +161,7 @@ public async Task PatchOtherConfig(Guid id, OtherConfigDto config)
         await _applicationFormRepository.UpdateAsync(form);
     }
 
+    [Authorize(PaymentsPermissions.Payments.EditFormPaymentConfiguration)]
     public async Task SavePaymentConfiguration(FormPaymentConfigurationDto dto)
     {
         ApplicationForm appForm = await _applicationFormRepository.GetAsync(dto.ApplicationFormId);

applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationApplicantAppService.cs

@@ -180,14 +180,14 @@ public async Task<GrantApplicationDto> UpdatePartialApplicantInfoAsync(Guid appl
             && await AuthorizationService.IsGrantedAsync(UnitySelector.Applicant.Location.Update))
         {
             input.Data.PhysicalAddress.AddressType = AddressType.PhysicalAddress;
-            await CreateOrUpdateApplicantAddress(application.ApplicantId, input.Data.PhysicalAddress);
+            await CreateOrUpdateApplicantAddress(applicationId, application.ApplicantId, input.Data.PhysicalAddress);
         }
 
         if (input.Data.MailingAddress != null
             && await AuthorizationService.IsGrantedAsync(UnitySelector.Applicant.Location.Update))
         {
             input.Data.MailingAddress.AddressType = AddressType.MailingAddress;
-            await CreateOrUpdateApplicantAddress(application.ApplicantId, input.Data.MailingAddress);
+            await CreateOrUpdateApplicantAddress(applicationId, application.ApplicantId, input.Data.MailingAddress);
         }
 
         //-- APPLICANT INFO CUSTOM FIELDS
@@ -279,15 +279,16 @@ public async Task<GrantApplicationDto> UpdatePartialApplicantInfoAsync(Guid appl
     /// <param name="modifiedFields"></param>
     /// <returns></returns>
     [Authorize(UnitySelector.Applicant.Location.Update)]
-    protected internal async Task CreateOrUpdateApplicantAddress(Guid applicantId, UpdateApplicantAddressDto updatedAddress)
+    protected internal async Task CreateOrUpdateApplicantAddress(Guid applicationId, Guid applicantId, UpdateApplicantAddressDto updatedAddress)
     {
-        var applicantAddresses = await applicantAddressRepository.FindByApplicantIdAsync(applicantId);
+        var applicantAddresses = await applicantAddressRepository.FindByApplicantIdAndApplicationIdAsync(applicantId, applicationId);
 
         ApplicantAddress? dbAddress = applicantAddresses.FirstOrDefault(a => a.AddressType == updatedAddress.AddressType)
         ?? new ApplicantAddress
         {
             ApplicantId = applicantId,
             AddressType = updatedAddress.AddressType,
+            ApplicationId = applicationId,
         };
 
         ObjectMapper.Map<UpdateApplicantAddressDto, ApplicantAddress>(updatedAddress, dbAddress);

applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs

@@ -646,7 +646,7 @@ public async Task<GrantApplicationDto> UpdateProjectApplicantInfoAsync(Guid id,
             applicantAgent = await _applicantAgentRepository.UpdateAsync(applicantAgent);
         }
 
-        await UpdateApplicantAddresses(input);
+        await UpdateApplicantAddresses(application.Id, input);
 
         application.SigningAuthorityFullName = input.SigningAuthorityFullName ?? "";
         application.SigningAuthorityTitle = input.SigningAuthorityTitle ?? "";
@@ -669,6 +669,32 @@ public async Task<GrantApplicationDto> UpdateProjectApplicantInfoAsync(Guid id,
         return appDto;
     }
 
+    [Authorize(UnitySelector.Applicant.UpdatePolicy)]
+    public async Task UpdateMergedApplicantAsync(Guid applicationId, CreateUpdateApplicantInfoDto input)
+    {
+        var application = await _applicationRepository.GetAsync(applicationId);
+
+        var applicant = await _applicantRepository
+            .FirstOrDefaultAsync(a => a.Id == application.ApplicantId) ?? throw new EntityNotFoundException();
+
+        applicant.OrganizationType = input.OrganizationType ?? "";
+        applicant.OrgName = input.OrgName ?? "";
+        applicant.OrgNumber = input.OrgNumber ?? "";
+        applicant.OrgStatus = input.OrgStatus ?? "";
+        applicant.OrganizationSize = input.OrganizationSize ?? "";
+        applicant.Sector = input.Sector ?? "";
+        applicant.SubSector = input.SubSector ?? "";
+        applicant.SectorSubSectorIndustryDesc = input.SectorSubSectorIndustryDesc ?? "";
+        applicant.IndigenousOrgInd = input.IndigenousOrgInd ?? "";
+        applicant.UnityApplicantId = input.UnityApplicantId ?? "";
+        applicant.FiscalDay = input.FiscalDay;
+        applicant.FiscalMonth = input.FiscalMonth ?? "";
+        applicant.NonRegOrgName = input.NonRegOrgName ?? "";
+        applicant.ApplicantName = input.ApplicantName ?? "";
+
+        _ = await _applicantRepository.UpdateAsync(applicant);
+    }
+
     protected virtual async Task PublishCustomFieldUpdatesAsync(Guid applicationId,
         string uiAnchor,
         CustomDataFieldDto input)
@@ -695,19 +721,19 @@ await _localEventBus.PublishAsync(new PersistWorksheetIntanceValuesEto()
         }
     }
 
-    protected virtual async Task UpdateApplicantAddresses(CreateUpdateApplicantInfoDto input)
+    protected virtual async Task UpdateApplicantAddresses(Guid applicationId, CreateUpdateApplicantInfoDto input)
     {
-        List<ApplicantAddress> applicantAddresses = await _applicantAddressRepository.FindByApplicantIdAsync(input.ApplicantId);
+        List<ApplicantAddress> applicantAddresses = await _applicantAddressRepository.FindByApplicantIdAndApplicationIdAsync(input.ApplicantId, applicationId);
         if (applicantAddresses != null)
         {
-            await UpsertAddress(input, applicantAddresses, AddressType.MailingAddress, input.ApplicantId);
-            await UpsertAddress(input, applicantAddresses, AddressType.PhysicalAddress, input.ApplicantId);
+            await UpsertAddress(input, applicantAddresses, AddressType.MailingAddress, input.ApplicantId, applicationId);
+            await UpsertAddress(input, applicantAddresses, AddressType.PhysicalAddress, input.ApplicantId, applicationId);
         }
     }
 
-    protected virtual async Task UpsertAddress(CreateUpdateApplicantInfoDto input, List<ApplicantAddress> applicantAddresses, AddressType applicantAddressType, Guid applicantId)
+    protected virtual async Task UpsertAddress(CreateUpdateApplicantInfoDto input, List<ApplicantAddress> applicantAddresses, AddressType applicantAddressType, Guid applicantId, Guid applicationId)
     {
-        ApplicantAddress? dbAddress = applicantAddresses.Find(address => address.AddressType == applicantAddressType);
+        ApplicantAddress? dbAddress = applicantAddresses.Find(address => address.AddressType == applicantAddressType && address.ApplicationId == applicationId);
 
         if (dbAddress != null)
         {
@@ -716,7 +742,7 @@ protected virtual async Task UpsertAddress(CreateUpdateApplicantInfoDto input, L
         }
         else
         {
-            var newAddress = new ApplicantAddress() { AddressType = applicantAddressType, ApplicantId = applicantId };
+            var newAddress = new ApplicantAddress() { AddressType = applicantAddressType, ApplicantId = applicantId, ApplicationId = applicationId };
             MapApplicantAddress(input, applicantAddressType, newAddress);
             await _applicantAddressRepository.InsertAsync(newAddress);
         }

applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/IntakeFormSubmissionManager.cs

@@ -98,14 +98,12 @@ await localEventBus.PublishAsync(new ApplicationProcessEvent
 
         private async Task<Application> CreateNewApplicationAsync(IntakeMapping intakeMap,
             ApplicationForm applicationForm)
-        {
-            var applicant = await applicantService.CreateOrRetrieveApplicantAsync(intakeMap);
+        {            
             var submittedStatus = await _applicationStatusRepository.FirstAsync(s => s.StatusCode.Equals(GrantApplicationState.SUBMITTED));
             var application = await _applicationRepository.InsertAsync(
                 new Application
                 {
-                    ProjectName = MappingUtil.ResolveAndTruncateField(255, string.Empty, intakeMap.ProjectName),
-                    ApplicantId = applicant.Id,
+                    ProjectName = MappingUtil.ResolveAndTruncateField(255, string.Empty, intakeMap.ProjectName),                    
                     ApplicationFormId = applicationForm.Id,
                     ApplicationStatusId = submittedStatus.Id,                    
                     ReferenceNo = intakeMap.ConfirmationId ?? string.Empty,
@@ -134,6 +132,13 @@ private async Task<Application> CreateNewApplicationAsync(IntakeMapping intakeMa
                 }
             );
 
+            var applicant = await applicantService.CreateOrRetrieveApplicantAsync(intakeMap, application.Id);
+            if (applicant != null)
+            {
+                application.ApplicantId = applicant.Id;
+                application = await _applicationRepository.UpdateAsync(application);
+            }            
+
             ApplicantAgentDto applicantAgentDto = new()
             {
                 Applicant = applicant,

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicantAddress.cs

@@ -10,7 +10,7 @@ namespace Unity.GrantManager.Applications;
 public class ApplicantAddress : AuditedAggregateRoot<Guid>, IMultiTenant
 {
     public Guid? ApplicantId { get; set; }
-
+    
     [JsonIgnore]
     public virtual Applicant Applicant
     {
@@ -20,6 +20,17 @@ public virtual Applicant Applicant
     }
     private Applicant? _applicant;
 
+    public Guid? ApplicationId { get; set; }
+
+    [JsonIgnore]
+    public virtual Application Application
+    {
+        set => _application = value;
+        get => _application
+               ?? throw new InvalidOperationException("Uninitialized property: " + nameof(Application));
+    }
+    private Application? _application;
+
     public string? City { get; set; } = string.Empty;
     public string? Country { get; set; } = string.Empty;
     public string? Province { get; set; } = string.Empty;

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/Application.cs

@@ -131,6 +131,7 @@ public virtual ApplicationStatus ApplicationStatus
     public string? ContractNumber { get; set; }
     public DateTime? ContractExecutionDate { get; set; }
     public string? RiskRanking { get; set; }
+    public virtual Collection<ApplicantAddress>? ApplicantAddresses { get; set; }
 
     public bool IsInFinalDecisionState()
     {