Skip to content

Dev #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesPasta merged 2 commits into from
Aug 5, 2025
Merged

Dev #1569

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
640bdff
bugfix/AB#29722-FixApiCAS
jimmyPasta Aug 5, 2025
f9cfeae
Merge pull request #1568 from bcgov/bugfix/AB#29722-FixApiCas
JamesPasta Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions .../modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,27 @@
using Microsoft.Extensions.Logging;
using Volo.Abp.Uow;
using Unity.Modules.Shared.Http;
using Unity.Payments.PaymentConfigurations;
using Unity.Payments.Domain.AccountCodings;

namespace Unity.Payments.Integrations.Cas
{

[IntegrationService]
[ExposeServices(typeof(InvoiceService), typeof(IInvoiceService))]
public class InvoiceService(ICasTokenService iTokenService,
IPaymentRequestRepository paymentRequestRepository,
IResilientHttpRequest resilientHttpRequest,
IOptions<CasClientOptions> casClientOptions,
ISupplierRepository iSupplierRepository,
ISiteRepository iSiteRepository,
IUnitOfWorkManager unitOfWorkManager) : ApplicationService, IInvoiceService
#pragma warning disable S107 // Methods should not have too many parameters
public class InvoiceService(
ICasTokenService iTokenService,
IAccountCodingRepository accountCodingRepository,
PaymentConfigurationAppService paymentConfigurationAppService,
IPaymentRequestRepository paymentRequestRepository,
IResilientHttpRequest resilientHttpRequest,
IOptions<CasClientOptions> casClientOptions,
ISupplierRepository iSupplierRepository,
ISiteRepository iSiteRepository,
IUnitOfWorkManager unitOfWorkManager) : ApplicationService, IInvoiceService
#pragma warning restore S107 // Methods should not have too many parameters
{


private const string CFS_APINVOICE = "cfs/apinvoice";

private readonly Dictionary<int, string> CASPaymentGroup = new()
Expand All @@ -39,7 +45,6 @@ public class InvoiceService(ICasTokenService iTokenService,
[(int)PaymentGroup.Cheque] = "GEN CHQ"
};


protected virtual async Task<Invoice?> InitializeCASInvoice(PaymentRequest paymentRequest,
string? accountDistributionCode)
{
Expand Down Expand Up @@ -101,12 +106,13 @@ public class InvoiceService(ICasTokenService iTokenService,
throw new UserFriendlyException("CreateInvoiceByPaymentRequestAsync: Payment Request not found");
}

// Based on the payment request application id in the correlation id
// lookup the form id
// on the form is there an acount distribution code?
// If no account distribution code then we can use the default account distribution code from payment configuration default account distribution code id

string? accountDistributionCode = "";// this will be on the payment request
if (!paymentRequest.AccountCodingId.HasValue)
{
throw new UserFriendlyException("CreateInvoiceByPaymentRequestAsync: Account Coding - Payment Request - not found");
}

AccountCoding accountCoding = await accountCodingRepository.GetAsync(paymentRequest.AccountCodingId.Value);
string accountDistributionCode = await paymentConfigurationAppService.GetAccountDistributionCode(accountCoding);// this will be on the payment request

if (!string.IsNullOrEmpty(accountDistributionCode))
{
Expand Down