diff --git a/Domain/Dtos/QuoteItemDto.cs b/Domain/Dtos/QuoteItemDto.cs index 94f7644..44247b0 100644 --- a/Domain/Dtos/QuoteItemDto.cs +++ b/Domain/Dtos/QuoteItemDto.cs @@ -36,5 +36,25 @@ /// Total del ítem (Subtotal + TaxAmount). /// public decimal Total { get; set; } + + /// + /// Indica si el renglón fue aprobado durante el proceso de autorización. + /// + public bool Approved { get; set; } + + /// + /// Cantidad aprobada para el renglón. Puede diferir de la cantidad originalmente cotizada. + /// + public int? ApprovedQuantity { get; set; } + + /// + /// Precio unitario aprobado para el renglón. + /// + public decimal? ApprovedUnitPrice { get; set; } + + /// + /// Importe total aprobado para el renglón. + /// + public decimal? ApprovedAmount { get; set; } } } diff --git a/Models/Repositories/PhSLookUpRepository.cs b/Models/Repositories/PhSLookUpRepository.cs index 5402c84..c5ffda1 100644 --- a/Models/Repositories/PhSLookUpRepository.cs +++ b/Models/Repositories/PhSLookUpRepository.cs @@ -97,7 +97,7 @@ namespace Models.Repositories return await ( from q in _context.PhSQuoteHeaders join c in _context.PhSCustomers on q.CustomerId equals c.Id - where q.Status == "Emitido" && + where q.Status == "Aprobado" && (q.Quotenumber.Contains(filter) || c.Name.Contains(filter)) orderby q.Issuedate descending select new ELookUpItem diff --git a/Models/Repositories/PhSQuoteRepository.cs b/Models/Repositories/PhSQuoteRepository.cs index 8b68526..8cc9ee0 100644 --- a/Models/Repositories/PhSQuoteRepository.cs +++ b/Models/Repositories/PhSQuoteRepository.cs @@ -175,12 +175,17 @@ namespace Models.Repositories var itemTax = totalTaxAmount * itemBase / netBase; return new QuoteItemDto { + Id = d.Id, Description = d.ProductDescription, Quantity = d.Quantity, UnitPrice = d.Unitprice, Subtotal = itemBase, TaxAmount = itemTax, - Total = itemBase + itemTax + Total = itemBase + itemTax, + Approved = d.Approved, + ApprovedQuantity = d.Approvedquantity, + ApprovedUnitPrice = d.Approvedunitprice, + ApprovedAmount = d.Approvedamount }; }).ToList(), @@ -303,7 +308,11 @@ namespace Models.Repositories UnitPrice = d.Unitprice, Subtotal = itemBase, TaxAmount = itemTax, - Total = itemBase + itemTax + Total = itemBase + itemTax, + Approved = d.Approved, + ApprovedQuantity = d.Approvedquantity, + ApprovedUnitPrice = d.Approvedunitprice, + ApprovedAmount = d.Approvedamount }; }).ToList(),