Add customer and pricing details to invoices

kelvink96 · kelvink96 · commit 922d1dd364a8 · 2025-05-25T14:13:13.000+03:00
This commit expands the invoice model to include customer details (name, email, phone, address) and pricing fields (subtotal, tax rate/amount, discount, payment terms). It makes the `OrderId` field optional, supports mapping invoice items, and improves validation for invoice item creation. Updates include database schema changes, DTO adjustments, and service logic enhancements.
diff --git a/Controllers/InvoiceController.cs b/Controllers/InvoiceController.cs
@@ -69,10 +69,23 @@ public async Task<ActionResult> CreateInvoice(CreateInvoiceDto createInvoiceDto)
             IssueDate = createInvoiceDto.IssueDate,
             DueDate = createInvoiceDto.DueDate,
             Notes = createInvoiceDto.Notes,
-            OrderId = createInvoiceDto.OrderId,
+            // Only set OrderId if it's not empty/null
+            OrderId = createInvoiceDto.OrderId == Guid.Empty ? null : createInvoiceDto.OrderId,
             UserId = createInvoiceDto.UserId,
             Status = createInvoiceDto.Status,
             PaidAmount = createInvoiceDto.PaidAmount,
+            // Add the new fields from your payload
+            CustomerName = createInvoiceDto.CustomerName,
+            CustomerEmail = createInvoiceDto.CustomerEmail,
+            CustomerPhone = createInvoiceDto.CustomerPhone,
+            CustomerAddress = createInvoiceDto.CustomerAddress,
+            BillingAddress = createInvoiceDto.BillingAddress,
+            TaxRate = createInvoiceDto.TaxRate,
+            DiscountAmount = createInvoiceDto.DiscountAmount,
+            PaymentTerms = createInvoiceDto.PaymentTerms,
+            Subtotal = createInvoiceDto.Subtotal,
+            TaxAmount = createInvoiceDto.TaxAmount,
+            TotalAmount = createInvoiceDto.TotalAmount,
             Created = DateTime.UtcNow,
             Modified = DateTime.UtcNow,
             CreatedById = createInvoiceDto.CreatedById,
diff --git a/Data/ApplicationDbContext.cs b/Data/ApplicationDbContext.cs
@@ -30,5 +30,12 @@ protected override void OnModelCreating(ModelBuilder builder)
             entity.HasIndex(e => e.TokenId).IsUnique();
             entity.HasIndex(e => e.ExpiryDate); // For efficient cleanup queries
         });
+        
+        // Configure an Invoice-Order relationship as optional
+        builder.Entity<Invoice>()
+            .HasOne(i => i.Order)
+            .WithMany()
+            .HasForeignKey(i => i.OrderId)
+            .IsRequired(false); 
     }
 }
diff --git a/Dtos/Invoice/CreateInvoiceDto.cs b/Dtos/Invoice/CreateInvoiceDto.cs
@@ -9,10 +9,24 @@ public class CreateInvoiceDto
     public DateTime IssueDate { get; set; }
     public DateTime DueDate { get; set; }
     public string Notes { get; set; }
-    public Guid OrderId { get; set; } = Guid.Empty;
+    public Guid? OrderId { get; set; } // Make nullable
     public string UserId { get; set; }
     public decimal PaidAmount { get; set; }
     public InvoiceStatus Status { get; set; }
     public string CreatedById { get; set; }
+    
+    // Add missing fields that are in your payload
+    public string CustomerName { get; set; }
+    public string CustomerEmail { get; set; }
+    public string CustomerPhone { get; set; }
+    public string CustomerAddress { get; set; }
+    public string BillingAddress { get; set; }
+    public decimal? TaxRate { get; set; }
+    public decimal? DiscountAmount { get; set; }
+    public string PaymentTerms { get; set; }
+    public decimal? Subtotal { get; set; }
+    public decimal? TaxAmount { get; set; }
+    public decimal TotalAmount { get; set; }
+    
     public List<CreateInvoiceItemDto> Items { get; set; } = new List<CreateInvoiceItemDto>();
 }
diff --git a/Dtos/Invoice/InvoiceResponseDto.cs b/Dtos/Invoice/InvoiceResponseDto.cs
@@ -14,10 +14,20 @@ public class InvoiceResponseDto
     public decimal PaidAmount { get; set; }
     public InvoiceStatus Status { get; set; }
     public string Notes { get; set; }
-    public Guid OrderId { get; set; } = Guid.Empty;
+    public Guid? OrderId { get; set; } = Guid.Empty;
     public string UserId { get; set; }
     public string UserName { get; set; }
-    public List<InvoiceItemDto> Items { get; set; } = new List<InvoiceItemDto>();
+    public List<InvoiceItemResponseDto> Items { get; set; } = new List<InvoiceItemResponseDto>();
+    public string CustomerName { get; set; }
+    public string CustomerEmail { get; set; }
+    public string CustomerPhone { get; set; }
+    public string CustomerAddress { get; set; }
+    public string BillingAddress { get; set; }
+    public decimal? Subtotal { get; set; }
+    public decimal? TaxRate { get; set; }
+    public decimal? TaxAmount { get; set; }
+    public decimal? DiscountAmount { get; set; }
+    public string PaymentTerms { get; set; }
     public DateTime Created { get; set; }
     public string CreatedById { get; set; }
     public UserDto CreatedBy { get; set; }
diff --git a/Dtos/InvoiceItem/CreateInvoiceItemDto.cs b/Dtos/InvoiceItem/CreateInvoiceItemDto.cs
@@ -1,9 +1,12 @@
-﻿namespace AdminHubApi.Dtos.InvoiceItem;
+﻿using System.ComponentModel.DataAnnotations;
+
+namespace AdminHubApi.Dtos.InvoiceItem;
 
 public class CreateInvoiceItemDto
 {
-    public string Description { get; set; }
-    public decimal Quantity { get; set; }
-    public decimal UnitPrice { get; set; }
-    public int? ProductId { get; set; }
+    [Required] public string Description { get; set; }
+    [Required] public decimal Quantity { get; set; }
+    [Required] public decimal UnitPrice { get; set; }
+    [Required] public decimal TotalPrice { get; set; }
+    public Guid? ProductId { get; set; }
 }
diff --git a/Dtos/InvoiceItem/InvoiceItemResponseDto.cs b/Dtos/InvoiceItem/InvoiceItemResponseDto.cs
@@ -1,12 +1,13 @@
 ﻿namespace AdminHubApi.Dtos.InvoiceItem;
 
-public class InvoiceItemDto
+public class InvoiceItemResponseDto
 {
-    public int Id { get; set; }
+    public Guid Id { get; set; }
     public string Description { get; set; }
     public decimal Quantity { get; set; }
     public decimal UnitPrice { get; set; }
     public decimal TotalPrice { get; set; }
-    public int? ProductId { get; set; }
-    public string ProductName { get; set; }
+    public Guid? ProductId { get; set; }
+    public DateTime Created { get; set; }
+    public DateTime Modified { get; set; }
 }
diff --git a/Entities/Invoice/Invoice.cs b/Entities/Invoice/Invoice.cs
@@ -28,22 +28,37 @@ public class Invoice
 
     public decimal PaidAmount { get; set; }
 
-    [Required] public InvoiceStatus Status { get; set; } // Draft, Sent, Paid, Overdue, Cancelled
+    [Required] public InvoiceStatus Status { get; set; }
 
     public string Notes { get; set; }
 
-    // Foreign key for related order
-    public Guid OrderId { get; set; }
+    // Make OrderId optional - invoices can be standalone or linked to orders
+    public Guid? OrderId { get; set; }  // Changed to nullable
 
     [ForeignKey("OrderId")] public Order Order { get; set; }
 
-    // Foreign key for customer/user
+    // Customer information (since invoices can be standalone)
+    public string CustomerName { get; set; }
+    public string CustomerEmail { get; set; }
+    public string CustomerPhone { get; set; }
+    public string CustomerAddress { get; set; }
+    public string BillingAddress { get; set; }
+    
+    // Payment and pricing details
+    public decimal? Subtotal { get; set; }
+    public decimal? TaxRate { get; set; }
+    public decimal? TaxAmount { get; set; }
+    public decimal? DiscountAmount { get; set; }
+    public string PaymentTerms { get; set; }
+
+    // Foreign key for customer/user (also make optional)
     public string UserId { get; set; }
 
     [ForeignKey("UserId")] public ApplicationUser User { get; set; }
 
     // Collection of invoice items
     public ICollection<InvoiceItem> Items { get; set; } = new List<InvoiceItem>();
+    
     public DateTime Created { get; set; }
     public string CreatedById { get; set; }
     public ApplicationUser CreatedBy { get; set; }
diff --git a/Migrations/ApplicationDbContextModelSnapshot.cs b/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -119,12 +119,30 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
+                    b.Property<string>("BillingAddress")
+                        .HasColumnType("text");
+
                     b.Property<DateTime>("Created")
                         .HasColumnType("timestamp with time zone");
 
                     b.Property<string>("CreatedById")
                         .HasColumnType("text");
 
+                    b.Property<string>("CustomerAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("CustomerEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("CustomerName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("CustomerPhone")
+                        .HasColumnType("text");
+
+                    b.Property<decimal?>("DiscountAmount")
+                        .HasColumnType("numeric");
+
                     b.Property<DateTime>("DueDate")
                         .HasColumnType("timestamp with time zone");
 
@@ -144,15 +162,27 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("Notes")
                         .HasColumnType("text");
 
-                    b.Property<Guid>("OrderId")
+                    b.Property<Guid?>("OrderId")
                         .HasColumnType("uuid");
 
                     b.Property<decimal>("PaidAmount")
                         .HasColumnType("numeric");
 
+                    b.Property<string>("PaymentTerms")
+                        .HasColumnType("text");
+
                     b.Property<int>("Status")
                         .HasColumnType("integer");
 
+                    b.Property<decimal?>("Subtotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("TaxAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<decimal?>("TaxRate")
+                        .HasColumnType("numeric");
+
                     b.Property<decimal>("TotalAmount")
                         .HasColumnType("numeric");
 
@@ -602,9 +632,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasOne("AdminHubApi.Entities.Order", "Order")
                         .WithMany()
-                        .HasForeignKey("OrderId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("OrderId");
 
                     b.HasOne("AdminHubApi.Entities.ApplicationUser", "User")
                         .WithMany()
diff --git a/Services/InvoiceService.cs b/Services/InvoiceService.cs
@@ -1,5 +1,6 @@
 ﻿using AdminHubApi.Dtos.ApiResponse;
 using AdminHubApi.Dtos.Invoice;
+using AdminHubApi.Dtos.InvoiceItem;
 using AdminHubApi.Dtos.UserManagement;
 using AdminHubApi.Entities.Invoice;
 using AdminHubApi.Interfaces;
@@ -21,7 +22,6 @@ public async Task<ApiResponse<IEnumerable<InvoiceResponseDto>>> GetAllAsync()
     {
         try
         {
-            
             var invoices = await _invoiceRepository.GetAllAsync();
 
             return new ApiResponse<IEnumerable<InvoiceResponseDto>>
@@ -103,9 +103,9 @@ public async Task<ApiResponse<InvoiceResponseDto>> UpdateAsync(InvoiceResponseDt
     {
         var existingInvoice = await _invoiceRepository.GetByIdAsync(invoiceResponse.Id);
 
-        if (existingInvoice == null) 
+        if (existingInvoice == null)
             throw new KeyNotFoundException($"Invoice with id: {invoiceResponse.Id} was not found");
-            
+
         existingInvoice.InvoiceNumber = invoiceResponse.InvoiceNumber;
         existingInvoice.IssueDate = invoiceResponse.IssueDate;
         existingInvoice.OrderId = invoiceResponse.OrderId;
@@ -116,7 +116,7 @@ public async Task<ApiResponse<InvoiceResponseDto>> UpdateAsync(InvoiceResponseDt
         existingInvoice.ModifiedById = invoiceResponse.ModifiedById;
 
         await _invoiceRepository.UpdateAsync(existingInvoice);
-        
+
         return new ApiResponse<InvoiceResponseDto>
         {
             Succeeded = true,
@@ -130,11 +130,11 @@ public async Task<ApiResponse<bool>> DeleteAsync(Guid id)
     {
         var product = await _invoiceRepository.GetByIdAsync(id);
 
-        if (product == null) 
+        if (product == null)
             throw new KeyNotFoundException($"Invoice with id: {id} was not found");
 
         await _invoiceRepository.DeleteAsync(id);
-        
+
         return new ApiResponse<bool>
         {
             Succeeded = true,
@@ -152,12 +152,28 @@ private static InvoiceResponseDto MapToResponseDto(Invoice invoice)
             InvoiceNumber = invoice.InvoiceNumber,
             IssueDate = invoice.IssueDate,
             DueDate = invoice.DueDate,
-            OrderId = invoice.OrderId,
+            OrderId = invoice.OrderId, // Now both are nullable
             PaidAmount = invoice.PaidAmount,
+            TotalAmount = invoice.TotalAmount,
             Notes = invoice.Notes,
             Status = invoice.Status,
+
+            // Customer fields
+            CustomerName = invoice.CustomerName,
+            CustomerEmail = invoice.CustomerEmail,
+            CustomerPhone = invoice.CustomerPhone,
+            CustomerAddress = invoice.CustomerAddress,
+            BillingAddress = invoice.BillingAddress,
+
+            // Pricing fields
+            Subtotal = invoice.Subtotal,
+            TaxRate = invoice.TaxRate,
+            TaxAmount = invoice.TaxAmount,
+            DiscountAmount = invoice.DiscountAmount,
+            PaymentTerms = invoice.PaymentTerms,
+
             Created = invoice.Created,
-            Modified = invoice.Modified,
+            CreatedById = invoice.CreatedById,
             CreatedBy = invoice.CreatedBy != null
                 ? new UserDto
                 {
@@ -172,6 +188,8 @@ private static InvoiceResponseDto MapToResponseDto(Invoice invoice)
                     LockoutEnd = invoice.CreatedBy.LockoutEnd
                 }
                 : null,
+            Modified = invoice.Modified,
+            ModifiedById = invoice.ModifiedById,
             ModifiedBy = invoice.ModifiedBy != null
                 ? new UserDto
                 {
@@ -185,7 +203,20 @@ private static InvoiceResponseDto MapToResponseDto(Invoice invoice)
                     LockoutEnabled = invoice.ModifiedBy.LockoutEnabled,
                     LockoutEnd = invoice.ModifiedBy.LockoutEnd
                 }
-                : null
+                : null,
+
+            // Map invoice items
+            Items = invoice.Items?.Select(item => new InvoiceItemResponseDto
+            {
+                Id = item.Id,
+                Description = item.Description,
+                Quantity = item.Quantity,
+                UnitPrice = item.UnitPrice,
+                TotalPrice = item.TotalPrice,
+                ProductId = item.ProductId,
+                Created = item.Created,
+                Modified = item.Modified
+            }).ToList() ?? new List<InvoiceItemResponseDto>()
         };
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,12 @@ protected override void OnModelCreating(ModelBuilder builder)`
`30`	`30`	`entity.HasIndex(e => e.TokenId).IsUnique();`
`31`	`31`	`entity.HasIndex(e => e.ExpiryDate); // For efficient cleanup queries`
`32`	`32`	`});`
	`33`	`+`
	`34`	`+ // Configure an Invoice-Order relationship as optional`
	`35`	`+ builder.Entity<Invoice>()`
	`36`	`+ .HasOne(i => i.Order)`
	`37`	`+ .WithMany()`
	`38`	`+ .HasForeignKey(i => i.OrderId)`
	`39`	`+ .IsRequired(false);`
`33`	`40`	`}`
`34`	`41`	`}`