See REVISIONS.md for details

CIS Guru · CIS Guru · commit 47b359f87c75 · 2025-12-28T20:29:13.000-06:00
diff --git a/Aquiis.SimpleStart.Tests/PaymentServiceTests.cs b/Aquiis.SimpleStart.Tests/PaymentServiceTests.cs
@@ -576,7 +576,7 @@ public async Task DeleteAsync_UpdatesInvoiceStatus()
                 InvoiceId = _testInvoiceId,
                 Amount = 1500,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Check",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Check,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -606,7 +606,7 @@ public async Task CalculateTotalPaymentsAsync_ReturnsCorrectTotal()
                 InvoiceId = _testInvoiceId,
                 Amount = 500,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Check",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Check,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -618,7 +618,7 @@ public async Task CalculateTotalPaymentsAsync_ReturnsCorrectTotal()
                 InvoiceId = _testInvoiceId,
                 Amount = 750,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Cash",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Cash,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -641,7 +641,7 @@ public async Task CalculateTotalPaymentsAsync_WithDateRange_ReturnsFilteredTotal
                 InvoiceId = _testInvoiceId,
                 Amount = 500,
                 PaidOn = DateTime.Today.AddMonths(-2),
-                PaymentMethod = "Check",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Check,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -653,7 +653,7 @@ public async Task CalculateTotalPaymentsAsync_WithDateRange_ReturnsFilteredTotal
                 InvoiceId = _testInvoiceId,
                 Amount = 750,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Cash",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Cash,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -690,7 +690,7 @@ public async Task GetPaymentSummaryByMethodAsync_ReturnsCorrectSummary()
                 InvoiceId = _testInvoiceId,
                 Amount = 300,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Check",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Check,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -702,7 +702,7 @@ public async Task GetPaymentSummaryByMethodAsync_ReturnsCorrectSummary()
                 InvoiceId = _testInvoiceId,
                 Amount = 700,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Cash",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Cash,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -727,7 +727,7 @@ public async Task GetTotalPaidForInvoiceAsync_ReturnsCorrectTotal()
                 InvoiceId = _testInvoiceId,
                 Amount = 500,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Check",
+                PaymentMethod = ApplicationConstants.PaymentMethods.OnlinePayment,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
@@ -739,7 +739,7 @@ public async Task GetTotalPaidForInvoiceAsync_ReturnsCorrectTotal()
                 InvoiceId = _testInvoiceId,
                 Amount = 750,
                 PaidOn = DateTime.Today,
-                PaymentMethod = "Cash",
+                PaymentMethod = ApplicationConstants.PaymentMethods.Cash,
                 CreatedBy = _testUserId,
                 CreatedOn = DateTime.UtcNow
             };
diff --git a/Aquiis.SimpleStart/Application/Services/PaymentService.cs b/Aquiis.SimpleStart/Application/Services/PaymentService.cs
@@ -362,34 +362,34 @@ private async Task UpdateInvoiceAfterPaymentChangeAsync(Guid invoiceId)
                     // Update invoice status based on payment
                     if (totalPaid >= totalDue)
                     {
-                        invoice.Status = "Paid";
+                        invoice.Status = ApplicationConstants.InvoiceStatuses.Paid;
                         invoice.PaidOn = invoice.Payments
                             .Where(p => !p.IsDeleted)
                             .OrderByDescending(p => p.PaidOn)
                             .FirstOrDefault()?.PaidOn ?? DateTime.UtcNow;
                     }
-                    else if (totalPaid > 0 && invoice.Status != "Cancelled")
+                    else if (totalPaid > 0 && invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled)
                     {
                         // Invoice is partially paid
                         if (invoice.DueOn < DateTime.Today)
                         {
-                            invoice.Status = "Overdue";
+                            invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;
                         }
                         else
                         {
-                            invoice.Status = "Pending";
+                            invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;
                         }
                     }
-                    else if (invoice.Status != "Cancelled")
+                    else if (invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled)
                     {
                         // No payments
                         if (invoice.DueOn < DateTime.Today)
                         {
-                            invoice.Status = "Overdue";
+                            invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;
                         }
                         else
                         {
-                            invoice.Status = "Pending";
+                            invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;
                         }
                     }
 
diff --git a/Aquiis.SimpleStart/Core/Constants/ApplicationConstants.cs b/Aquiis.SimpleStart/Core/Constants/ApplicationConstants.cs
@@ -152,6 +152,8 @@ public static class PaymentMethods
             public const string CreditCard = "Credit Card";
             public const string BankTransfer = "Bank Transfer";
             public const string CryptoCurrency = "Crypto Currency";
+            public const string Cash = "Cash";
+            public const string Check = "Check";
             public const string Other = "Other";
 
             public static IReadOnlyList<string> AllPaymentMethods { get; } = new List<string>
@@ -161,6 +163,8 @@ public static class PaymentMethods
                 CreditCard,
                 BankTransfer,
                 CryptoCurrency,
+                Cash,
+                Check,
                 Other
             };
         }

Original file line number	Diff line number	Diff line change
`@@ -362,34 +362,34 @@ private async Task UpdateInvoiceAfterPaymentChangeAsync(Guid invoiceId)`
`362`	`362`	`// Update invoice status based on payment`
`363`	`363`	`if (totalPaid >= totalDue)`
`364`	`364`	`{`
`365`		`- invoice.Status = "Paid";`
	`365`	`+ invoice.Status = ApplicationConstants.InvoiceStatuses.Paid;`
`366`	`366`	`invoice.PaidOn = invoice.Payments`
`367`	`367`	`.Where(p => !p.IsDeleted)`
`368`	`368`	`.OrderByDescending(p => p.PaidOn)`
`369`	`369`	`.FirstOrDefault()?.PaidOn ?? DateTime.UtcNow;`
`370`	`370`	`}`
`371`		`- else if (totalPaid > 0 && invoice.Status != "Cancelled")`
	`371`	`+ else if (totalPaid > 0 && invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled)`
`372`	`372`	`{`
`373`	`373`	`// Invoice is partially paid`
`374`	`374`	`if (invoice.DueOn < DateTime.Today)`
`375`	`375`	`{`
`376`		`- invoice.Status = "Overdue";`
	`376`	`+ invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;`
`377`	`377`	`}`
`378`	`378`	`else`
`379`	`379`	`{`
`380`		`- invoice.Status = "Pending";`
	`380`	`+ invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;`
`381`	`381`	`}`
`382`	`382`	`}`
`383`		`- else if (invoice.Status != "Cancelled")`
	`383`	`+ else if (invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled)`
`384`	`384`	`{`
`385`	`385`	`// No payments`
`386`	`386`	`if (invoice.DueOn < DateTime.Today)`
`387`	`387`	`{`
`388`		`- invoice.Status = "Overdue";`
	`388`	`+ invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;`
`389`	`389`	`}`
`390`	`390`	`else`
`391`	`391`	`{`
`392`		`- invoice.Status = "Pending";`
	`392`	`+ invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`