feat: format created at date

This commit is contained in:
Ahmed Bouhuolia
2024-06-17 10:27:02 +02:00
parent 3a0a0db8a7
commit 125dff8376
22 changed files with 117 additions and 26 deletions

View File

@@ -13,6 +13,8 @@ export class CreditNoteTransformer extends Transformer {
return [ return [
'formattedCreditsRemaining', 'formattedCreditsRemaining',
'formattedCreditNoteDate', 'formattedCreditNoteDate',
'formattedCreatedAt',
'formattedCreatedAt',
'formattedAmount', 'formattedAmount',
'formattedCreditsUsed', 'formattedCreditsUsed',
'formattedSubtotal', 'formattedSubtotal',
@@ -30,6 +32,15 @@ export class CreditNoteTransformer extends Transformer {
return this.formatDate(credit.creditNoteDate); 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. * Retrieve formatted invoice amount.
* @param {ICreditNote} credit * @param {ICreditNote} credit

View File

@@ -15,6 +15,7 @@ export class ExpenseTransfromer extends Transformer {
'formattedLandedCostAmount', 'formattedLandedCostAmount',
'formattedAllocatedCostAmount', 'formattedAllocatedCostAmount',
'formattedDate', 'formattedDate',
'formattedCreatedAt',
'categories', 'categories',
'attachments', 'attachments',
]; ];
@@ -62,6 +63,15 @@ export class ExpenseTransfromer extends Transformer {
return this.formatDate(expense.paymentDate); 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. * Retrieves the transformed expense categories.
* @param {IExpense} expense * @param {IExpense} expense

View File

@@ -13,6 +13,7 @@ export class ManualJournalTransfromer extends Transformer {
'formattedAmount', 'formattedAmount',
'formattedDate', 'formattedDate',
'formattedPublishedAt', 'formattedPublishedAt',
'formattedCreatedAt',
'attachments', 'attachments',
]; ];
}; };
@@ -37,6 +38,15 @@ export class ManualJournalTransfromer extends Transformer {
return this.formatDate(manualJorunal.date); 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. * Retrieve formatted published at date.
* @param {IManualJournal} manualJournal * @param {IManualJournal} manualJournal

View File

@@ -12,6 +12,7 @@ export class BillPaymentTransformer extends Transformer {
public includeAttributes = (): string[] => { public includeAttributes = (): string[] => {
return [ return [
'formattedPaymentDate', 'formattedPaymentDate',
'formattedCreatedAt',
'formattedAmount', 'formattedAmount',
'entries', 'entries',
'attachments', 'attachments',
@@ -27,6 +28,15 @@ export class BillPaymentTransformer extends Transformer {
return this.formatDate(billPayment.paymentDate); 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. * Retrieve formatted bill amount.
* @param {IBill} invoice * @param {IBill} invoice

View File

@@ -14,6 +14,7 @@ export class PurchaseInvoiceTransformer extends Transformer {
return [ return [
'formattedBillDate', 'formattedBillDate',
'formattedDueDate', 'formattedDueDate',
'formattedCreatedAt',
'formattedAmount', 'formattedAmount',
'formattedPaymentAmount', 'formattedPaymentAmount',
'formattedBalance', 'formattedBalance',
@@ -57,6 +58,15 @@ export class PurchaseInvoiceTransformer extends Transformer {
return this.formatDate(bill.dueDate); 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. * Retrieve formatted bill amount.
* @param {IBill} bill * @param {IBill} bill

View File

@@ -14,6 +14,7 @@ export class VendorCreditTransformer extends Transformer {
'formattedAmount', 'formattedAmount',
'formattedSubtotal', 'formattedSubtotal',
'formattedVendorCreditDate', 'formattedVendorCreditDate',
'formattedCreatedAt',
'formattedCreditsRemaining', 'formattedCreditsRemaining',
'formattedInvoicedAmount', 'formattedInvoicedAmount',
'entries', 'entries',
@@ -30,6 +31,15 @@ export class VendorCreditTransformer extends Transformer {
return this.formatDate(vendorCredit.vendorCreditDate); 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. * Retrieve formatted vendor credit amount.
* @param {IVendorCredit} credit * @param {IVendorCredit} credit

View File

@@ -18,6 +18,7 @@ export class SaleEstimateTransfromer extends Transformer {
'formattedDeliveredAtDate', 'formattedDeliveredAtDate',
'formattedApprovedAtDate', 'formattedApprovedAtDate',
'formattedRejectedAtDate', 'formattedRejectedAtDate',
'formattedCreatedAt',
'entries', 'entries',
'attachments', 'attachments',
]; ];
@@ -41,6 +42,15 @@ export class SaleEstimateTransfromer extends Transformer {
return this.formatDate(estimate.expirationDate); 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. * Retrieve formatted estimate date.
* @param {ISaleEstimate} invoice * @param {ISaleEstimate} invoice

View File

@@ -13,6 +13,7 @@ export class SaleInvoiceTransformer extends Transformer {
return [ return [
'invoiceDateFormatted', 'invoiceDateFormatted',
'dueDateFormatted', 'dueDateFormatted',
'createdAtFormatted',
'dueAmountFormatted', 'dueAmountFormatted',
'paymentAmountFormatted', 'paymentAmountFormatted',
'balanceAmountFormatted', 'balanceAmountFormatted',
@@ -48,6 +49,15 @@ export class SaleInvoiceTransformer extends Transformer {
return this.formatDate(invoice.dueDate); 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. * Retrieve formatted invoice due amount.
* @param {ISaleInvoice} invoice * @param {ISaleInvoice} invoice

View File

@@ -12,6 +12,7 @@ export class PaymentReceiveTransfromer extends Transformer {
return [ return [
'subtotalFormatted', 'subtotalFormatted',
'formattedPaymentDate', 'formattedPaymentDate',
'formattedCreatedAt',
'formattedAmount', 'formattedAmount',
'formattedExchangeRate', 'formattedExchangeRate',
'entries', 'entries',
@@ -27,9 +28,18 @@ export class PaymentReceiveTransfromer extends Transformer {
return this.formatDate(payment.paymentDate); 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. * Retrieve the formatted payment subtotal.
* @param {IPaymentReceive} payment * @param {IPaymentReceive} payment
* @returns {string} * @returns {string}
*/ */
protected subtotalFormatted = (payment: IPaymentReceive): string => { protected subtotalFormatted = (payment: IPaymentReceive): string => {

View File

@@ -17,6 +17,7 @@ export class SaleReceiptTransformer extends Transformer {
'formattedAmount', 'formattedAmount',
'formattedReceiptDate', 'formattedReceiptDate',
'formattedClosedAtDate', 'formattedClosedAtDate',
'formattedCreatedAt',
'entries', 'entries',
'attachments', 'attachments',
]; ];
@@ -40,6 +41,15 @@ export class SaleReceiptTransformer extends Transformer {
return this.formatDate(receipt.closedAt); 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. * Retrieves the estimate formatted subtotal.
* @param {ISaleReceipt} receipt * @param {ISaleReceipt} receipt

View File

@@ -21,9 +21,9 @@ import RefundCreditNoteDetailDrawer from '@/containers/Drawers/RefundCreditNoteD
import RefundVendorCreditDetailDrawer from '@/containers/Drawers/RefundVendorCreditDetailDrawer'; import RefundVendorCreditDetailDrawer from '@/containers/Drawers/RefundVendorCreditDetailDrawer';
import WarehouseTransferDetailDrawer from '@/containers/Drawers/WarehouseTransferDetailDrawer'; import WarehouseTransferDetailDrawer from '@/containers/Drawers/WarehouseTransferDetailDrawer';
import TaxRateDetailsDrawer from '@/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer'; import TaxRateDetailsDrawer from '@/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer';
import CategorizeTransactionDrawer from '@/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer';
import { DRAWERS } from '@/constants/drawers'; import { DRAWERS } from '@/constants/drawers';
import CategorizeTransactionDrawer from '@/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer';
/** /**
* Drawers container of the dashboard. * Drawers container of the dashboard.

View File

@@ -65,8 +65,7 @@ export const useManualJournalsColumns = () => {
{ {
id: 'created_at', id: 'created_at',
Header: intl.get('created_at'), Header: intl.get('created_at'),
accessor: 'created_at', accessor: 'formatted_created_at',
Cell: FormatDateCell,
width: 125, width: 125,
clickable: true, clickable: true,
}, },

View File

@@ -79,7 +79,7 @@ export default function BillDetailHeader() {
/> />
<DetailItem <DetailItem
label={intl.get('bill.details.created_at')} label={intl.get('bill.details.created_at')}
children={<FormatDate value={bill.created_at} />} children={bill.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -5,13 +5,11 @@ import styled from 'styled-components';
import { defaultTo } from 'lodash'; import { defaultTo } from 'lodash';
import { import {
FormatDate,
T, T,
Row, Row,
Col, Col,
DetailsMenu, DetailsMenu,
DetailItem, DetailItem,
ButtonLink,
CommercialDocHeader, CommercialDocHeader,
CommercialDocTopHeader, CommercialDocTopHeader,
CustomerDrawerLink, CustomerDrawerLink,
@@ -85,7 +83,7 @@ export default function CreditNoteDetailHeader() {
/> />
<DetailItem <DetailItem
label={<T id={'credit_note.drawer.label_created_at'} />} label={<T id={'credit_note.drawer.label_created_at'} />}
children={<FormatDate value={creditNote.created_at} />} children={creditNote.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -81,7 +81,7 @@ export default function EstimateDetailHeader() {
/> />
<DetailItem <DetailItem
label={<T id={'estimate.details.created_at'} />} label={<T id={'estimate.details.created_at'} />}
children={<FormatDate value={estimate.created_at} />} children={estimate.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -65,11 +65,11 @@ export default function ExpenseDrawerHeader() {
minLabelSize={'180px'} minLabelSize={'180px'}
> >
<DetailItem label={<T id={'published_at'} />}> <DetailItem label={<T id={'published_at'} />}>
<FormatDate value={expense.published_at} /> {expense.formatted_date}
</DetailItem> </DetailItem>
<DetailItem label={<T id={'created_at'} />}> <DetailItem label={<T id={'created_at'} />}>
<FormatDate value={expense.created_at} /> {expense.formatted_created_at}
</DetailItem> </DetailItem>
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -86,7 +86,7 @@ export default function InvoiceDetailHeader() {
/> />
<DetailItem <DetailItem
label={intl.get('invoice.details.created_at')} label={intl.get('invoice.details.created_at')}
children={<FormatDate value={invoice.created_at} />} children={invoice.created_at_formatted}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -58,6 +58,7 @@ export default function PaymentMadeDetailHeader() {
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>
<Col xs={6}> <Col xs={6}>
<DetailsMenu <DetailsMenu
textAlign={'right'} textAlign={'right'}
@@ -70,7 +71,7 @@ export default function PaymentMadeDetailHeader() {
/> />
<DetailItem <DetailItem
label={intl.get('created_at')} label={intl.get('created_at')}
children={<FormatDate value={paymentMade.created_at} />} children={paymentMade.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -5,7 +5,6 @@ import { defaultTo } from 'lodash';
import { import {
Row, Row,
Col, Col,
FormatDate,
DetailsMenu, DetailsMenu,
DetailItem, DetailItem,
CommercialDocHeader, CommercialDocHeader,
@@ -71,7 +70,7 @@ export default function PaymentReceiveDetailHeader() {
/> />
<DetailItem <DetailItem
label={intl.get('created_at')} label={intl.get('created_at')}
children={<FormatDate value={paymentReceive.created_at} />} children={paymentReceive.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -82,7 +82,7 @@ export default function ReceiptDetailHeader() {
/> />
<DetailItem <DetailItem
label={intl.get('receipt.details.created_at')} label={intl.get('receipt.details.created_at')}
children={<FormatDate value={receipt.created_at} />} children={receipt.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -78,7 +78,7 @@ export default function VendorCreditDetailHeader() {
/> />
<DetailItem <DetailItem
label={<T id={'vendor_credit.drawer.label_created_at'} />} label={<T id={'vendor_credit.drawer.label_created_at'} />}
children={<FormatDate value={vendorCredit.created_at} />} children={vendorCredit.formatted_created_at}
/> />
</DetailsMenu> </DetailsMenu>
</Col> </Col>

View File

@@ -17,13 +17,7 @@ import clsx from 'classnames';
import { CLASSES } from '@/constants/classes'; import { CLASSES } from '@/constants/classes';
import { ExpenseAction, AbilitySubject } from '@/constants/abilityOption'; import { ExpenseAction, AbilitySubject } from '@/constants/abilityOption';
import { import { FormattedMessage as T, Icon, If, Can } from '@/components';
FormatDateCell,
FormattedMessage as T,
Icon,
If,
Can,
} from '@/components';
import { safeCallback } from '@/utils'; import { safeCallback } from '@/utils';
/** /**
@@ -137,8 +131,7 @@ export function useExpensesTableColumns() {
{ {
id: 'payment_date', id: 'payment_date',
Header: intl.get('payment_date'), Header: intl.get('payment_date'),
accessor: 'payment_date', accessor: 'formatted_date',
Cell: FormatDateCell,
width: 140, width: 140,
className: 'payment_date', className: 'payment_date',
clickable: true, clickable: true,