From 9e2c99581320a7fd447010050673b0932f6ec13e Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Thu, 25 Feb 2021 10:51:27 +0200 Subject: [PATCH] fix: logo style. fix: page forms style. feat: auto-fill items entries from item details. fix: hiding dashboard copyright bar. --- client/src/components/Dashboard/Dashboard.js | 2 +- .../Dashboard/DashboardContentRoute.js | 4 +- .../components/Dashboard/DashboardFooter.js | 4 +- .../src/components/Dashboard/DashboardPage.js | 10 ++ .../DataTableCells/ItemsListCell.js | 1 + .../DataTableCells/PercentFieldCell.js | 1 + client/src/components/Datatable/TableCell.js | 45 +++++- .../src/components/Datatable/TableFooter.js | 4 + client/src/components/Datatable/utils.js | 10 ++ client/src/components/Postbox.js | 41 ++++++ client/src/components/index.js | 4 +- client/src/config/sidebarMenu.js | 3 +- .../JournalsLanding/ManualJournalsList.js | 5 +- .../MakeJournal/MakeJournalEntriesForm.js | 1 + .../MakeJournal/MakeJournalEntriesHeader.js | 15 ++ .../MakeJournal/MakeJournalEntriesPage.js | 4 +- .../MakeJournal/MakeJournalEntriesTable.js | 83 +++-------- .../MakeJournal/MakeJournalFormFooter.js | 54 +++---- .../InvoiceNumberDialogContent.js | 4 +- .../Dialogs/InvoiceNumberDialog/index.js | 1 - .../containers/Entries/ItemsEntriesTable.js | 106 ++++++++++---- client/src/containers/Entries/components.js | 22 ++- client/src/containers/Entries/utils.js | 7 +- .../Expenses/ExpenseForm/ExpenseForm.js | 4 +- .../ExpenseForm/ExpenseFormEntriesTable.js | 74 ++-------- .../Expenses/ExpenseForm/ExpenseFormFooter.js | 50 +++---- .../ExpenseForm/ExpenseFormHeaderFields.js | 6 +- .../Expenses/ExpenseForm/ExpenseFormPage.js | 4 +- client/src/containers/Items/ItemForm.js | 2 + .../JournalNumber/ReferenceNumberForm.js | 134 ++++++------------ .../ReferenceNumberFormContent.js | 71 ++++++++++ .../Bills/BillForm/BillFormFooter.js | 50 +++---- .../Purchases/Bills/BillForm/utils.js | 4 +- .../PaymentForm/PaymentMadeEntriesTable.js | 50 ++----- .../PaymentForm/PaymentMadeFooter.js | 34 ++--- .../EstimateForm/EstimateFormFooter.js | 78 +++++----- .../Sales/Estimates/EstimateForm/utils.js | 4 +- .../Estimates/EstimatesLanding/components.js | 9 +- .../Sales/Invoices/InvoiceForm/InvoiceForm.js | 12 +- .../InvoiceForm/InvoiceFormDialogs.js | 3 + .../Invoices/InvoiceForm/InvoiceFormFooter.js | 76 +++++----- .../InvoiceForm/InvoiceFormHeaderFields.js | 2 +- .../Invoices/InvoiceForm/InvoiceFormPage.js | 4 +- .../InvoiceItemsEntriesEditorField.js | 34 +++-- .../Sales/Invoices/InvoiceForm/utils.js | 4 +- .../Invoices/InvoicesLanding/components.js | 1 + .../PaymentReceiveForm/PaymentReceiveForm.js | 2 +- .../PaymentReceiveFormFooter.js | 34 ++--- .../PaymentReceiveItemsTable.js | 20 +-- .../PaymentReceiveForm/components.js | 9 +- .../PaymentsLanding/components.js | 1 + .../Sales/Receipts/ReceiptForm/ReceiptForm.js | 4 +- .../Receipts/ReceiptForm/ReceiptFormFooter.js | 76 +++++----- .../Receipts/ReceiptForm/ReceiptFormPage.js | 2 + .../Sales/Receipts/ReceiptForm/utils.js | 2 +- .../Receipts/ReceiptsLanding/components.js | 9 +- client/src/hooks/query/invoices.js | 4 +- client/src/hooks/query/settings.js | 14 +- client/src/routes/dashboard.js | 34 ++++- client/src/static/json/icons.js | 4 + client/src/style/App.scss | 3 +- client/src/style/components/BigAmount.scss | 3 +- .../DataTable/DataTableEditable.scss | 37 ++++- client/src/style/components/PageForm.scss | 24 ++-- client/src/style/components/Postbox.scss | 48 +++++++ client/src/style/objects/Bigcapital.scss | 2 +- client/src/style/objects/form.scss | 2 +- client/src/style/pages/Bills/PageForm.scss | 14 +- .../src/style/pages/Customers/PageForm.scss | 13 ++ .../src/style/pages/Dashboard/Dashboard.scss | 10 +- client/src/style/pages/Expense/PageForm.scss | 5 +- client/src/style/pages/Items/PageForm.scss | 13 ++ .../src/style/pages/ManualJournal/List.scss | 2 +- .../pages/ManualJournal/MakeJournal.scss | 13 +- .../src/style/pages/PaymentMade/PageForm.scss | 11 +- .../style/pages/PaymentReceive/PageForm.scss | 76 +++++++--- .../style/pages/SaleEstimate/PageForm.scss | 11 +- .../src/style/pages/SaleInvoice/PageForm.scss | 15 +- .../src/style/pages/SaleReceipt/PageForm.scss | 12 +- client/src/style/pages/Vendors/PageForm.scss | 13 ++ server/src/api/controllers/Purchases/Bills.ts | 4 +- .../api/controllers/Sales/SalesEstimates.ts | 4 +- .../api/controllers/Sales/SalesInvoices.ts | 4 +- .../api/controllers/Sales/SalesReceipts.ts | 6 +- 84 files changed, 1019 insertions(+), 682 deletions(-) create mode 100644 client/src/components/Datatable/utils.js create mode 100644 client/src/components/Postbox.js create mode 100644 client/src/containers/JournalNumber/ReferenceNumberFormContent.js create mode 100644 client/src/style/components/Postbox.scss diff --git a/client/src/components/Dashboard/Dashboard.js b/client/src/components/Dashboard/Dashboard.js index 9e116d70e..905506b10 100644 --- a/client/src/components/Dashboard/Dashboard.js +++ b/client/src/components/Dashboard/Dashboard.js @@ -51,6 +51,6 @@ function Dashboard({ ); -} +} export default compose(withSettingsActions)(Dashboard); diff --git a/client/src/components/Dashboard/DashboardContentRoute.js b/client/src/components/Dashboard/DashboardContentRoute.js index 01bc66186..02add34a3 100644 --- a/client/src/components/Dashboard/DashboardContentRoute.js +++ b/client/src/components/Dashboard/DashboardContentRoute.js @@ -1,7 +1,6 @@ -import React, { useEffect, Suspense } from 'react'; +import React from 'react'; import { Route, Switch } from 'react-router-dom'; import routes from 'routes/dashboard'; - import DashboardPage from './DashboardPage'; /** @@ -18,6 +17,7 @@ export default function DashboardContentRoute() { path={`${route.path}`} > - + {title} ); } -export default function DashboardFooter({}) { +export default function DashboardFooter() { return (
diff --git a/client/src/components/Dashboard/DashboardPage.js b/client/src/components/Dashboard/DashboardPage.js index 85748c677..2d9045ab1 100644 --- a/client/src/components/Dashboard/DashboardPage.js +++ b/client/src/components/Dashboard/DashboardPage.js @@ -11,6 +11,7 @@ function DashboardPage({ backLink, sidebarShrink, Component, + name, // #withDashboardActions changePageTitle, @@ -44,6 +45,15 @@ function DashboardPage({ }; }, [resetSidebarPreviousExpand, sidebarShrink, setSidebarShrink]); + useEffect(() => { + const className = `page-${name}`; + name && document.body.classList.add(className); + + return () => { + name && document.body.classList.remove(className); + }; + }, [name]); + return (
diff --git a/client/src/components/DataTableCells/ItemsListCell.js b/client/src/components/DataTableCells/ItemsListCell.js index 77e3970fc..fdf5ee99e 100644 --- a/client/src/components/DataTableCells/ItemsListCell.js +++ b/client/src/components/DataTableCells/ItemsListCell.js @@ -40,6 +40,7 @@ export default function ItemsListCell({ purchasable={filterPurchasable} inputProps={{ inputRef: (ref) => (fieldRef.current = ref), + placeholder: 'Enter an item...' }} openOnKeyDown={true} blurOnSelectClose={false} diff --git a/client/src/components/DataTableCells/PercentFieldCell.js b/client/src/components/DataTableCells/PercentFieldCell.js index 98ea66bb6..5638aa4b3 100644 --- a/client/src/components/DataTableCells/PercentFieldCell.js +++ b/client/src/components/DataTableCells/PercentFieldCell.js @@ -29,6 +29,7 @@ const PercentFieldCell = ({ return ( + +
+ ); + } return (
{footerGroups.map((group) => ( diff --git a/client/src/components/Datatable/utils.js b/client/src/components/Datatable/utils.js new file mode 100644 index 000000000..1e377511a --- /dev/null +++ b/client/src/components/Datatable/utils.js @@ -0,0 +1,10 @@ +export const isCellLoading = (loading, cellsCoords, rowIndex, columnId) => { + if (!loading) { + return false; + } + return !cellsCoords + ? true + : cellsCoords.some( + (cellCoord) => cellCoord[0] === rowIndex && cellCoord[1] === columnId, + ); +}; diff --git a/client/src/components/Postbox.js b/client/src/components/Postbox.js new file mode 100644 index 000000000..92cac2b77 --- /dev/null +++ b/client/src/components/Postbox.js @@ -0,0 +1,41 @@ +import React, { useState } from 'react'; +import { Collapse } from '@blueprintjs/core'; +import classNames from 'classnames'; + +/** + * Postbox. + */ +export default function Postbox({ + defaultOpen = true, + toggable = true, + title, + children, +}) { + const [isOpen, setIsOpen] = useState(defaultOpen); + + // Handle the title click. + const handleTitleClick = () => { + if (toggable) { + setIsOpen(!isOpen); + } + }; + + return ( +
+
+
{title}
+ + +
+
+ +
{children}
+ +
+
+ ); +} diff --git a/client/src/components/index.js b/client/src/components/index.js index 19befa37f..d366d9550 100644 --- a/client/src/components/index.js +++ b/client/src/components/index.js @@ -50,6 +50,7 @@ import TableFastCell from './Datatable/TableFastCell'; import DashboardContentTable from './Dashboard/DashboardContentTable'; import DashboardPageContent from './Dashboard/DashboardPageContent'; import DashboardInsider from './Dashboard/DashboardInsider'; +import Postbox from './Postbox'; const Hint = FieldHint; @@ -105,5 +106,6 @@ export { ContextMenu, DashboardContentTable, DashboardPageContent, - DashboardInsider + DashboardInsider, + Postbox }; diff --git a/client/src/config/sidebarMenu.js b/client/src/config/sidebarMenu.js index 7e4ca62aa..4b23a3808 100644 --- a/client/src/config/sidebarMenu.js +++ b/client/src/config/sidebarMenu.js @@ -5,7 +5,8 @@ export default [ { text: , disabled: false, - href: '/homepage', + href: '/', + matchExact: true, }, { text: 'Sales & inventory', diff --git a/client/src/containers/Accounting/JournalsLanding/ManualJournalsList.js b/client/src/containers/Accounting/JournalsLanding/ManualJournalsList.js index 8e6d4b8ae..7cec5f733 100644 --- a/client/src/containers/Accounting/JournalsLanding/ManualJournalsList.js +++ b/client/src/containers/Accounting/JournalsLanding/ManualJournalsList.js @@ -1,5 +1,7 @@ import React from 'react'; +import 'style/pages/ManualJournal/List.scss'; + import { DashboardContentTable, DashboardPageContent } from 'components'; import { ManualJournalsListProvider } from './ManualJournalsListProvider'; @@ -9,11 +11,8 @@ import ManualJournalsDataTable from './ManualJournalsDataTable'; import ManualJournalsActionsBar from './ManualJournalActionsBar'; import withManualJournals from './withManualJournals'; - import { transformTableStateToQuery, compose } from 'utils'; -import 'style/pages/ManualJournal/List.scss'; - /** * Manual journals table. */ diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.js b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.js index ee941cae2..00c9251e3 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.js @@ -169,6 +169,7 @@ function MakeJournalEntriesForm({ + {/* --------- Dialogs --------- */} diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeader.js b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeader.js index cd2c60ef8..9b797dad8 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeader.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeader.js @@ -1,12 +1,27 @@ import React from 'react'; import classNames from 'classnames'; +import { useFormikContext } from 'formik'; import { CLASSES } from 'common/classes'; import MakeJournalEntriesHeaderFields from "./MakeJournalEntriesHeaderFields"; +import { PageFormBigNumber } from 'components'; +import { safeSumBy } from 'utils'; export default function MakeJournalEntriesHeader() { + const { values: { entries } } = useFormikContext(); + const totalCredit = safeSumBy(entries, 'credit'); + const totalDebit = safeSumBy(entries, 'debit'); + + const total = Math.max(totalCredit, totalDebit); + return (
+ +
) } \ No newline at end of file diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js index ea2f3ff86..452d8ffc9 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesPage.js @@ -1,11 +1,11 @@ import React from 'react'; import { useParams } from 'react-router-dom'; +import 'style/pages/ManualJournal/MakeJournal.scss'; + import MakeJournalEntriesForm from './MakeJournalEntriesForm'; import { MakeJournalProvider } from './MakeJournalProvider'; -import 'style/pages/ManualJournal/MakeJournal.scss'; - /** * Make journal entries page. */ diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js index 974735e57..8f0c0144a 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js @@ -9,9 +9,7 @@ import { updateDataReducer } from './utils'; import { useMakeJournalFormContext } from './MakeJournalProvider'; import { useJournalTableEntriesColumns } from './components'; -import JournalDeleteEntriesAlert from 'containers/Alerts/ManualJournals/JournalDeleteEntriesAlert'; import { compose } from 'redux'; -import { repeatValue } from 'utils'; /** * Make journal entries table component. @@ -32,13 +30,7 @@ function MakeJournalEntriesTable({ // Memorized data table columns. const columns = useJournalTableEntriesColumns(); - - // Handles click new line. - const onClickNewRow = () => { - const newRows = [...entries, defaultEntry]; - saveInvoke(onChange, newRows); - }; - + // Handles update datatable data. const handleUpdateData = (rowIndex, columnId, value) => { const newRows = updateDataReducer(entries, rowIndex, columnId, value); @@ -50,61 +42,28 @@ function MakeJournalEntriesTable({ const newRows = removeRowsByIndex(entries, rowIndex); saveInvoke(onChange, newRows); }; - - // Handle clear all lines action. - const handleClickClearAllLines = () => { - openAlert('make-journal-delete-all-entries'); - }; - - // Handle clear all lines alaert confirm. - const handleCofirmClearEntriesAlert = () => { - const newRows = repeatValue(defaultEntry, initialLinesNumber); - saveInvoke(onChange, newRows); - }; - + + return ( - <> - ({ - ...customer, - contact_type: 'customer', - })), - autoFocus: ['account_id', 0], - }} - actions={ - <> - - - - } - /> - - + ({ + ...customer, + contact_type: 'customer', + })), + autoFocus: ['account_id', 0], + }} + /> ); } diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalFormFooter.js b/client/src/containers/Accounting/MakeJournal/MakeJournalFormFooter.js index b91c8b51c..ab47cee7a 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalFormFooter.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalFormFooter.js @@ -4,39 +4,41 @@ import classNames from 'classnames'; import { CLASSES } from 'common/classes'; import { FormGroup, TextArea } from '@blueprintjs/core'; import { FormattedMessage as T } from 'react-intl'; -import { ErrorMessage, Row, Col } from 'components'; +import { Postbox, ErrorMessage, Row, Col } from 'components'; import Dragzone from 'components/Dragzone'; import { inputIntent } from 'utils'; export default function MakeJournalFormFooter() { return (
- - - - {({ field, meta: { error, touched } }) => ( - } - className={'form-group--description'} - intent={inputIntent({ error, touched })} - helperText={} - fill={true} - > -