From 125dff83762944cd6d327b2ce878143f36752029 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 17 Jun 2024 10:27:02 +0200 Subject: [PATCH] feat: format created at date --- .../services/CreditNotes/CreditNoteTransformer.ts | 11 +++++++++++ .../src/services/Expenses/CRUD/ExpenseTransformer.ts | 10 ++++++++++ .../ManualJournals/ManualJournalTransformer.ts | 10 ++++++++++ .../Purchases/BillPayments/BillPaymentTransformer.ts | 10 ++++++++++ .../Purchases/Bills/PurchaseInvoiceTransformer.ts | 10 ++++++++++ .../VendorCredits/VendorCreditTransformer.ts | 10 ++++++++++ .../Sales/Estimates/SaleEstimateTransformer.ts | 10 ++++++++++ .../Sales/Invoices/SaleInvoiceTransformer.ts | 10 ++++++++++ .../PaymentReceives/PaymentReceiveTransformer.ts | 12 +++++++++++- .../Sales/Receipts/SaleReceiptTransformer.ts | 10 ++++++++++ packages/webapp/src/components/DrawersContainer.tsx | 2 +- .../containers/Accounting/JournalsLanding/utils.tsx | 3 +-- .../Drawers/BillDrawer/BillDetailHeader.tsx | 2 +- .../CreditNoteDetailHeader.tsx | 4 +--- .../EstimateDetailDrawer/EstimateDetailHeader.tsx | 2 +- .../Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx | 4 ++-- .../InvoiceDetailDrawer/InvoiceDetailHeader.tsx | 2 +- .../PaymentMadeDetailHeader.tsx | 3 ++- .../PaymentReceiveDetailHeader.tsx | 3 +-- .../ReceiptDetailDrawer/ReceiptDetailHeader.tsx | 2 +- .../VendorCreditDetailHeader.tsx | 2 +- .../Expenses/ExpensesLanding/components.tsx | 11 ++--------- 22 files changed, 117 insertions(+), 26 deletions(-) diff --git a/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts b/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts index 67b51b40d..d4780a754 100644 --- a/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts +++ b/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts @@ -13,6 +13,8 @@ export class CreditNoteTransformer extends Transformer { return [ 'formattedCreditsRemaining', 'formattedCreditNoteDate', + 'formattedCreatedAt', + 'formattedCreatedAt', 'formattedAmount', 'formattedCreditsUsed', 'formattedSubtotal', @@ -30,6 +32,15 @@ export class CreditNoteTransformer extends Transformer { return this.formatDate(credit.creditNoteDate); }; + /** + * Retrieve formatted created at date. + * @param credit + * @returns {string} + */ + protected formattedCreatedAt = (credit): string => { + return this.formatDate(credit.createdAt); + }; + /** * Retrieve formatted invoice amount. * @param {ICreditNote} credit diff --git a/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts b/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts index 92caf0959..3f566b87b 100644 --- a/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts +++ b/packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts @@ -15,6 +15,7 @@ export class ExpenseTransfromer extends Transformer { 'formattedLandedCostAmount', 'formattedAllocatedCostAmount', 'formattedDate', + 'formattedCreatedAt', 'categories', 'attachments', ]; @@ -62,6 +63,15 @@ export class ExpenseTransfromer extends Transformer { return this.formatDate(expense.paymentDate); }; + /** + * Retrieve formatted created at date. + * @param {IExpense} expense + * @returns {string} + */ + protected formattedCreatedAt = (expense: IExpense): string => { + return this.formatDate(expense.createdAt); + } + /** * Retrieves the transformed expense categories. * @param {IExpense} expense diff --git a/packages/server/src/services/ManualJournals/ManualJournalTransformer.ts b/packages/server/src/services/ManualJournals/ManualJournalTransformer.ts index cd4d0baa9..84ac7e0c9 100644 --- a/packages/server/src/services/ManualJournals/ManualJournalTransformer.ts +++ b/packages/server/src/services/ManualJournals/ManualJournalTransformer.ts @@ -13,6 +13,7 @@ export class ManualJournalTransfromer extends Transformer { 'formattedAmount', 'formattedDate', 'formattedPublishedAt', + 'formattedCreatedAt', 'attachments', ]; }; @@ -37,6 +38,15 @@ export class ManualJournalTransfromer extends Transformer { return this.formatDate(manualJorunal.date); }; + /** + * Retrieve formatted created at date. + * @param {IManualJournal} manualJournal + * @returns {string} + */ + protected formattedCreatedAt = (manualJorunal: IManualJournal): string => { + return this.formatDate(manualJorunal.createdAt); + }; + /** * Retrieve formatted published at date. * @param {IManualJournal} manualJournal diff --git a/packages/server/src/services/Purchases/BillPayments/BillPaymentTransformer.ts b/packages/server/src/services/Purchases/BillPayments/BillPaymentTransformer.ts index adf77dd41..6299b3758 100644 --- a/packages/server/src/services/Purchases/BillPayments/BillPaymentTransformer.ts +++ b/packages/server/src/services/Purchases/BillPayments/BillPaymentTransformer.ts @@ -12,6 +12,7 @@ export class BillPaymentTransformer extends Transformer { public includeAttributes = (): string[] => { return [ 'formattedPaymentDate', + 'formattedCreatedAt', 'formattedAmount', 'entries', 'attachments', @@ -27,6 +28,15 @@ export class BillPaymentTransformer extends Transformer { return this.formatDate(billPayment.paymentDate); }; + /** + * Retrieve formatted created at date. + * @param {IBillPayment} billPayment + * @returns {string} + */ + protected formattedCreatedAt = (billPayment: IBillPayment): string => { + return this.formatDate(billPayment.createdAt); + } + /** * Retrieve formatted bill amount. * @param {IBill} invoice diff --git a/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts b/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts index 43b8a4b1a..d940d79fa 100644 --- a/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts +++ b/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts @@ -14,6 +14,7 @@ export class PurchaseInvoiceTransformer extends Transformer { return [ 'formattedBillDate', 'formattedDueDate', + 'formattedCreatedAt', 'formattedAmount', 'formattedPaymentAmount', 'formattedBalance', @@ -57,6 +58,15 @@ export class PurchaseInvoiceTransformer extends Transformer { return this.formatDate(bill.dueDate); }; + /** + * Retrieve the formatted created at date. + * @param {IBill} bill + * @returns {string} + */ + protected formattedCreatedAt = (bill: IBill): string => { + return this.formatDate(bill.createdAt); + }; + /** * Retrieve formatted bill amount. * @param {IBill} bill diff --git a/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts b/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts index 86518c23e..ba7625562 100644 --- a/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts +++ b/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts @@ -14,6 +14,7 @@ export class VendorCreditTransformer extends Transformer { 'formattedAmount', 'formattedSubtotal', 'formattedVendorCreditDate', + 'formattedCreatedAt', 'formattedCreditsRemaining', 'formattedInvoicedAmount', 'entries', @@ -30,6 +31,15 @@ export class VendorCreditTransformer extends Transformer { return this.formatDate(vendorCredit.vendorCreditDate); }; + /** + * Retireve formatted created at date. + * @param vendorCredit + * @returns {string} + */ + protected formattedCreatedAt = (vendorCredit): string => { + return this.formatDate(vendorCredit.createdAt); + }; + /** * Retrieve formatted vendor credit amount. * @param {IVendorCredit} credit diff --git a/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts b/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts index 9e6cb1be3..1a7d6990a 100644 --- a/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts +++ b/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts @@ -18,6 +18,7 @@ export class SaleEstimateTransfromer extends Transformer { 'formattedDeliveredAtDate', 'formattedApprovedAtDate', 'formattedRejectedAtDate', + 'formattedCreatedAt', 'entries', 'attachments', ]; @@ -41,6 +42,15 @@ export class SaleEstimateTransfromer extends Transformer { return this.formatDate(estimate.expirationDate); }; + /** + * Retrieves the formatted estimate created at. + * @param {ISaleEstimate} estimate - + * @returns {string} + */ + protected formattedCreatedAt = (estimate: ISaleEstimate): string => { + return this.formatDate(estimate.createdAt); + }; + /** * Retrieve formatted estimate date. * @param {ISaleEstimate} invoice diff --git a/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts b/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts index 4d3b9d2c2..ef5fe5e12 100644 --- a/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts +++ b/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts @@ -13,6 +13,7 @@ export class SaleInvoiceTransformer extends Transformer { return [ 'invoiceDateFormatted', 'dueDateFormatted', + 'createdAtFormatted', 'dueAmountFormatted', 'paymentAmountFormatted', 'balanceAmountFormatted', @@ -48,6 +49,15 @@ export class SaleInvoiceTransformer extends Transformer { return this.formatDate(invoice.dueDate); }; + /** + * Retrieve the formatted created at date. + * @param invoice + * @returns {string} + */ + protected createdAtFormatted = (invoice): string => { + return this.formatDate(invoice.createdAt); + }; + /** * Retrieve formatted invoice due amount. * @param {ISaleInvoice} invoice diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts b/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts index 5ca84db07..eaf4dfe9e 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts +++ b/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts @@ -12,6 +12,7 @@ export class PaymentReceiveTransfromer extends Transformer { return [ 'subtotalFormatted', 'formattedPaymentDate', + 'formattedCreatedAt', 'formattedAmount', 'formattedExchangeRate', 'entries', @@ -27,9 +28,18 @@ export class PaymentReceiveTransfromer extends Transformer { return this.formatDate(payment.paymentDate); }; + /** + * Retrieves the formatted created at date. + * @param {IPaymentReceive} payment + * @returns {string} + */ + protected formattedCreatedAt = (payment: IPaymentReceive): string => { + return this.formatDate(payment.createdAt); + }; + /** * Retrieve the formatted payment subtotal. - * @param {IPaymentReceive} payment + * @param {IPaymentReceive} payment * @returns {string} */ protected subtotalFormatted = (payment: IPaymentReceive): string => { diff --git a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts index f031e567a..90d3631af 100644 --- a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts +++ b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts @@ -17,6 +17,7 @@ export class SaleReceiptTransformer extends Transformer { 'formattedAmount', 'formattedReceiptDate', 'formattedClosedAtDate', + 'formattedCreatedAt', 'entries', 'attachments', ]; @@ -40,6 +41,15 @@ export class SaleReceiptTransformer extends Transformer { return this.formatDate(receipt.closedAt); }; + /** + * Retrieve formatted receipt created at date. + * @param receipt + * @returns {string} + */ + protected formattedCreatedAt = (receipt: ISaleReceipt): string => { + return this.formatDate(receipt.createdAt); + }; + /** * Retrieves the estimate formatted subtotal. * @param {ISaleReceipt} receipt diff --git a/packages/webapp/src/components/DrawersContainer.tsx b/packages/webapp/src/components/DrawersContainer.tsx index aeae5c4ec..af3c97525 100644 --- a/packages/webapp/src/components/DrawersContainer.tsx +++ b/packages/webapp/src/components/DrawersContainer.tsx @@ -21,9 +21,9 @@ import RefundCreditNoteDetailDrawer from '@/containers/Drawers/RefundCreditNoteD import RefundVendorCreditDetailDrawer from '@/containers/Drawers/RefundVendorCreditDetailDrawer'; import WarehouseTransferDetailDrawer from '@/containers/Drawers/WarehouseTransferDetailDrawer'; import TaxRateDetailsDrawer from '@/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer'; +import CategorizeTransactionDrawer from '@/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer'; import { DRAWERS } from '@/constants/drawers'; -import CategorizeTransactionDrawer from '@/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer'; /** * Drawers container of the dashboard. diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/utils.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/utils.tsx index 68030f0d4..ab8bfac21 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/utils.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/utils.tsx @@ -65,8 +65,7 @@ export const useManualJournalsColumns = () => { { id: 'created_at', Header: intl.get('created_at'), - accessor: 'created_at', - Cell: FormatDateCell, + accessor: 'formatted_created_at', width: 125, clickable: true, }, diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailHeader.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailHeader.tsx index dea7b7c96..6b68ff838 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailHeader.tsx @@ -79,7 +79,7 @@ export default function BillDetailHeader() { /> } + children={bill.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.tsx b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.tsx index 3a545a83d..ffb1f7985 100644 --- a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.tsx @@ -5,13 +5,11 @@ import styled from 'styled-components'; import { defaultTo } from 'lodash'; import { - FormatDate, T, Row, Col, DetailsMenu, DetailItem, - ButtonLink, CommercialDocHeader, CommercialDocTopHeader, CustomerDrawerLink, @@ -85,7 +83,7 @@ export default function CreditNoteDetailHeader() { /> } - children={} + children={creditNote.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx index 7c07ee1db..a6ae51468 100644 --- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx @@ -81,7 +81,7 @@ export default function EstimateDetailHeader() { /> } - children={} + children={estimate.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx index 31dda7722..84aadd48d 100644 --- a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx +++ b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx @@ -65,11 +65,11 @@ export default function ExpenseDrawerHeader() { minLabelSize={'180px'} > }> - + {expense.formatted_date} }> - + {expense.formatted_created_at} diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.tsx index 10756938e..9231132a8 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.tsx @@ -86,7 +86,7 @@ export default function InvoiceDetailHeader() { /> } + children={invoice.created_at_formatted} /> diff --git a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailHeader.tsx b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailHeader.tsx index de31d42f6..6f88eb968 100644 --- a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailHeader.tsx @@ -58,6 +58,7 @@ export default function PaymentMadeDetailHeader() { /> + } + children={paymentMade.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailHeader.tsx b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailHeader.tsx index bddb4c313..88b2443a0 100644 --- a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailHeader.tsx @@ -5,7 +5,6 @@ import { defaultTo } from 'lodash'; import { Row, Col, - FormatDate, DetailsMenu, DetailItem, CommercialDocHeader, @@ -71,7 +70,7 @@ export default function PaymentReceiveDetailHeader() { /> } + children={paymentReceive.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx index e5ddfa6ab..a55d47ee6 100644 --- a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx @@ -82,7 +82,7 @@ export default function ReceiptDetailHeader() { /> } + children={receipt.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx index e4b501fc1..989b1b245 100644 --- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx +++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx @@ -78,7 +78,7 @@ export default function VendorCreditDetailHeader() { /> } - children={} + children={vendorCredit.formatted_created_at} /> diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/components.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/components.tsx index 3f32537d1..cac65ea92 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/components.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/components.tsx @@ -17,13 +17,7 @@ import clsx from 'classnames'; import { CLASSES } from '@/constants/classes'; import { ExpenseAction, AbilitySubject } from '@/constants/abilityOption'; -import { - FormatDateCell, - FormattedMessage as T, - Icon, - If, - Can, -} from '@/components'; +import { FormattedMessage as T, Icon, If, Can } from '@/components'; import { safeCallback } from '@/utils'; /** @@ -137,8 +131,7 @@ export function useExpensesTableColumns() { { id: 'payment_date', Header: intl.get('payment_date'), - accessor: 'payment_date', - Cell: FormatDateCell, + accessor: 'formatted_date', width: 140, className: 'payment_date', clickable: true,