diff --git a/Domain/Dtos/Sales/DeliveryNoteDto.cs b/Domain/Dtos/Sales/DeliveryNoteDto.cs index 67e76a9..7ada9c7 100644 --- a/Domain/Dtos/Sales/DeliveryNoteDto.cs +++ b/Domain/Dtos/Sales/DeliveryNoteDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; namespace Domain.Dtos.Sales @@ -11,11 +11,14 @@ namespace Domain.Dtos.Sales { public int Id { get; set; } public string DeliveryNoteNumber { get; set; } = string.Empty; + public string CustomerName { get; set; } = string.Empty; public int? QuoteId { get; set; } + public string? QuoteNumber { get; set; } public int? SalesInvoiceId { get; set; } public DateTime IssueDate { get; set; } public int CustomerId { get; set; } public string Status { get; set; } = string.Empty; + public string? LogoBase64 { get; set; } public string? Observations { get; set; } public string? ExtraInfoJson { get; set; } public int PrintCount { get; set; } diff --git a/Models/Repositories/PhSDeliveryNoteRepository.cs b/Models/Repositories/PhSDeliveryNoteRepository.cs index c4d5928..0686bec 100644 --- a/Models/Repositories/PhSDeliveryNoteRepository.cs +++ b/Models/Repositories/PhSDeliveryNoteRepository.cs @@ -86,6 +86,8 @@ namespace Models.Repositories public async Task GetDtoByIdAsync(int id) { var entity = await _context.PhSDeliveryNotes + .Include(x => x.Customer) + .Include(x => x.Quote) .Include(x => x.PhSDeliveryNoteDetails) .AsNoTracking() .FirstOrDefaultAsync(x => x.Id == id); @@ -96,6 +98,8 @@ namespace Models.Repositories public async Task GetDtoByDeliveryNoteNumberAsync(string deliveryNoteNumber) { var entity = await _context.PhSDeliveryNotes + .Include(x => x.Customer) + .Include(x => x.Quote) .Include(x => x.PhSDeliveryNoteDetails) .AsNoTracking() .FirstOrDefaultAsync(x => x.Deliverynotenumber == deliveryNoteNumber); @@ -106,6 +110,8 @@ namespace Models.Repositories public async Task> GetDtosByQuoteIdAsync(int quoteId) { var entities = await _context.PhSDeliveryNotes + .Include(x => x.Customer) + .Include(x => x.Quote) .Include(x => x.PhSDeliveryNoteDetails) .AsNoTracking() .Where(x => x.QuoteId == quoteId) @@ -139,7 +145,9 @@ namespace Models.Repositories { Id = source.Id, DeliveryNoteNumber = source.Deliverynotenumber, + CustomerName = source.Customer?.Name ?? string.Empty, QuoteId = source.QuoteId, + QuoteNumber = source.Quote?.Quotenumber, SalesInvoiceId = source.SalesinvoiceId, IssueDate = source.Issuedate, CustomerId = source.CustomerId, @@ -147,6 +155,7 @@ namespace Models.Repositories Observations = source.Observations, ExtraInfoJson = source.ExtrainfoJson, PrintCount = source.Printcount, + LogoBase64 = null, CreatedAt = source.Createdat, ModifiedAt = source.Modifiedat, Items = source.PhSDeliveryNoteDetails