From caecdeec3c3711bd46c1aed8eae17a729beb4124 Mon Sep 17 00:00:00 2001
From: Sam Saravillo <7529759+samsaravillo@users.noreply.github.com>
Date: Tue, 5 Aug 2025 16:32:05 -0700
Subject: [PATCH 1/3] bugfix/AB#29715 Payment request update note

- Add Note to payment status update UpdatePaymentStatusRequestDto that allows additional information to be passed when updating payment request
---
 .../PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs
index e144c8188..fc55717f5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentApprovals/UpdatePaymentRequestStatus.cshtml.cs
+++ b/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();
 

From c3f5ad5b99a89d2a9381ac4b0f7041135e72ab5b Mon Sep 17 00:00:00 2001
From: Sam Saravillo <7529759+samsaravillo@users.noreply.github.com>
Date: Tue, 5 Aug 2025 17:12:51 -0700
Subject: [PATCH 2/3] bugfix/AB#29715 Append note to payment if existing note
 is present

- New note is appended to the existing note if both are non-empty, separated by a semicolon. This prevents overwriting existing notes and ensures all relevant information is retained.
---
 .../PaymentRequests/PaymentRequestAppService.cs      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
index c615ebc00..b54839aa6 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/PaymentRequestAppService.cs
+++ b/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);
 

From 1b49abd512472ce6a613da1d77044ad754f9dfa5 Mon Sep 17 00:00:00 2001
From: jpasta <james.p.pasta@gmail.com>
Date: Tue, 5 Aug 2025 18:09:09 -0700
Subject: [PATCH 3/3] bugfix/AB#29722-FixApiCAS

---
 .../Integrations/Cas/InvoiceService.cs                         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
index 041fdce67..1eb47ec87 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
+++ b/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");