From 5ea5010fd0cf093f3028773b7c7908092039451d Mon Sep 17 00:00:00 2001 From: David Arranz Date: Mon, 15 Jul 2024 19:16:19 +0200 Subject: [PATCH] . --- .../listQuotes/presenter/ListQuotes.presenter.ts | 13 +++---------- .../infrastructure/mappers/quoteItem.mapper.ts | 2 +- .../ListQuotes.dto/IListQuotes_Response.dto.ts | 3 ++- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/presenter/ListQuotes.presenter.ts b/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/presenter/ListQuotes.presenter.ts index 90f9b02..605c28e 100644 --- a/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/presenter/ListQuotes.presenter.ts +++ b/server/src/contexts/sales/infrastructure/express/controllers/quotes/listQuotes/presenter/ListQuotes.presenter.ts @@ -26,16 +26,9 @@ export const ListQuotesPresenter: IListQuotesPresenter = { lang_code: quote.language.toString(), currency_code: quote.currency.toString(), - subtotal: { - amount: 0, - precision: 2, - currency: "EUR", - }, - total: { - amount: 0, - precision: 2, - currency: "EUR", - }, + subtotal_price: quote.subtotalPrice.toObject(), + discount: quote.discount.toObject(), + total_price: quote.totalPrice.toObject(), //items: quoteItemPresenter(quote.items, context), }; }, diff --git a/server/src/contexts/sales/infrastructure/mappers/quoteItem.mapper.ts b/server/src/contexts/sales/infrastructure/mappers/quoteItem.mapper.ts index e5977ea..0cf0e6a 100644 --- a/server/src/contexts/sales/infrastructure/mappers/quoteItem.mapper.ts +++ b/server/src/contexts/sales/infrastructure/mappers/quoteItem.mapper.ts @@ -23,7 +23,7 @@ class QuoteItemMapper const id = this.mapsValue(source, "item_id", UniqueID.create); const props: IQuoteItemProps = { - articleId: source.id_article, + articleId: source.id_article === "" ? null : source.id_article, description: this.mapsValue(source, "description", Description.create), quantity: this.mapsValue(source, "quantity", (quantity) => Quantity.create({ diff --git a/shared/lib/contexts/sales/application/dto/Quote/ListQuotes.dto/IListQuotes_Response.dto.ts b/shared/lib/contexts/sales/application/dto/Quote/ListQuotes.dto/IListQuotes_Response.dto.ts index 4944478..718a80b 100644 --- a/shared/lib/contexts/sales/application/dto/Quote/ListQuotes.dto/IListQuotes_Response.dto.ts +++ b/shared/lib/contexts/sales/application/dto/Quote/ListQuotes.dto/IListQuotes_Response.dto.ts @@ -1,4 +1,4 @@ -import { IMoney_Response_DTO } from "../../../../../common"; +import { IMoney_Response_DTO, IPercentage_Response_DTO } from "../../../../../common"; export interface IListQuotes_Response_DTO { id: string; @@ -10,5 +10,6 @@ export interface IListQuotes_Response_DTO { currency_code: string; subtotal_price: IMoney_Response_DTO; + discount: IPercentage_Response_DTO; total_price: IMoney_Response_DTO; }