From 29d5f7d74b2602b84cfb23fa3aa03143282952a0 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 22 Nov 2020 12:00:01 +0200 Subject: [PATCH] Fix :Sells and purchases transactions numbers to optional. --- .../Purchases/Bill/BillsDataTable.js | 2 +- .../PaymentMades/PaymentMadeDataTable.js | 2 +- .../PaymentMades/PaymentMadeForm.schema.js | 1 + .../PaymentMades/PaymentMadeFormHeader.js | 1 - .../PaymentMadeItemsTableEditor.js | 28 +++++++++++-------- .../Sales/Estimate/EstimatesDataTable.js | 2 +- .../Sales/Invoice/InvoicesDataTable.js | 2 +- .../PaymentReceiveItemsTableEditor.js | 27 ++++++++++-------- .../Sales/Receipt/ReceiptsDataTable.js | 2 +- 9 files changed, 37 insertions(+), 30 deletions(-) diff --git a/client/src/containers/Purchases/Bill/BillsDataTable.js b/client/src/containers/Purchases/Bill/BillsDataTable.js index 7fcb20856..fbf463c4b 100644 --- a/client/src/containers/Purchases/Bill/BillsDataTable.js +++ b/client/src/containers/Purchases/Bill/BillsDataTable.js @@ -158,7 +158,7 @@ function BillsDataTable({ { id: 'bill_number', Header: formatMessage({ id: 'bill_number' }), - accessor: (row) => `#${row.bill_number}`, + accessor: (row) => (row.bill_number ? `#${row.bill_number}` : null), width: 140, className: 'bill_number', }, diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js index 7cd1c985e..075d3f81c 100644 --- a/client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js +++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js @@ -110,7 +110,7 @@ function PaymentMadeDataTable({ { id: 'payment_number', Header: formatMessage({ id: 'payment_number' }), - accessor: (row) => `#${row.payment_number}`, + accessor: (row) => (row.payment_number ? `#${row.payment_number}` : null), width: 140, className: 'payment_number', }, diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.schema.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.schema.js index d0d22b619..804f0b90d 100644 --- a/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.schema.js +++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeForm.schema.js @@ -14,6 +14,7 @@ const Schema = Yup.object().shape({ .label(formatMessage({ id: 'payment_account_' })), payment_number: Yup.string() .max(DATATYPES_LENGTH.STRING) + .nullable() .label(formatMessage({ id: 'payment_no_' })), reference: Yup.string().min(1).max(DATATYPES_LENGTH.STRING).nullable(), description: Yup.string().max(DATATYPES_LENGTH.TEXT), diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js index c7c2e26de..a886d7bc7 100644 --- a/client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js +++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js @@ -162,7 +162,6 @@ function PaymentMadeFormHeader({ label={} inline={true} className={('form-group--payment_number', Classes.FILL)} - labelInfo={} intent={ errors.payment_number && touched.payment_number && Intent.DANGER } diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMadeItemsTableEditor.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeItemsTableEditor.js index 5ead993a8..c70e2f3f5 100644 --- a/client/src/containers/Purchases/PaymentMades/PaymentMadeItemsTableEditor.js +++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeItemsTableEditor.js @@ -1,5 +1,5 @@ import React, { useState, useEffect, useMemo, useCallback } from 'react'; -import { Button } from '@blueprintjs/core'; +import { Button } from '@blueprintjs/core'; import { FormattedMessage as T, useIntl } from 'react-intl'; import moment from 'moment'; import { sumBy } from 'lodash'; @@ -26,7 +26,7 @@ const CellRenderer = (content, type) => (props) => { const TotalCellRederer = (content, type) => (props) => { if (props.data.length === props.row.index + 1) { - return + return ; } return content(props); }; @@ -40,15 +40,17 @@ export default function PaymentMadeItemsTableEditor({ onUpdateData, data, errors, - noResultsMessage + noResultsMessage, }) { const transformedData = useMemo(() => { - const rows = [ ...data ]; + const rows = [...data]; const totalRow = { due_amount: sumBy(data, 'due_amount'), payment_amount: sumBy(data, 'payment_amount'), }; - if (rows.length > 0) { rows.push(totalRow) } + if (rows.length > 0) { + rows.push(totalRow); + } return rows; }, [data]); @@ -80,7 +82,7 @@ export default function PaymentMadeItemsTableEditor({ }, { Header: formatMessage({ id: 'bill_number' }), - accessor: (row) => `#${row?.bill_number}`, + accessor: (row) => `#${row?.bill_number || ''}`, Cell: CellRenderer(EmptyDiv, 'bill_number'), disableSortBy: true, className: 'bill_number', @@ -116,7 +118,7 @@ export default function PaymentMadeItemsTableEditor({ }; const rowClassNames = useCallback( - (row) => ({ 'row--total': localData.length === row.index + 1 }), + (row) => ({ 'row--total': localData.length === row.index + 1 }), [localData], ); @@ -129,7 +131,7 @@ export default function PaymentMadeItemsTableEditor({ columnId, value, ); - newRows.splice(-1,1); // removes the total row. + newRows.splice(-1, 1); // removes the total row. setLocalData(newRows); onUpdateData && onUpdateData(newRows); @@ -138,10 +140,12 @@ export default function PaymentMadeItemsTableEditor({ ); return ( -
+
`#${row.estimate_number}`, + accessor: (row) => (row.estimate_number ? `#${row.estimate_number}` : null), width: 140, className: 'estimate_number', }, diff --git a/client/src/containers/Sales/Invoice/InvoicesDataTable.js b/client/src/containers/Sales/Invoice/InvoicesDataTable.js index 54191b1a4..dba1eadd2 100644 --- a/client/src/containers/Sales/Invoice/InvoicesDataTable.js +++ b/client/src/containers/Sales/Invoice/InvoicesDataTable.js @@ -112,7 +112,7 @@ function InvoicesDataTable({ { id: 'invoice_no', Header: formatMessage({ id: 'invoice_no__' }), - accessor: (row) => `#${row.invoice_no}`, + accessor: (row) => (row.invoice_no ? `#${row.invoice_no}` : null), width: 140, className: 'invoice_no', }, diff --git a/client/src/containers/Sales/PaymentReceive/PaymentReceiveItemsTableEditor.js b/client/src/containers/Sales/PaymentReceive/PaymentReceiveItemsTableEditor.js index d2b3c10ba..3327d8a61 100644 --- a/client/src/containers/Sales/PaymentReceive/PaymentReceiveItemsTableEditor.js +++ b/client/src/containers/Sales/PaymentReceive/PaymentReceiveItemsTableEditor.js @@ -26,12 +26,12 @@ const CellRenderer = (content, type) => (props) => { const TotalCellRederer = (content, type) => (props) => { if (props.data.length === props.row.index + 1) { - return + return ; } return content(props); }; -export default function PaymentReceiveItemsTableEditor ({ +export default function PaymentReceiveItemsTableEditor({ onClickClearAllLines, onUpdateData, data, @@ -39,12 +39,14 @@ export default function PaymentReceiveItemsTableEditor ({ noResultsMessage, }) { const transformedData = useMemo(() => { - const rows = [ ...data ]; + const rows = [...data]; const totalRow = { due_amount: sumBy(data, 'due_amount'), payment_amount: sumBy(data, 'payment_amount'), }; - if (rows.length > 0) { rows.push(totalRow) } + if (rows.length > 0) { + rows.push(totalRow); + } return rows; }, [data]); @@ -81,7 +83,7 @@ export default function PaymentReceiveItemsTableEditor ({ Header: formatMessage({ id: 'invocie_number' }), accessor: (row) => { const invNumber = row?.invoice_no || row?.id; - return `#INV-${invNumber}`; + return `#INV-${invNumber || ''}`; }, Cell: CellRenderer(EmptyDiv, 'invoice_no'), disableSortBy: true, @@ -121,7 +123,7 @@ export default function PaymentReceiveItemsTableEditor ({ }; const rowClassNames = useCallback( - (row) => ({ 'row--total': localData.length === row.index + 1 }), + (row) => ({ 'row--total': localData.length === row.index + 1 }), [localData], ); @@ -144,10 +146,12 @@ export default function PaymentReceiveItemsTableEditor ({ ); return ( -
+
); - -} \ No newline at end of file +} diff --git a/client/src/containers/Sales/Receipt/ReceiptsDataTable.js b/client/src/containers/Sales/Receipt/ReceiptsDataTable.js index ea16e15a5..ba86e9ff0 100644 --- a/client/src/containers/Sales/Receipt/ReceiptsDataTable.js +++ b/client/src/containers/Sales/Receipt/ReceiptsDataTable.js @@ -111,7 +111,7 @@ function ReceiptsDataTable({ { id: 'receipt_number', Header: formatMessage({ id: 'receipt_number' }), - accessor: (row) => `#${row.receipt_number}`, + accessor: (row) => (row.receipt_number ? `#${row.receipt_number}` : null), width: 140, className: 'receipt_number', },