Add cheque and entry mode details to payments
This commit is contained in:
@@ -12,7 +12,8 @@ public class PaymentService(
|
||||
ICurrentUserService currentUser)
|
||||
{
|
||||
private static PaymentResponse ToResponse(Models.Payment p) =>
|
||||
new(p.Id, p.FK_InvoiceId, p.Amount, p.Method, p.CollectedAt, p.CollectedBy, p.CreatedAt);
|
||||
new(p.Id, p.FK_InvoiceId, p.Amount, p.Method, p.EntryMode, p.ChequeNumber, p.ChequeDate,
|
||||
p.CollectedAt, p.CollectedBy, p.RecordedBy, p.CreatedAt);
|
||||
|
||||
public async Task<List<PaymentResponse>?> GetByInvoiceIdAsync(Guid invoiceId)
|
||||
{
|
||||
@@ -30,16 +31,28 @@ public class PaymentService(
|
||||
if (invoice.Status == InvoiceStatus.Finalized)
|
||||
throw new InvalidOperationException("Cannot record a payment against a finalized invoice");
|
||||
|
||||
var userId = currentUser.UserId ?? request.CollectedByUserId
|
||||
if (request.Method == PaymentMethod.Cheque &&
|
||||
(string.IsNullOrWhiteSpace(request.ChequeNumber) || request.ChequeDate is null))
|
||||
throw new InvalidOperationException("ChequeNumber and ChequeDate are required when Method is Cheque");
|
||||
|
||||
var recorderId = currentUser.UserId ?? request.CollectedByUserId
|
||||
?? throw new InvalidOperationException("CollectedByUserId is required while auth is unavailable");
|
||||
var collectedBy = request.CollectedByUserId ?? recorderId;
|
||||
var recordedBy = request.EntryMode == EntryMode.DayEndManual && collectedBy != recorderId
|
||||
? recorderId
|
||||
: (Guid?)null;
|
||||
|
||||
var payment = new Models.Payment
|
||||
{
|
||||
FK_InvoiceId = invoiceId,
|
||||
Amount = request.Amount,
|
||||
Method = request.Method,
|
||||
EntryMode = request.EntryMode,
|
||||
ChequeNumber = request.Method == PaymentMethod.Cheque ? request.ChequeNumber : null,
|
||||
ChequeDate = request.Method == PaymentMethod.Cheque ? request.ChequeDate : null,
|
||||
CollectedAt = DateTime.Now,
|
||||
CollectedBy = userId
|
||||
CollectedBy = collectedBy,
|
||||
RecordedBy = recordedBy
|
||||
};
|
||||
|
||||
await uow.BeginAsync(ct);
|
||||
|
||||
Reference in New Issue
Block a user