Dev

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs

@@ -54,7 +54,8 @@ public class InvoiceService(
             if (site != null && site.Supplier != null && site.Supplier.Number != null && accountDistributionCode != null)
             {
                 // This can not be UTC Now it is sent to cas and can not be in the future - this is not being stored in Unity as a date
-                var localDateTime = DateTime.UtcNow.ToLocalTime();
+                var vancouverTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time");
+                var localDateTime = TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, vancouverTimeZone);
                 var currentMonth = localDateTime.ToString("MMM").Trim('.');
                 var currentDay = localDateTime.ToString("dd");
                 var currentYear = localDateTime.ToString("yyyy");

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

@@ -199,7 +199,17 @@ public virtual async Task<List<PaymentRequestDto>> UpdateStatusAsync(List<Update
                 try
                 {
                     var payment = await paymentRequestsRepository.GetAsync(dto.PaymentRequestId);
-                    payment.SetNote(dto.Note);
+                    if (payment == null)
+                        continue;
+
+                    if (!string.IsNullOrWhiteSpace(payment.Note) && !string.IsNullOrWhiteSpace(dto.Note))
+                    {
+                        payment.SetNote($"{payment.Note}; {dto.Note}");
+                    }
+                    else
+                    {
+                        payment.SetNote(dto.Note);
+                    }
 
                     var triggerAction = await DetermineTriggerActionAsync(dto, payment);
 

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs

@@ -222,7 +222,8 @@ public async Task<IActionResult> OnPostAsync()
             .Select(payment => new UpdatePaymentStatusRequestDto
             {
                 PaymentRequestId = payment.Id,
-                IsApprove = IsApproval
+                IsApprove = IsApproval,
+                Note = Note ?? String.Empty
             })
             .ToList();