Merge pull request #506 from bigcapitalhq/BIG-206

feat: Setting up the date format in the whole system dates
This commit is contained in:
Ahmed Bouhuolia
2024-06-17 12:53:31 +02:00
committed by GitHub
40 changed files with 207 additions and 83 deletions

View File

@@ -16,8 +16,7 @@ export const useManualJournalsColumns = () => {
{
id: 'date',
Header: intl.get('date'),
accessor: 'date',
Cell: FormatDateCell,
accessor: 'formatted_date',
width: 115,
className: 'date',
clickable: true,
@@ -66,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,
},

View File

@@ -41,19 +41,23 @@ export default function BillDetailHeader() {
<Col xs={6}>
<DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
<DetailItem label={intl.get('bill_date')}>
<FormatDate value={bill.bill_date} />
{bill.formatted_bill_date}
</DetailItem>
<DetailItem label={intl.get('due_date')}>
<FormatDate value={bill.due_date} />
{bill.formatted_due_date}
</DetailItem>
<DetailItem label={intl.get('vendor_name')}>
<VendorDrawerLink vendorId={bill.vendor_id}>
{bill.vendor?.display_name}
</VendorDrawerLink>
</DetailItem>
<DetailItem label={intl.get('bill.details.bill_number')}>
{defaultTo(bill.bill_number, '-')}
</DetailItem>
<ExchangeRateDetailItem
exchangeRate={bill?.exchange_rate}
toCurrency={bill?.currency_code}
@@ -75,7 +79,7 @@ export default function BillDetailHeader() {
/>
<DetailItem
label={intl.get('bill.details.created_at')}
children={<FormatDate value={bill.created_at} />}
children={bill.formatted_created_at}
/>
</DetailsMenu>
</Col>

View File

@@ -46,7 +46,7 @@ export default function CashflowTransactionDrawerHeader() {
</DetailItem>
<DetailItem label={<T id={'date'} />}>
<FormatDate value={cashflowTransaction.date} />
{cashflowTransaction.formatted_date}
</DetailItem>
<DetailItem name={'reference-no'} label={<T id={'reference_no'} />}>

View File

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

View File

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

View File

@@ -1,6 +1,5 @@
// @ts-nocheck
import React from 'react';
import moment from 'moment';
import styled from 'styled-components';
import { defaultTo } from 'lodash';
@@ -42,7 +41,7 @@ export default function ExpenseDrawerHeader() {
<Col xs={6}>
<DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
<DetailItem name={'date'} label={<T id={'date'} />}>
{moment(expense.payment_date).format('YYYY MMM DD')}
{expense.formatted_payment_date}
</DetailItem>
<DetailItem name={'reference'} label={<T id={'reference_no'} />}>
@@ -66,11 +65,11 @@ export default function ExpenseDrawerHeader() {
minLabelSize={'180px'}
>
<DetailItem label={<T id={'published_at'} />}>
<FormatDate value={expense.published_at} />
{expense.formatted_date}
</DetailItem>
<DetailItem label={<T id={'created_at'} />}>
<FormatDate value={expense.created_at} />
{expense.formatted_created_at}
</DetailItem>
</DetailsMenu>
</Col>

View File

@@ -43,11 +43,11 @@ export default function InvoiceDetailHeader() {
<Col xs={6}>
<DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
<DetailItem label={intl.get('invoice_date')}>
<FormatDate value={invoice.invoice_date} />
{invoice.invoice_date_formatted}
</DetailItem>
<DetailItem label={intl.get('due_date')}>
<FormatDate value={invoice.due_date} />
{invoice.due_date_formatted}
</DetailItem>
<DetailItem label={intl.get('customer_name')}>
@@ -86,7 +86,7 @@ export default function InvoiceDetailHeader() {
/>
<DetailItem
label={intl.get('invoice.details.created_at')}
children={<FormatDate value={invoice.created_at} />}
children={invoice.created_at_formatted}
/>
</DetailsMenu>
</Col>

View File

@@ -37,7 +37,7 @@ export default function PaymentMadeDetailHeader() {
<DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
<DetailItem
label={intl.get('payment_date')}
children={<FormatDate value={paymentMade.payment_date} />}
children={paymentMade.formatted_payment_date}
/>
<DetailItem
label={intl.get('payment_made.details.payment_number')}
@@ -58,6 +58,7 @@ export default function PaymentMadeDetailHeader() {
/>
</DetailsMenu>
</Col>
<Col xs={6}>
<DetailsMenu
textAlign={'right'}
@@ -70,7 +71,7 @@ export default function PaymentMadeDetailHeader() {
/>
<DetailItem
label={intl.get('created_at')}
children={<FormatDate value={paymentMade.created_at} />}
children={paymentMade.formatted_created_at}
/>
</DetailsMenu>
</Col>

View File

@@ -1,8 +1,6 @@
// @ts-nocheck
import React from 'react';
import intl from 'react-intl-universal';
import moment from 'moment';
import { getColumnWidth } from '@/utils';
import { FormatNumberCell } from '@/components';
import { usePaymentMadeDetailContext } from './PaymentMadeDetailProvider';
@@ -17,7 +15,7 @@ export const usePaymentMadeEntriesColumns = () => {
() => [
{
Header: intl.get('date'),
accessor: (row) => moment(row.date).format('YYYY MMM DD'),
accessor: 'bill.formatted_bill_date',
width: 100,
disableSortBy: true,
className: 'date',

View File

@@ -5,7 +5,6 @@ import { defaultTo } from 'lodash';
import {
Row,
Col,
FormatDate,
DetailsMenu,
DetailItem,
CommercialDocHeader,
@@ -36,7 +35,7 @@ export default function PaymentReceiveDetailHeader() {
<DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
<DetailItem
label={intl.get('payment_date')}
children={<FormatDate value={paymentReceive.payment_date} />}
children={paymentReceive.formatted_payment_date}
/>
<DetailItem
label={intl.get('payment_receive.details.payment_number')}
@@ -71,7 +70,7 @@ export default function PaymentReceiveDetailHeader() {
/>
<DetailItem
label={intl.get('created_at')}
children={<FormatDate value={paymentReceive.created_at} />}
children={paymentReceive.formatted_created_at}
/>
</DetailsMenu>
</Col>

View File

@@ -1,7 +1,6 @@
// @ts-nocheck
import React from 'react';
import intl from 'react-intl-universal';
import moment from 'moment';
import {
Button,
Popover,
@@ -26,7 +25,7 @@ export const usePaymentReceiveEntriesColumns = () => {
() => [
{
Header: intl.get('date'),
accessor: (row) => moment(row.payment_date).format('YYYY MMM DD'),
accessor: 'invoice.invoice_date_formatted',
width: 100,
className: 'date',
disableSortBy: true,

View File

@@ -54,11 +54,11 @@ export default function ReceiptDetailHeader() {
</DetailItem>
<DetailItem
label={intl.get('receipt_date')}
children={<FormatDate value={receipt.receipt_date} />}
children={receipt.formatted_receipt_date}
/>
<DetailItem
label={intl.get('closed_date')}
children={<FormatDate value={receipt.closed_at_date} />}
children={receipt.formatted_closed_at_date}
/>
<ExchangeRateDetailItem
exchangeRate={receipt?.exchange_rate}
@@ -82,7 +82,7 @@ export default function ReceiptDetailHeader() {
/>
<DetailItem
label={intl.get('receipt.details.created_at')}
children={<FormatDate value={receipt.created_at} />}
children={receipt.formatted_created_at}
/>
</DetailsMenu>
</Col>

View File

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

View File

@@ -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,

View File

@@ -1,16 +1,13 @@
// @ts-nocheck
import React from 'react';
import intl from 'react-intl-universal';
import moment from 'moment';
export const useGLEntriesTableColumns = () => {
return React.useMemo(
() => [
{
Header: intl.get('date'),
accessor: ({ formatted_date }) =>
moment(formatted_date).format('YYYY MMM DD'),
accessor: 'date.formatted_date',
width: 140,
className: 'date',
textOverview: true,

View File

@@ -161,8 +161,7 @@ export function useBillsTableColumns() {
{
id: 'bill_date',
Header: intl.get('bill_date'),
accessor: 'bill_date',
Cell: FormatDateCell,
accessor: 'formatted_bill_date',
width: 110,
className: 'bill_date',
clickable: true,

View File

@@ -5,14 +5,7 @@ import clsx from 'classnames';
import { Intent, Tag, Menu, MenuItem, MenuDivider } from '@blueprintjs/core';
import { CLASSES } from '@/constants/classes';
import {
FormatDateCell,
FormattedMessage as T,
Choose,
If,
Icon,
Can,
} from '@/components';
import { FormattedMessage as T, Choose, If, Icon, Can } from '@/components';
import { safeCallback } from '@/utils';
import { VendorCreditAction, AbilitySubject } from '@/constants/abilityOption';
@@ -119,7 +112,6 @@ export function useVendorsCreditNoteTableColumns() {
id: 'credit_date',
Header: intl.get('date'),
accessor: 'formatted_vendor_credit_date',
Cell: FormatDateCell,
width: 110,
className: 'credit_date',
clickable: true,

View File

@@ -11,7 +11,7 @@ import {
Position,
} from '@blueprintjs/core';
import { Icon, Money, FormatDateCell, Can } from '@/components';
import { Icon, Money, Can } from '@/components';
import { PaymentMadeAction, AbilitySubject } from '@/constants/abilityOption';
import { safeCallback } from '@/utils';
@@ -29,7 +29,7 @@ export function ActionsMenu({
}) {
return (
<Menu>
<MenuItem
<MenuItem
icon={<Icon icon="reader-18" />}
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
@@ -79,8 +79,7 @@ export function usePaymentMadesTableColumns() {
{
id: 'payment_date',
Header: intl.get('payment_date'),
Cell: FormatDateCell,
accessor: 'payment_date',
accessor: 'formatted_payment_date',
width: 140,
className: 'payment_date',
clickable: true,

View File

@@ -5,7 +5,6 @@ import clsx from 'classnames';
import { Intent, Tag, Menu, MenuItem, MenuDivider } from '@blueprintjs/core';
import { CLASSES } from '@/constants/classes';
import {
FormatDateCell,
FormattedMessage as T,
Choose,
If,
@@ -112,7 +111,6 @@ export function useCreditNoteTableColumns() {
id: 'credit_date',
Header: intl.get('credit_note.column.credit_date'),
accessor: 'formatted_credit_note_date',
Cell: FormatDateCell,
width: 110,
className: 'credit_date',
clickable: true,

View File

@@ -164,8 +164,7 @@ export function useEstiamtesTableColumns() {
{
id: 'estimate_date',
Header: intl.get('estimate_date'),
accessor: 'estimate_date',
Cell: FormatDateCell,
accessor: 'formatted_estimate_date',
width: 140,
className: 'estimate_date',
clickable: true,

View File

@@ -128,7 +128,7 @@ export function ActionsMenu({
onQuick,
onViewDetails,
onPrint,
onSendMail
onSendMail,
},
row: { original },
}) {
@@ -202,8 +202,7 @@ export function useInvoicesTableColumns() {
{
id: 'invoice_date',
Header: intl.get('invoice_date'),
accessor: 'invoice_date',
Cell: FormatDateCell,
accessor: 'invoice_date_formatted',
width: 110,
className: 'invoice_date',
clickable: true,

View File

@@ -90,8 +90,7 @@ export function usePaymentReceivesColumns() {
{
id: 'payment_date',
Header: intl.get('payment_date'),
accessor: 'payment_date',
Cell: FormatDateCell,
accessor: 'formatted_payment_date',
width: 140,
className: 'payment_date',
clickable: true,

View File

@@ -119,8 +119,7 @@ export function useReceiptsTableColumns() {
{
id: 'receipt_date',
Header: intl.get('receipt_date'),
accessor: 'receipt_date',
Cell: FormatDateCell,
accessor: 'formatted_receipt_date',
width: 140,
className: 'receipt_date',
clickable: true,