leandro/phronCare
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feature/leandro/43-deliverynote-pdf #44

Merged
leandro merged 3 commits from feature/leandro/43-deliverynote-pdf into master 2026-03-26 16:27:50 +00:00
Conversation 0 Commits 3 Files Changed 10 +13 -1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb1f159ac4 - Show all commits

5
Domain/Dtos/Sales/DeliveryNoteDto.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Domain.Dtos.Sales namespace Domain.Dtos.Sales
@ -11,11 +11,14 @@ namespace Domain.Dtos.Sales
{ {
public int Id { get; set; } public int Id { get; set; }
public string DeliveryNoteNumber { get; set; } = string.Empty; public string DeliveryNoteNumber { get; set; } = string.Empty;
public string CustomerName { get; set; } = string.Empty;
public int? QuoteId { get; set; } public int? QuoteId { get; set; }
public string? QuoteNumber { get; set; }
public int? SalesInvoiceId { get; set; } public int? SalesInvoiceId { get; set; }
public DateTime IssueDate { get; set; } public DateTime IssueDate { get; set; }
public int CustomerId { get; set; } public int CustomerId { get; set; }
public string Status { get; set; } = string.Empty; public string Status { get; set; } = string.Empty;
public string? LogoBase64 { get; set; }
public string? Observations { get; set; } public string? Observations { get; set; }
public string? ExtraInfoJson { get; set; } public string? ExtraInfoJson { get; set; }
public int PrintCount { get; set; } public int PrintCount { get; set; }

9
Models/Repositories/PhSDeliveryNoteRepository.cs
View File

@ -86,6 +86,8 @@ namespace Models.Repositories
public async Task<DeliveryNoteDto?> GetDtoByIdAsync(int id) public async Task<DeliveryNoteDto?> GetDtoByIdAsync(int id)
{ {
var entity = await _context.PhSDeliveryNotes var entity = await _context.PhSDeliveryNotes
.Include(x => x.Customer)
.Include(x => x.Quote)
.Include(x => x.PhSDeliveryNoteDetails) .Include(x => x.PhSDeliveryNoteDetails)
.AsNoTracking() .AsNoTracking()
.FirstOrDefaultAsync(x => x.Id == id); .FirstOrDefaultAsync(x => x.Id == id);
@ -96,6 +98,8 @@ namespace Models.Repositories
public async Task<DeliveryNoteDto?> GetDtoByDeliveryNoteNumberAsync(string deliveryNoteNumber) public async Task<DeliveryNoteDto?> GetDtoByDeliveryNoteNumberAsync(string deliveryNoteNumber)
{ {
var entity = await _context.PhSDeliveryNotes var entity = await _context.PhSDeliveryNotes
.Include(x => x.Customer)
.Include(x => x.Quote)
.Include(x => x.PhSDeliveryNoteDetails) .Include(x => x.PhSDeliveryNoteDetails)
.AsNoTracking() .AsNoTracking()
.FirstOrDefaultAsync(x => x.Deliverynotenumber == deliveryNoteNumber); .FirstOrDefaultAsync(x => x.Deliverynotenumber == deliveryNoteNumber);
@ -106,6 +110,8 @@ namespace Models.Repositories
public async Task<IEnumerable<DeliveryNoteDto>> GetDtosByQuoteIdAsync(int quoteId) public async Task<IEnumerable<DeliveryNoteDto>> GetDtosByQuoteIdAsync(int quoteId)
{ {
var entities = await _context.PhSDeliveryNotes var entities = await _context.PhSDeliveryNotes
.Include(x => x.Customer)
.Include(x => x.Quote)
.Include(x => x.PhSDeliveryNoteDetails) .Include(x => x.PhSDeliveryNoteDetails)
.AsNoTracking() .AsNoTracking()
.Where(x => x.QuoteId == quoteId) .Where(x => x.QuoteId == quoteId)
@ -139,7 +145,9 @@ namespace Models.Repositories
{ {
Id = source.Id, Id = source.Id,
DeliveryNoteNumber = source.Deliverynotenumber, DeliveryNoteNumber = source.Deliverynotenumber,
CustomerName = source.Customer?.Name ?? string.Empty,
QuoteId = source.QuoteId, QuoteId = source.QuoteId,
QuoteNumber = source.Quote?.Quotenumber,
SalesInvoiceId = source.SalesinvoiceId, SalesInvoiceId = source.SalesinvoiceId,
IssueDate = source.Issuedate, IssueDate = source.Issuedate,
CustomerId = source.CustomerId, CustomerId = source.CustomerId,
@ -147,6 +155,7 @@ namespace Models.Repositories
Observations = source.Observations, Observations = source.Observations,
ExtraInfoJson = source.ExtrainfoJson, ExtraInfoJson = source.ExtrainfoJson,
PrintCount = source.Printcount, PrintCount = source.Printcount,
LogoBase64 = null,
CreatedAt = source.Createdat, CreatedAt = source.Createdat,
ModifiedAt = source.Modifiedat, ModifiedAt = source.Modifiedat,
Items = source.PhSDeliveryNoteDetails Items = source.PhSDeliveryNoteDetails