diff --git a/packages/server/src/models/SaleReceipt.ts b/packages/server/src/models/SaleReceipt.ts index 7c60634f3..939f462a1 100644 --- a/packages/server/src/models/SaleReceipt.ts +++ b/packages/server/src/models/SaleReceipt.ts @@ -55,6 +55,9 @@ export default class SaleReceipt extends mixin(TenantModel, [ 'discountAmount', 'discountPercentage', + 'paid', + 'paidLocal', + 'isClosed', 'isDraft', ]; @@ -130,6 +133,22 @@ export default class SaleReceipt extends mixin(TenantModel, [ return this.adjustment * this.exchangeRate; } + /** + * Receipt paid amount. + * @returns {number} + */ + get paid() { + return this.total; + } + + /** + * Receipt paid amount in local currency. + * @returns {number} + */ + get paidLocal() { + return this.paid * this.exchangeRate; + } + /** * Detarmine whether the sale receipt closed. * @return {boolean} diff --git a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts index adafab5d8..52d59821e 100644 --- a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts +++ b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts @@ -24,6 +24,7 @@ export class SaleReceiptTransformer extends Transformer { 'formattedReceiptDate', 'formattedClosedAtDate', 'formattedCreatedAt', + 'paidFormatted', 'entries', 'attachments', ]; @@ -130,6 +131,18 @@ export class SaleReceiptTransformer extends Transformer { return receipt.discountPercentage ? `${receipt.discountPercentage}%` : ''; }; + /** + * Retrieves formatted paid amount. + * @param receipt + * @returns {string} + */ + protected paidFormatted = (receipt: ISaleReceipt): string => { + return formatNumber(receipt.paid, { + currencyCode: receipt.currencyCode, + excerptZero: true, + }); + }; + /** * Retrieves formatted adjustment amount. * @param receipt diff --git a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx index 21bd0a923..78f969031 100644 --- a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx @@ -5,14 +5,12 @@ import styled from 'styled-components'; import { defaultTo } from 'lodash'; import { - ButtonLink, CustomerDrawerLink, CommercialDocHeader, CommercialDocTopHeader, ExchangeRateDetailItem, Row, Col, - FormatDate, DetailsMenu, DetailItem, } from '@/components'; @@ -66,6 +64,7 @@ export default function ReceiptDetailHeader() { /> + } - value={receipt.formatted_amount} - borderStyle={TotalLineBorderStyle.DoubleDark} + value={receipt.paid_formatted} + borderStyle={TotalLineBorderStyle.SingleDark} /> }