diff --git a/packages/server/src/services/Cashflow/CashflowTransactionTransformer.ts b/packages/server/src/services/Cashflow/CashflowTransactionTransformer.ts index 797d847dd..f6b9e288b 100644 --- a/packages/server/src/services/Cashflow/CashflowTransactionTransformer.ts +++ b/packages/server/src/services/Cashflow/CashflowTransactionTransformer.ts @@ -7,7 +7,12 @@ export class CashflowTransactionTransformer extends Transformer { * @returns {string[]} */ public includeAttributes = (): string[] => { - return ['formattedAmount', 'transactionTypeFormatted']; + return [ + 'formattedAmount', + 'transactionTypeFormatted', + 'formattedDate', + 'formattedCreatedAt', + ]; }; /** @@ -24,10 +29,28 @@ export class CashflowTransactionTransformer extends Transformer { /** * Formatted transaction type. - * @param transaction + * @param transaction * @returns {string} */ protected transactionTypeFormatted = (transaction) => { return this.context.i18n.__(transaction.transactionTypeFormatted); - } + }; + + /** + * Retrieve the formatted transaction date. + * @param invoice + * @returns {string} + */ + protected formattedDate = (invoice): string => { + return this.formatDate(invoice.date); + }; + + /** + * Retrieve the formatted created at date. + * @param invoice + * @returns {string} + */ + protected formattedCreatedAt = (invoice): string => { + return this.formatDate(invoice.createdAt); + }; } diff --git a/packages/server/src/services/Organization/OrganizationService.ts b/packages/server/src/services/Organization/OrganizationService.ts index 06731b741..883db3ce5 100644 --- a/packages/server/src/services/Organization/OrganizationService.ts +++ b/packages/server/src/services/Organization/OrganizationService.ts @@ -207,7 +207,7 @@ export default class OrganizationService { ): IOrganizationBuildDTO { return { ...buildDTO, - dateFormat: defaultTo(buildDTO.dateFormat, 'DD/MM/yyyy'), + dateFormat: defaultTo(buildDTO.dateFormat, 'DD MMM yyyy'), }; } diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.tsx index 3fc0477cd..68879e3e6 100644 --- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.tsx +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.tsx @@ -46,7 +46,7 @@ export default function CashflowTransactionDrawerHeader() { }> - + {cashflowTransaction.formatted_date} }>