Dev

applications/Unity.GrantManager/.env.example

@@ -41,7 +41,7 @@ AuthServer__Realm="standard" #"unity-local"
 AuthServer__RequireHttpsMetadata="false"
 AuthServer__Audience="unity-4899" #"unity-web"
 AuthServer__ClientId="unity-4899" #"unity-web"
-AuthServer__ClientSecret="="********""
+AuthServer__ClientSecret="********"
 AuthServer__IsBehindTlsTerminationProxy="false"
 AuthServer__SpecifyOidcParameters="true"
 AuthServer__OidcSignin="http://localhost:44342/signin-oidc"

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.css

@@ -19,8 +19,3 @@
 #IdentityRolesWrapper {
     background-color: transparent;
 }
-
-#IdentityRolesWrapper .dt-scroll-body {
-    max-height: calc(100vh - 370px);
-    overflow-y: scroll;
-}

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js

@@ -168,7 +168,8 @@ $(function () {
         dataTableName: 'IdentityRolesTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         useNullPlaceholder: true,
-        externalSearchId: 'search-roles'
+        externalSearchId: 'search-roles',
+        fixedHeaders: true
     });
 
     _createModal.onResult(function () {

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.css

@@ -28,8 +28,3 @@
 #UsersWrapper {
     background-color: transparent;
 }
-
-#UsersWrapper .dt-scroll-body {
-    max-height: calc(100vh - 370px);
-    overflow-y: scroll;
-}

applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js

@@ -266,7 +266,8 @@ $(function () {
         dataTableName: 'UsersTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         useNullPlaceholder: true,
-        externalSearchId: 'search-users'
+        externalSearchId: 'search-users',
+        fixedHeaders: true
     });
 
     _editModal.onResult(function () {

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application/EmailNotificaions/EmailNotificationManager.cs

@@ -117,7 +117,9 @@ public async Task<HttpResponseMessage> SendEmailAsync(string emailTo, string bod
                 }
 
                 // Send the email using the CHES client service
-                var emailObject = await GetEmailObjectAsync(emailTo, body, subject, emailFrom, emailBodyType, emailTemplateName, emailCC, emailBCC);
+                var emailObject = await GetEmailObjectAsync(
+                    emailTo, body, subject, emailFrom, emailBodyType, emailTemplateName, emailCC, emailBCC, excludeTemplate: true);
+
                 var response = await chesClientService.SendAsync(emailObject);
 
                 // Assuming SendAsync returns a HttpResponseMessage or equivalent:
@@ -222,7 +224,8 @@ public async Task<dynamic> BuildEmailObjectWithAttachmentsAsync(EmailLog emailLo
                 emailLog.BodyType,
                 emailLog.TemplateName,
                 emailLog.CC,
-                emailLog.BCC);
+                emailLog.BCC,
+                excludeTemplate: true);
 
             // Retrieve attachments from S3
             var attachments = await emailAttachmentService.GetAttachmentsAsync(emailLog.Id);
@@ -261,7 +264,8 @@ protected virtual async Task<dynamic> GetEmailObjectAsync(
                                                     string? emailBodyType,
                                                     string? emailTemplateName,
                                                     string? emailCC = null,
-                                                    string? emailBCC = null)
+                                                    string? emailBCC = null,
+                                                    bool excludeTemplate = false)
         {
             var toList = emailTo.ParseEmailList() ?? [];
             var ccList = emailCC.ParseEmailList();
@@ -274,28 +278,47 @@ protected virtual async Task<dynamic> GetEmailObjectAsync(
 
             emailObjectDictionary["body"] = body;
             emailObjectDictionary["bodyType"] = emailBodyType ?? "text";
-            emailObjectDictionary["cc"] = ccList;
-            emailObjectDictionary["bcc"] = bccList;
             emailObjectDictionary["encoding"] = "utf-8";
             emailObjectDictionary["from"] = emailFrom ?? defaultFromAddress ?? "NoReply@gov.bc.ca";
             emailObjectDictionary["priority"] = "normal";
             emailObjectDictionary["subject"] = subject;
             emailObjectDictionary["tag"] = "tag";
             emailObjectDictionary["to"] = toList;
-            emailObjectDictionary["templateName"] = emailTemplateName;
+
+            // Only include cc/bcc when provided CHES API expects arrays, not null.
+            if (ccList != null)
+            {
+                emailObjectDictionary["cc"] = ccList;
+            }
+            if (bccList != null)
+            {
+                emailObjectDictionary["bcc"] = bccList;
+            }
+
+            // templateName is not part of the CHES MessageObject schema
+            // store it on the EmailLog but don't send it to the API.
+            if (!excludeTemplate)
+            {
+                emailObjectDictionary["templateName"] = emailTemplateName;
+            }
 
             return emailObject;
         }
 
         protected virtual EmailLog UpdateMappedEmailLog(EmailLog emailLog, dynamic emailDynamicObject)
         {
+            var dict = (IDictionary<string, object?>)emailDynamicObject;
             emailLog.Body = emailDynamicObject.body;
             emailLog.Subject = emailDynamicObject.subject;
             emailLog.BodyType = emailDynamicObject.bodyType;
             emailLog.FromAddress = emailDynamicObject.from;
             emailLog.ToAddress = string.Join(",", emailDynamicObject.to);
-            emailLog.CC = emailDynamicObject.cc != null ? string.Join(",", (IEnumerable<string>)emailDynamicObject.cc) : string.Empty;
-            emailLog.BCC = emailDynamicObject.bcc != null ? string.Join(",", (IEnumerable<string>)emailDynamicObject.bcc) : string.Empty;
+            emailLog.CC = dict.TryGetValue("cc", out var cc) && cc is IEnumerable<string> ccList
+                ? string.Join(",", ccList)
+                : string.Empty;
+            emailLog.BCC = dict.TryGetValue("bcc", out var bcc) && bcc is IEnumerable<string> bccList
+                ? string.Join(",", bccList)
+                : string.Empty;
             emailLog.TemplateName = emailDynamicObject.templateName;
             return emailLog;
         }

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/Codes/CasPaymentRequestStatus.cs

@@ -4,6 +4,7 @@ public static class CasPaymentRequestStatus
     {
         // Unity Status
         public const string SentToCas = "SentToCas";
+        public const string SentToAccountsPayable = "SentToAccountsPayable";
 
         // CAS INVOICE STATUS
         public const string ErrorFromCas = "Error";

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentsManager.cs

@@ -9,6 +9,7 @@
 using Unity.Payments.Domain.Shared;
 using Unity.Payments.Domain.Workflow;
 using Unity.Payments.Enums;
+using Unity.Payments.Codes;
 using Unity.Payments.PaymentRequests;
 using Unity.Payments.Permissions;
 using Volo.Abp.Authorization.Permissions;
@@ -150,6 +151,7 @@ public async Task<PaymentRequest> TriggerAction(Guid paymentRequestsId, PaymentA
                 if (preventPayment)
                 {
                     statusChangedTo = PaymentRequestStatus.FSB;
+                    paymentRequest.SetInvoiceStatus(CasPaymentRequestStatus.SentToAccountsPayable);
                 }
                 else
                 {

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/EntityFrameworkCore/Repositories/PaymentRequestRepository.cs

@@ -22,6 +22,8 @@ public PaymentRequestRepository(IDbContextProvider<PaymentsDbContext> dbContextP
         {
             ReCheckStatusList.Add(CasPaymentRequestStatus.ServiceUnavailable);
             ReCheckStatusList.Add(CasPaymentRequestStatus.SentToCas);
+            ReCheckStatusList.Add(CasPaymentRequestStatus.NotFound);
+            ReCheckStatusList.Add(CasPaymentRequestStatus.SentToAccountsPayable);
             ReCheckStatusList.Add(CasPaymentRequestStatus.NeverValidated);
 
             FailedStatusList.Add(CasPaymentRequestStatus.ServiceUnavailable);

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/CasPaymentRequestCoordinator.cs

@@ -1,14 +1,15 @@
 using System.Threading.Tasks;
 using Unity.Payments.Domain.PaymentRequests;
 using System;
+using System.Linq;
 using Volo.Abp.Application.Services;
 using System.Collections.Generic;
 using Volo.Abp.TenantManagement;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Uow;
 using Microsoft.Extensions.Logging;
 using Unity.Payments.Integrations.Cas;
-using System.Linq;
+using Unity.Payments.Codes;
 using Unity.Payments.RabbitMQ.QueueMessages;
 using Unity.Notifications.Integrations.RabbitMQ;
 
@@ -138,6 +139,11 @@ public async Task AddPaymentRequestsToReconciliationQueue()
                         paymentReqeust = await _paymentRequestsRepository.GetAsync(PaymentRequestId);
                         if (paymentReqeust != null)
                         {
+                            if(paymentReqeust.InvoiceStatus == CasPaymentRequestStatus.NotFound && result.InvoiceStatus == CasPaymentRequestStatus.NotFound)
+                            {
+                                result.InvoiceStatus = CasPaymentRequestStatus.NotFound+"2";
+                            }
+
                             paymentReqeust.SetInvoiceStatus(result.InvoiceStatus ?? "");
                             paymentReqeust.SetPaymentStatus(result.PaymentStatus ?? "");
                             paymentReqeust.SetPaymentDate(result.PaymentDate ?? "");

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/CreatePaymentRequests.cshtml

@@ -80,7 +80,7 @@
                             </abp-column>
                         </abp-row>
                     @if (canOverride)
-                    {
+                    { 
                         <abp-row class="m-0 p-1">
                             <abp-column size="_8">
                                 <label for="AccountCodingSelect" class="form-label unt-form-label-primary">@L["ApplicationPaymentRequest:AccountCodingOverride"]</label>
@@ -182,10 +182,13 @@
                                     <abp-input asp-for="@Model.ApplicationPaymentRequestForm[i].InvoiceNumber" disabled="@item.DisableFields"/>
                                 </abp-column>
                                 <abp-column size="_2" class="px-1">
-                                    <abp-input asp-for="@Model.ApplicationPaymentRequestForm[i].Amount"
-                                            class="amount unity-currency-input"
+                                    <div class="unity-input-group">
+                                            <span class="unity-input-prepend">$</span>
+                                            <abp-input asp-for="@Model.ApplicationPaymentRequestForm[i].Amount"
+                                               class="unity-currency-input amount"
                                                disabled="@item.DisableFields"
                                                onchange='checkMaxValueRequest("@item.CorrelationId",this, @item.RemainingAmount)' />
+                                    </div>
                                 </abp-column>
                                 <abp-column size="_4" class="px-1">
                                     <abp-input asp-for="@Model.ApplicationPaymentRequestForm[i].SiteName" alt="@item.SiteName" disabled="true"/>
@@ -256,3 +259,20 @@
     </abp-modal>
 </form>
 
+<script defer>
+    (function () {
+        if (window.jQuery) {
+            $('.unity-currency-input').maskMoney();
+
+            // Format existing values from server fields
+            $('.unity-currency-input').each(function () {
+                let $currencyField = $(this);
+                let fieldVal = $currencyField.val();
+                if (fieldVal) {
+                    $currencyField.maskMoney('mask', fieldVal);
+                }
+            });
+        }
+    })();
+</script>
+

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/CreatePaymentRequestsModal.js

@@ -263,7 +263,6 @@ function validateParentChildAmounts(correlationId) {
 }
 
 $(function () {
-    $('.unity-currency-input').maskMoney();
     // Validate payment amounts on initial page load
     validateAllPaymentAmounts();
 });

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js

@@ -164,7 +164,8 @@ $(function () {
         languageSetValues: {},
         dataTableName: 'PaymentRequestListTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
-        useNullPlaceholder: true
+        useNullPlaceholder: true,
+        fixedHeaders: true
     });
 
     // Attach the draw event to add custom row coloring logic
@@ -186,10 +187,16 @@ $(function () {
 
     payment_approve_buttons.disable();
     payment_check_status_buttons.disable();
+    history_button.disable();
     dataTable.on('search.dt', () => handleSearch());
 
-    function checkAllRowsHaveState(state) {
-        return dataTable.rows('.selected').data().toArray().every(row => row.status === state);
+    function checkAllRowsHaveState(states) {
+        const allowedStates = Array.isArray(states) ? states : [states];
+        return dataTable
+            .rows('.selected')
+            .data()
+            .toArray()
+            .every(row => allowedStates.includes(row.status));
     }
 
     $('#PaymentRequestListTable').on('click', 'tr td', function (e) {
@@ -256,13 +263,13 @@ $(function () {
     }
 
     function checkActionButtons() {
-        let isOnlySubmittedToCas = checkAllRowsHaveState('Submitted');
-        if (isOnlySubmittedToCas) {
+        let isInSentState = checkAllRowsHaveState(['Submitted', 'FSB']);
+        if (isInSentState) {
             payment_check_status_buttons.enable();
         } else {
             payment_check_status_buttons.disable();
         }
-        if (dataTable.rows({ selected: true }).indexes().length > 0 && !isOnlySubmittedToCas) {
+        if (dataTable.rows({ selected: true }).indexes().length > 0 && !isInSentState) {
             if (abp.auth.isGranted('PaymentsPermissions.Payments.L1ApproveOrDecline')
                 || abp.auth.isGranted('PaymentsPermissions.Payments.L2ApproveOrDecline')
                 || abp.auth.isGranted('PaymentsPermissions.Payments.L3ApproveOrDecline')) {
@@ -272,15 +279,11 @@ $(function () {
                 payment_approve_buttons.disable();
             }
 
-            if (dataTable.rows({ selected: true }).indexes().length == 1) {
-                history_button.enable();
-            } else {
-                history_button.disable();
-            }
+            checkEnableHistoryButton(dataTable, history_button);
         }
         else {
             payment_approve_buttons.disable();
-            history_button.enable();
+            checkEnableHistoryButton(dataTable, history_button);
         }
     }
 
@@ -792,6 +795,14 @@ let casPaymentResponseModal = new abp.ModalManager({
     viewUrl: '../PaymentRequests/CasPaymentRequestResponse'
 });
 
+function checkEnableHistoryButton(dataTable, history_button) {
+    if (dataTable.rows({ selected: true }).indexes().length == 1) {
+        history_button.enable();
+    } else {
+        history_button.disable();
+    }
+}
+
 function openCasResponseModal(casResponse) {
     casPaymentResponseModal.open({
         casResponse: casResponse

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js

@@ -215,6 +215,7 @@
         dataTableName: 'ApplicationPaymentRequestListTable',
         externalSearchId: 'PaymentListSearch',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
+        lengthMenu: [10, 25, 50, -1]
     });
 
     dataTable.on('search.dt', () => handleSearch());

applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.js

@@ -88,7 +88,8 @@
         dataTableName: 'EndpointsTable',
         dynamicButtonContainerId: 'dynamicButtonContainerId',
         useNullPlaceholder: true,
-        externalSearchId: 'search-endpoints'
+        externalSearchId: 'search-endpoints',
+        fixedHeaders: true
     });
 
     createModal.onResult(function () {

applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Bundling/UnityThemeUX2GlobalScriptContributor.cs

@@ -47,6 +47,7 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         context.Files.AddIfNotContains("/themes/ux2/zone-extensions.js");
         context.Files.Add("/themes/ux2/layout.js");
         context.Files.Add("/themes/ux2/plugins/filterRow.js");
+        context.Files.Add("/themes/ux2/plugins/scrollResize.js");
         context.Files.Add("/themes/ux2/plugins/colvisAlpha.js");
         context.Files.Add("/themes/ux2/table-utils.js");
         context.Files.Add("/js/DateUtils.js");